Author: alevkovsky Date: 2009-03-04 09:59:18 -0500 (Wed, 04 Mar 2009) New Revision: 12825 Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml Removed: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfImagesPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml 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/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/panelBar/tree.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar-backup.xhtml trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css Log: Realworld: apply new design for shell tree, add new navigation for tree, add localization, adjust shelf and album preview pages 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-04 14:58:43 UTC (rev 12824) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-04 14:59:18 UTC (rev 12825) @@ -26,8 +26,9 @@ USER_PREFS("includes/userPrefs.xhtml"), SEARCH("includes/search.xhtml"), WHAT_NEW("includes/recent.xhtml"), - ALBUM_PREVIEW("includes/userImage.xhtml"), - SHELF_PREVIEW("/includes/userAlbum.xhtml"), + ALBUM_PREVIEW("includes/userAlbum.xhtml"), + ALBUM_IMAGE_PREVIEW("/includes/userImage.xhtml"), + SHELF_PREVIEW("/includes/userShelf.xhtml"), ALL_SHELFS("/includes/userShelfs.xhtml"), TAGS("includes/tag.xhtml"), ALL_ALBUMS("includes/albums.xhtml"), 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-04 14:58:43 UTC (rev 12824) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-04 14:59:18 UTC (rev 12825) @@ -223,7 +223,7 @@ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW); + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); setSelectedAlbum(album); setSelectedImage(null); setSelectedShelf(album.getParent()); @@ -235,7 +235,7 @@ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW); setSelectedAlbum(image.getAlbum()); setSelectedImage(image); Integer index = getSelectedAlbum().getIndex(getSelectedImage()); @@ -307,15 +307,16 @@ @SuppressWarnings("unchecked") public void processSelection(NodeSelectedEvent event) { - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW); HtmlTree tree = (HtmlTree) event.getComponent(); TreeNode<Object> currentNode = (TreeNode<Object>)tree.getModelTreeNode(tree.getRowKey()); if(currentNode instanceof TreeAlbumItem){ + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); TreeAlbumItem node = (TreeAlbumItem)currentNode; Album album = node.getAlbum(); setSelectedAlbum(album); setSelectedShelf(album.getParent()); }else if(currentNode instanceof TreeShelfItem){ + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW); TreeShelfItem node = (TreeShelfItem)currentNode; Shelf shelf = node.getShelf(); 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-04 14:58:43 UTC (rev 12824) +++ trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-03-04 14:59:18 UTC (rev 12825) @@ -113,6 +113,7 @@ comment.add=Add comment comment.save=Save comment.cancel=Cancel +comment.comments=Comments message.sendMessage=Send message message.sendToUser=Send message for this user @@ -324,4 +325,14 @@ linkManagement=Link management close=Close myAlbumShelfs=My album shelfs -newPhotos=New photos \ No newline at end of file +newPhotos=New photos +created.shelf=Created +created.album=Created +created.image=Captured +contain=contain +pics_into=pics into +new=new +shelf.albums=albums +pics=pics +tags=Tags +original_size=Original size \ No newline at end of file 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-04 14:58:43 UTC (rev 12824) +++ trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-04 14:59:18 UTC (rev 12825) @@ -265,4 +265,15 @@ linkManagement=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0430\u043C\u0438 close=\u0417\u0430\u043A\u0440\u044B\u0442\u044C myAlbumShelfs=\u041C\u043E\u0438 \u043A\u043E\u043B\u043B\u0435\u043A\u0446\u0438\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u043E\u0432 -newPhotos=\u041D\u043E\u0432\u044B\u0435 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438 \ No newline at end of file +newPhotos=\u041D\u043E\u0432\u044B\u0435 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438 +created.shelf=\u0421\u043E\u0437\u0434\u0430\u043D\u0430 +created.album=\u0421\u043E\u0437\u0434\u0430\u043D +created.image=\u0421\u0434\u0435\u043B\u0430\u043D\u043E +contain=\u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 +pics_into=\u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439 \u0432 +new=\u043D\u043E\u0432\u044B\u0445 +shelf.albums=\u0430\u043B\u044C\u0431\u043E\u043C\u0435(\u0430\u0445) +pics=\u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439 +tags=\u0422\u044D\u0433\u0438 +comment.comments=\u041A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 +original_size=\u041E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u044C\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree.xhtml =================================================================== (Binary files differ) Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfImagesPreview.xhtml =================================================================== (Binary files differ) Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml (from rev 12818, trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml) =================================================================== (Binary files differ) Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar-backup.xhtml =================================================================== (Binary files differ) 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-04 14:58:43 UTC (rev 12824) +++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-04 14:59:18 UTC (rev 12825) @@ -446,3 +446,7 @@ .dr-tree-h-text { white-space: normal; } + +.tree-selected-node{ + font-weight: bold; +}