Author: alevkovsky Date: 2009-03-10 11:46:14 -0400 (Tue, 10 Mar 2009) New Revision: 12908 Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfEditBlock.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfEdit.xhtml Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css Log: Realworld: add shelf edit murkup Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-10 14:46:13 UTC (rev 12907) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-10 15:46:14 UTC (rev 12908) @@ -93,6 +93,7 @@ public void editShelf(Shelf shelf){ shelfAction.editShelf(shelf); conversationState.setSelectedShelf(shelf); + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW); } public void deleteShelf(Shelf shelf){ Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-10 14:46:13 UTC (rev 12907) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-10 15:46:14 UTC (rev 12908) @@ -35,7 +35,8 @@ ALL_ALBUMS("/includes/userAlbums.xhtml"), ALL_IMAGES("/includes/userImages.xhtml"), ALBUM_IMAGE_EDIT("/includes/userImageEdit.xhtml"), - ALBUM_EDIT("/includes/userAlbumEdit.xhtml"); + ALBUM_EDIT("/includes/userAlbumEdit.xhtml"), + SHELF_EDIT("/includes/userShelfEdit.xhtml"); private NavigationEnum(String t){ Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-10 14:46:13 UTC (rev 12907) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-10 15:46:14 UTC (rev 12908) @@ -268,6 +268,18 @@ public void cancelEditAlbum(Album album){ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); } + + public void editShelf(Shelf shelf){ + if(shelf.getOwner().equals(user)){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); + return; + } + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_EDIT); + } + + public void cancelEditShelf(Shelf shelf){ + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW); + } public void selectMyAlbums(){ setSelectedAlbum(null); Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties =================================================================== --- trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-03-10 14:46:13 UTC (rev 12907) +++ trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-03-10 15:46:14 UTC (rev 12908) @@ -1,4 +1,3 @@ -up=\u2191 down=\u2193 left=\u2039 right=\u203A @@ -172,6 +171,7 @@ image.meta=Image Meta-information: image.store=Store image.cancel=Cancel +image.save=Save slideshow.start=Start Slideshow slideshow.stop=Stop slideshow Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties =================================================================== --- trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-10 14:46:13 UTC (rev 12907) +++ trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-10 15:46:14 UTC (rev 12908) @@ -111,6 +111,7 @@ image.meta=\u041C\u0435\u0442\u0430-\u0438\u043D\u043E\u0444\u0440\u043C\u0430\u0446\u0438\u044F\: image.store=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C image.cancel=\u041E\u0442\u043C\u0435\u043D\u0430 +image.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C slideshow.start=\u041D\u0430\u0447\u0430\u0442\u044C \u0441\u043B\u0430\u0439\u0434-\u0448\u043E\u0443 slideshow.stop=\u041E\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u043B\u0430\u0439\u0434-\u0448\u043E\u0443 Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfEditBlock.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfEditBlock.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfEdit.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfEdit.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-10 14:46:13 UTC (rev 12907) +++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-10 15:46:14 UTC (rev 12908) @@ -577,7 +577,7 @@ border: 0px; } .buttons-body-text-div{ - position : relative; + position : absolute; color : #ffffff; top : 7px; left : 8px; @@ -606,4 +606,13 @@ .comment-text{ margin : 0px 0px 10px 0px; padding : 0px 4px 0px 4px; +} + +.image-edit-div{ + margin : 10px 0px 30px 30px; + width : 504px; + background : #f1f1f1; +} +.image-edit-div-table{ + border-collapse : collapse; } \ No newline at end of file