Author: alevkovsky Date: 2009-03-05 08:07:04 -0500 (Thu, 05 Mar 2009) New Revision: 12837 Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userAlbumsPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userImagesPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.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/webapp/includes/image/slideshow.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/imagePreview-backup.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/imagePreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.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/menu.xhtml Log: Realworld: add all images and all albums murkups 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-05 11:19:19 UTC (rev 12836) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-05 13:07:04 UTC (rev 12837) @@ -31,8 +31,8 @@ SHELF_PREVIEW("/includes/userShelf.xhtml"), ALL_SHELFS("/includes/userShelfs.xhtml"), TAGS("includes/tag.xhtml"), - ALL_ALBUMS("includes/albums.xhtml"), - ALL_IMAGES("includes/images.xhtml"); + ALL_ALBUMS("/includes/userAlbums.xhtml"), + ALL_IMAGES("/includes/userImages.xhtml"); private NavigationEnum(String t){ template=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-05 11:19:19 UTC (rev 12836) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-05 13:07:04 UTC (rev 12837) @@ -93,7 +93,7 @@ setSelectedAlbum(null); setSelectedShelf(null); setSelectedImage(null); - setSelectedUser(user); + //setSelectedUser(user); } public void selectAlbums(){ @@ -101,7 +101,7 @@ setSelectedAlbum(null); setSelectedShelf(null); setSelectedImage(null); - setSelectedUser(user); + //setSelectedUser(user); } public void selectImages(){ @@ -109,7 +109,7 @@ setSelectedAlbum(null); setSelectedShelf(null); setSelectedImage(null); - setSelectedUser(user); + //setSelectedUser(user); } @Observer(Constants.UPDATE_MAIN_AREA_EVENT) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/imagePreview-backup.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/imagePreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userAlbumsPreview.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userAlbumsPreview.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userImagesPreview.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userImagesPreview.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml 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/userImages.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.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/menu.xhtml =================================================================== (Binary files differ)