Author: amarkhel Date: 2009-02-02 14:25:27 -0500 (Mon, 02 Feb 2009) New Revision: 12532 Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/NewsManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic2.java trunk/test-applications/realworld/web/src/main/webapp/includes/image/scroller.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview-backup.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/news/ trunk/test-applications/realworld/web/src/main/webapp/includes/news/recent.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/whatNew.xhtml trunk/test-applications/realworld/web/src/main/webapp/index-backup.xhtml trunk/test-applications/realworld/web/src/main/webapp/layout/menu-backup.xhtml trunk/test-applications/realworld/web/src/main/webapp/layout/panelBar-backup.xhtml trunk/test-applications/realworld/web/src/main/webapp/layout/template3.xhtml Removed: trunk/test-applications/realworld/web/src/main/webapp/main.xhtml Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ISearchService.java trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java trunk/test-applications/realworld/ejb/src/main/resources/import.sql trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationHelper.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/CMForAlbum.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/fileUploadPanel.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/comments.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/imagePreview.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/mainImage.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/slideshow.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/index/login.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/misc/slideShowPooler.xhtml trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml trunk/test-applications/realworld/web/src/main/webapp/layout/panelBar.xhtml Log: Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -20,6 +20,8 @@ */ package org.richfaces.realworld.service; +import java.util.List; + import javax.ejb.Stateless; import javax.persistence.EntityManager; @@ -79,5 +81,9 @@ } em.flush(); } + + public List<Album> getSharedAlbums() { + return em.createQuery("from Album a where a.shared=true").getResultList(); + } } Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -20,6 +20,8 @@ */ package org.richfaces.realworld.service; +import java.util.List; + import javax.ejb.Local; import org.richfaces.realworld.domain.Album; @@ -38,4 +40,6 @@ public abstract void renameAllImagesFromAlbumAndChilds(Album dragValue, String albumOld, String albumNew); + public abstract List<Album> getSharedAlbums(); + } \ No newline at end of file Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ISearchService.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ISearchService.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ISearchService.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -38,4 +38,16 @@ public abstract List<String> getAllCameras(); public abstract List<String> getAllMetatags(); + + public abstract List<Image> getRecentImages(); + + public abstract List<Image> getLastFriendImages(); + + public abstract List<Image> getTopImages(); + + public abstract List<Image> getTopCommentedImages(); + + public abstract List<Image> getRecentCommentedImages(); + + public abstract List<Image> getLastCommentedYourImages(); } \ No newline at end of file Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -240,4 +240,40 @@ } return true; } + + public List<Image> getLastCommentedYourImages() { + String fullQuery = Constants.SEARCH_RELEVANT_QUERY_BEGIN + Constants.SEARCH_POPULAR_QUERY_END; + Query prepared = em.createQuery(fullQuery).setMaxResults(5); + return prepared.getResultList(); + } + + public List<Image> getLastFriendImages() { + String fullQuery = Constants.SEARCH_RELEVANT_QUERY_BEGIN + Constants.SEARCH_POPULAR_QUERY_END; + Query prepared = em.createQuery(fullQuery).setMaxResults(5); + return prepared.getResultList(); + } + + public List<Image> getRecentCommentedImages() { + String fullQuery = Constants.SEARCH_RELEVANT_QUERY_BEGIN + Constants.SEARCH_POPULAR_QUERY_END; + Query prepared = em.createQuery(fullQuery).setMaxResults(5); + return prepared.getResultList(); + } + + public List<Image> getRecentImages() { + String fullQuery = Constants.SEARCH_RELEVANT_QUERY_BEGIN + Constants.SEARCH_POPULAR_QUERY_END; + Query prepared = em.createQuery(fullQuery).setMaxResults(5); + return prepared.getResultList(); + } + + public List<Image> getTopCommentedImages() { + String fullQuery = Constants.SEARCH_RELEVANT_QUERY_BEGIN + Constants.SEARCH_POPULAR_QUERY_END; + Query prepared = em.createQuery(fullQuery).setMaxResults(5); + return prepared.getResultList(); + } + + public List<Image> getTopImages() { + String fullQuery = Constants.SEARCH_RELEVANT_QUERY_BEGIN + Constants.SEARCH_POPULAR_QUERY_END; + Query prepared = em.createQuery(fullQuery).setMaxResults(5); + return prepared.getResultList(); + } } Modified: trunk/test-applications/realworld/ejb/src/main/resources/import.sql =================================================================== --- trunk/test-applications/realworld/ejb/src/main/resources/import.sql 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/ejb/src/main/resources/import.sql 2009-02-02 19:25:27 UTC (rev 12532) @@ -7,15 +7,8 @@ INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (1, 'Cars', 'Photo of my dog', true, 1, null); INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (2, 'Tetki', 'Simple Album 2', true, 1, null); INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (3, 'Football', 'Simple Album 3', true, 1, null); -INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (4, 'Japan', 'Simple Album', true, 3, null); -INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (5, 'Music', 'Simple Album 2', false, 3, null); -INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (6, 'Child1', 'Simple Album 2', true, 1, 1); -INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (7, 'Child2', 'Simple Album 2', true, 1, 1); INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (11, 'Water', 'Water Photos', true, 6, null); INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (12, 'Bmw', 'BMW Cars Photos', true, 6, null); -INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (8, 'Album1', 'Favotite', true, 5, null); -INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (9, 'Planes', 'Planes', true, 5, null); -INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_album_id) VALUES (10, 'Moon', 'Moon', true, 5, 8); INSERT INTO Ranks(rank_id, total, hits) VALUES (1, 100, 21); INSERT INTO Ranks(rank_id, total, hits) VALUES (2, 200, 21); INSERT INTO Ranks(rank_id, total, hits) VALUES (3, 100, 31); @@ -101,7 +94,7 @@ INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (14, 'bdysch!!!', 'root/Football/bdysch!!!.jpg', 'Dermo sluchaetsia', '2008-12-18', 1, 14,'Canon S3', 500, 50.4, 333, '2008-12-01'); INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (15, 'Training', 'root/Football/euro2008_holland_wideweb__470x321,0.jpg', ' ) ', '2008-12-18', 1, 15,'Canon S3', 470, 37.3, 331, '2008-12-01'); INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (16, 'Also football', 'root/Football/flag_football.jpg', 'This is also football, but I do not understand it at all', '2008-12-18', 2, 16,'Canon S3', 500, 24.4, 333, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (17, 'Soccer', 'root/Football/soccer.jpg', 'Soccer differs from football', '2008-12-18', 2, 17,'Canon S3', 350, 45.3, 500, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (17, 'Soccer', 'root/Football/Soccer.jpg', 'Soccer differs from football', '2008-12-18', 2, 17,'Canon S3', 350, 45.3, 500, '2008-12-01'); INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (18, 'from birds fly', 'qqqq/Japan/birds_fly.jpg', 'One of the megalopolices', '2008-12-18', 2, 18,'Canon S3', 500, 53.4, 375, '2008-12-01'); INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (19, 'Haruki Murakami', 'qqqq/Japan/Haruki_Murakami.jpg', 'World famous aouthor', '2008-12-18', 2, 19,'Canon S3', 500, 36, 376, '2008-12-01'); INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (20, 'Street fashion', 'qqqq/Japan/Japanese_Street_Fashion.jpg', 'Venture to walk in such in our streets?', '2008-12-18', 2, 20,'Canon S3', 367, 59.2, 500, '2008-12-01'); @@ -142,19 +135,19 @@ INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (53, 'Water5', 'user/Water/P6191547.jpg', 'Belorussian lakes and rivers', '2008-12-18', 11, 53,'Canon S3', 768, 100.0, 1024, '2008-12-01'); INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (54, 'Water6', 'user/Water/P7121703.jpg', 'Belorussian lakes and rivers', '2008-12-18', 11, 54,'Canon S3', 768, 100.0, 1024, '2008-12-01'); INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (55, 'Water7', 'user/Water/P7231757.jpg', 'Belorussian lakes and rivers', '2008-12-18', 11, 55,'Canon S3', 768, 100.0, 1024, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (56, 'Water8', 'user/Water/Spa53749.jpg', 'Belorussian lakes and rivers', '2008-12-18', 11, 56,'Canon S3', 768, 100.0, 1024, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (56, 'Water8', 'user/Water/SPA53749.jpg', 'Belorussian lakes and rivers', '2008-12-18', 11, 56,'Canon S3', 768, 100.0, 1024, '2008-12-01'); INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (57, 'Water9', 'user/Water/SPA537441.jpg', 'Belorussian lakes and rivers', '2008-12-18', 11, 57,'Canon S3', 768, 100.0, 1024, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (58, 'Water10', 'user/Water/Spa53740.jpg', 'Belorussian lakes and rivers', '2008-12-18', 11, 58,'Canon S3', 768, 100.0, 1024, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (59, 'Bmw1', 'user/Bmw/bmw-5-e39-535i-1.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 59,'Canon S3', 600, 89.0, 800, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (60, 'Bmw2', 'user/Bmw/bmw-5-e39-535i-2.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 60,'Canon S3', 600, 137.0, 800, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (61, 'Bmw3', 'user/Bmw/bmw-5-e39-535i-3.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 61,'Canon S3', 600, 116.0, 800, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (62, 'Bmw4', 'user/Bmw/bmw-5-e39-535i-4.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 62,'Canon S3', 624, 133.0, 832, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (63, 'Bmw5', 'user/Bmw/bmw-5-e39-535i-6.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 63,'Canon S3', 624, 97.0, 832, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (64, 'Bmw6', 'user/Bmw/bmw-5-e39-535i-7.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 64,'Canon S3', 624, 100.0, 832, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (65, 'Bmw7', 'user/Bmw/bmw-5-e39-535i-8.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 65,'Canon S3', 546, 96.0, 728, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (66, 'Bmw8', 'user/Bmw/bmw_525i_sedan_1.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 66,'Canon S3', 768, 284.0, 1024, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (67, 'Bmw9', 'user/Bmw/bmw_530i_3.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 67,'Canon S3', 1200, 157.0, 1600, '2008-12-01'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (68, 'Bmw10', 'user/Bmw/bmw_m5_sedan_2.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 68,'Canon S3', 768, 152.0, 1024, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (58, 'Water10', 'user/Water/SPA53740.jpg', 'Belorussian lakes and rivers', '2008-12-18', 11, 58,'Canon S3', 768, 100.0, 1024, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (59, 'Bmw1', 'user/Bmw/bmw1.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 59,'Canon S3', 600, 89.0, 800, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (60, 'Bmw2', 'user/Bmw/bmw2.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 60,'Canon S3', 600, 137.0, 800, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (61, 'Bmw3', 'user/Bmw/bmw3.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 61,'Canon S3', 600, 116.0, 800, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (62, 'Bmw4', 'user/Bmw/bmw4.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 62,'Canon S3', 624, 133.0, 832, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (63, 'Bmw5', 'user/Bmw/bmw6.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 63,'Canon S3', 624, 97.0, 832, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (64, 'Bmw6', 'user/Bmw/bmw7.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 64,'Canon S3', 624, 100.0, 832, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (65, 'Bmw7', 'user/Bmw/bmw8.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 65,'Canon S3', 546, 96.0, 728, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (66, 'Bmw8', 'user/Bmw/bmw9.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 66,'Canon S3', 768, 284.0, 1024, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (67, 'Bmw9', 'user/Bmw/bmw10.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 67,'Canon S3', 1200, 157.0, 1600, '2008-12-01'); +INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (68, 'Bmw10', 'user/Bmw/bmw112.jpg', 'BMW 5-series sedan', '2008-12-18', 12, 68,'Canon S3', 768, 152.0, 1024, '2008-12-01'); INSERT INTO metatags(metatag_id, tag, image_metatag_id) VALUES (1, 'Beach', 1); INSERT INTO metatags(metatag_id, tag, image_metatag_id) VALUES (22, 'Sun', 1); @@ -209,10 +202,6 @@ INSERT INTO messages(message_id, date, message, author_id, owner_id, readed, theme, friendshipRequest) VALUES (1, '1985-01-08', 'Hello I am user', 2, 1, false, 'Hello, amarkhel', false); INSERT INTO messages(message_id, date, message, author_id, owner_id, readed, theme, friendshipRequest) VALUES (2, '1985-01-08', 'Please, add meto your friends', 3, 1, false, 'Request for friendship', true); INSERT INTO messages(message_id, date, message, author_id, owner_id, readed, theme, friendshipRequest) VALUES (3, '1985-01-09', 'Hello ', 1, 2, false, 'Hello, amarkhel', false); -INSERT INTO shared_albums(album_id, user_id) VALUES(4, 1); -INSERT INTO shared_albums(album_id, user_id) VALUES(5, 1); -INSERT INTO shared_albums(album_id, user_id) VALUES(8, 5); -INSERT INTO shared_albums(album_id, user_id) VALUES(9, 5); INSERT INTO shared_images(image_id, user_id) VALUES(30, 1); INSERT INTO shared_images(image_id, user_id) VALUES(31, 1); INSERT INTO user_friends(user1_id, user2_id) VALUES(1, 2); Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -31,8 +31,6 @@ import java.util.Date; import java.util.List; -import javax.faces.model.SelectItem; - import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; @@ -90,12 +88,6 @@ private static final long serialVersionUID = 4969087557225414955L; - private String selectedMode; - - private int fileQuantity = 1; - - private boolean immediateUpload = false; - private boolean fileUploadRendered; public synchronized void listener(UploadEvent event) throws Exception { @@ -186,46 +178,9 @@ public void showFileUpload(boolean result) { this.setFileUploadRendered(result); clearUploadData(); - setFileQuantity(Constants.MULTY_MODE_FILE_QUANTITY); - setImmediateUpload(false); - setSelectedMode("multy"); } - public void changeMode() { - if (getSelectedMode().equals(Constants.SINGLE)) { - setFileQuantity(Constants.SINGLE_MODE_FILE_QUANTITY); - setImmediateUpload(true); - } else if (getSelectedMode().equals(Constants.MULTY)) { - setFileQuantity(Constants.MULTY_MODE_FILE_QUANTITY); - setImmediateUpload(false); - } - } - public int getFileQuantity() { - return fileQuantity; - } - - public void setFileQuantity(int fileQuantity) { - this.fileQuantity = fileQuantity; - } - - public List<SelectItem> getItems() { - List<SelectItem> list = new ArrayList<SelectItem>(2); - list.add(new SelectItem(Constants.SINGLE, Constants.SINGLE)); - list.add(new SelectItem(Constants.MULTY, Constants.MULTY)); - return list; - } - - public String getSelectedMode() { - return selectedMode; - } - - @Observer(Constants.CHANGE_MODE_FILE_UPLOAD_EVENT) - public void setSelectedMode(String selectedMode) { - this.selectedMode = selectedMode; - changeMode(); - } - private Image constructImage(UploadItem item, FileItem file) { Image image = new Image(); image.setUploaded(new Date()); @@ -299,12 +254,4 @@ image.setCameraModel(""); } } - - public boolean isImmediateUpload() { - return immediateUpload; - } - - public void setImmediateUpload(boolean immediateUpload) { - this.immediateUpload = immediateUpload; - } } \ No newline at end of file Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -20,6 +20,9 @@ */ package org.richfaces.realworld.manager; +import java.util.ArrayList; +import java.util.List; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; @@ -48,9 +51,12 @@ @In(required=false, create=false) @Out(required=false) TreeMyAlbumsItem treeMyAlbumsItem; + private Integer firstIndex = 1; + @In(create=true, required=true) @Out private Album album; + private List<Album> sharedAlbums; @In private User user; @@ -155,4 +161,80 @@ return treeMyAlbumsItem.getNode(album.getParent().getName()); } } + + public List<Album> getSharedAlbums(){ + if(null == sharedAlbums){ + sharedAlbums=albumAction.getSharedAlbums(); + conversationState.setSelectedAlbum(sharedAlbums.get(0)); + } + return sharedAlbums; + } + + public void selectAlbum(Album a){ + conversationState.setSelectedAlbum(a); + conversationState.setSelectedImage(null); + } + + public void resetToAlbum(Album a){ + conversationState.setSelectedAlbum(a); + conversationState.setSelectedImage(null); + } + + public List<Integer> getAvailableIndeces() { + return createArrayIndeces(firstIndex); + } + + private List<Integer> createArrayIndeces(Integer firstIndex2) { + List<Integer> indeces = new ArrayList<Integer>(); + boolean ok = firstIndex2 +10 < conversationState.getSelectedAlbum().getImages().size(); + int addon; + if(ok){ + addon = 10; + }else{ + addon = conversationState.getSelectedAlbum().getImages().size() - firstIndex2; + } + for(int i = firstIndex2; i <= firstIndex2 + addon; i++){ + indeces.add(i); + } + return indeces; + } + + public Integer getFirstIndex() { + return firstIndex; + } + + public void setFirstIndex(Integer firstIndex) { + this.firstIndex = firstIndex; + } + + public void prevIndeces(){ + if(firstIndex>10){ + firstIndex -=10; + } + else firstIndex = 1; + conversationState.setSelectedImage(conversationState.getSelectedAlbum().getImages().get(firstIndex)); + } + + public void nextIndeces(){ + if(nextAvailable()){ + firstIndex +=10; + } + conversationState.setSelectedImage(conversationState.getSelectedAlbum().getImages().get(firstIndex)); + } + + public boolean prevDisabled(){ + return firstIndex > 10; + } + + public boolean nextDisabled(){ + return nextAvailable(); + } + + private boolean nextAvailable() { + return firstIndex +10 < conversationState.getSelectedAlbum().getImages().size(); + } + + public void selectImage(int index){ + conversationState.setSelectedImage(conversationState.getSelectedAlbum().getImages().get(index -1)); + } } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -34,6 +34,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; +import org.jboss.seam.core.Conversation; import org.jboss.seam.core.Events; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.log.Log; @@ -71,6 +72,9 @@ @In FacesMessages facesMessages; + @In("#{conversation}") @Out + Conversation conversation; + @In(create = true) IUserAction userAction; @@ -80,12 +84,32 @@ @In(create=true) @Out private ConversationState conversationState; + public String login(){ + if(identity.hasRole("admin")){ + return ""; + } + String password = credentials.getPassword(); + String username = credentials.getUsername(); + identity.unAuthenticate(); + credentials.setPassword(password); + credentials.setUsername(username); + try { + identity.authenticate(); + } catch (LoginException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return ""; + } + public boolean authenticate() { + + //System.out.print("FFFFFFFFFFFFuck"); if (wantLoginAnonymous()) { identity.addRole(Constants.GUEST_ROLE); userAction.loginAnonymous(); - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT,NavigationEnum.SEARCH); + //Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT,NavigationEnum.SEARCH); return true; } try { @@ -118,7 +142,7 @@ identity.logout(); identity.unAuthenticate(); credentials.clear(); - credentials.invalidate(); + //credentials.invalidate(); Session.instance().invalidate(); return "logout"; } @@ -143,6 +167,24 @@ return Constants.MAIN_OUTCOME; } + public String start(){ + //System.out.println("OOOOOO"); + if(!identity.isLoggedIn()){ + //identity.logout(); + //identity.unAuthenticate(); + credentials.clear(); + //credentials.invalidate(); + conversation.begin(); + try { + identity.authenticate(); + } catch (LoginException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return ""; + } + private void setupCatalogForUser() { if (!fileManager.isDirectoryPresent(credentials.getUsername())) { fileManager.addDirectory(credentials.getUsername()); Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -103,6 +103,10 @@ } public void addAutoComment(Image image) { + if(null == user.getLogin()){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("For vote on this picture you must login")); + return; + } Comment comment = new Comment(); comment.setAuthor(user); comment.setDate(new Date()); @@ -112,6 +116,10 @@ } public void addComment(Image image, String message){ + if(null == user.getLogin()){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("For vote on this picture you must login")); + return; + } Comment comment= new Comment(); comment.setAuthor(user); comment.setImage(image); Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/NewsManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/NewsManager.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/NewsManager.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -0,0 +1,43 @@ +package org.richfaces.realworld.manager; + +import java.io.Serializable; +import java.util.List; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.richfaces.realworld.domain.Image; +import org.richfaces.realworld.service.ISearchService; + +@Name("newsManager") +(a)Scope(ScopeType.CONVERSATION) +public class NewsManager implements Serializable { + + private static final long serialVersionUID = 5071655218132021316L; + @In(create=true) private ISearchService searchService; + + public List<Image> getRecentImages(){ + return searchService.getRecentImages(); + } + + public List<Image> getLastFriendImages(){ + return searchService.getLastFriendImages(); + } + + public List<Image> getTopImages(){ + return searchService.getTopImages(); + } + + public List<Image> getTopCommentedImages(){ + return searchService.getTopCommentedImages(); + } + + public List<Image> getRecentCommentedImages(){ + return searchService.getRecentCommentedImages(); + } + + public List<Image> getLastCommentedYourImages(){ + return searchService.getLastCommentedYourImages(); + } +} Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/NewsManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -23,5 +23,5 @@ public enum NavigationEnum { IMAGE_PREVIEW, FILE_UPLOAD, - USER_PREFS, SEARCH, READ_MESSAGES, GALLERY, + USER_PREFS, SEARCH, READ_MESSAGES, WHAT_NEW, } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationHelper.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationHelper.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationHelper.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -38,8 +38,8 @@ return NavigationEnum.USER_PREFS; } - public NavigationEnum getNavigationEnumGallery(){ - return NavigationEnum.GALLERY; + public NavigationEnum getNavigationEnumWhatNew(){ + return NavigationEnum.WHAT_NEW; } public NavigationEnum getNavigationEnumSearch(){ Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -172,6 +172,7 @@ } Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW); setSelectedAlbum(album); + setSelectedImage(null); setSelectedUser(album.getOwner()); } @@ -212,14 +213,7 @@ this.setMainArea(NavigationEnum.FILE_UPLOAD); }*/ - public void showFileUpload(Album item, boolean singleMode){ - String i; - if(singleMode){ - i=Constants.SINGLE; - }else{ - i=Constants.MULTY; - } - Events.instance().raiseEvent(Constants.CHANGE_MODE_FILE_UPLOAD_EVENT, i); + public void showFileUpload(Album item){ Events.instance().raiseEvent(Constants.FILE_UPLOAD_CLEAR_EVENT); setSelectedAlbum(item); this.setMainArea(NavigationEnum.FILE_UPLOAD); @@ -285,6 +279,10 @@ setSelectedImage(null); } + public boolean isSelectedImage(int index){ + return getSelectedAlbum().getIndex(getSelectedImage()) == index -1; + } + public void incrementSlideShowIndex() { int index = getSelectedAlbum().getIndex(getSelectedImage()); if(getSelectedAlbum().getImages().size() == index +1){ Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic2.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic2.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic2.java 2009-02-02 19:25:27 UTC (rev 12532) @@ -0,0 +1,138 @@ +package org.richfaces.realworld.util; + +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +import java.io.Serializable; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.security.Identity; +import org.richfaces.realworld.domain.Album; +import org.richfaces.realworld.domain.Image; +import org.richfaces.realworld.domain.User; +import org.richfaces.realworld.navigation.NavigationEnum; +import org.richfaces.realworld.service.Constants; + +@Name("renderLogic2") +(a)Scope(ScopeType.CONVERSATION) +public class RenderLogic2 implements Serializable{ + + @In User user; + @In Identity identity; + @In ConversationState conversationState; + + private static final long serialVersionUID = 5656562187249324512L; + + public boolean shouldRenderFriendFolders(){ + return conversationState.getSelectedUser() == null; + } + + public boolean shouldRenderFolders(){ + return conversationState.getSelectedUser()!=null && conversationState.getSelectedImage() == null; + } + + public boolean shouldRenderImage(){ + return conversationState.getSelectedAlbum()!=null && conversationState.getSelectedImage() != null; + } + + public boolean shouldRenderImageList(){ + return conversationState.getSelectedAlbum()!=null && conversationState.getSelectedImage() == null; + } + + public boolean isCurrentUserProfileSelected(){ + return user.equals(conversationState.getSelectedUser()); + } + + public boolean isSecondUserProfileSelected(){ + return conversationState.getSecondSelectedUser() != null; + } + + public boolean isUserAlbumSelected(){ + return conversationState.getSelectedAlbum() != null && conversationState.getSelectedAlbum().getOwner().equals(user); + } + + public boolean isUserGuest(){ + return !identity.hasRole(Constants.ADMIN_ROLE); + } + + public boolean isOwner(User u){ + return user.equals(u); + } + + public boolean isProfileSelected(){ + return conversationState.getMainArea() == NavigationEnum.USER_PREFS; + } + + public boolean shouldRenderFileUpload(){ + return conversationState.getSelectedAlbum()!=null && conversationState.getSelectedAlbum().getOwner().equals(user); + } + + public boolean isUserSelected(){ + return user.equals(conversationState.getSelectedUser()); + } + + public boolean isFriendSelected(){ + return conversationState.getSelectedUser() == null || isUserFriend(); + } + + public boolean isNotFriendSelected(){ + return !isUserSelected() && !isUserFriend(); + } + + public boolean isUserFriend(){ + return user.getFriends() != null && user.getFriends().contains(conversationState.getSelectedUser()); + } + + public boolean isUserFriend(User u){ + return user.getFriends() != null && user.getFriends().contains(u); + } + + public boolean isAlbumSelected(){ + return conversationState.getSelectedAlbum() != null; + } + + public boolean isImageSelected(){ + return conversationState.getSelectedImage() != null; + } + + public boolean isAccessToAlbumGranted(Album album){ + return album.getOwner().equals(user) || album.isShared() || isUserFriend(album.getOwner()); + } + + public boolean isUserAlbum(Album album){ + if(album == null){ + return false; + } + return album.getOwner().equals(user); + } + + public boolean isFavoriteAlbum(Album album){ + return user.getFavoriteAlbums().contains(album); + } + + public boolean isFavoriteImage(Image image){ + return user.getFavoriteImages().contains(image); + } + +} Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic2.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml 2009-02-02 19:25:27 UTC (rev 12532) @@ -1,43 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> - no-conversation-view-id="/index.xhtml" - login-view-id="/index.xhtml"> - <page view-id="*"> <navigation> - <rule if-outcome="home"> - <redirect view-id="/index.xhtml"/> - </rule> - <rule if-outcome="index"> - <redirect view-id="/index.xhtml"/> - </rule> <rule if-outcome="register"> <redirect view-id="/register.xhtml"/> </rule> - <rule if-outcome="main"> - <redirect view-id="/main.xhtml"/> - </rule> </navigation> - </page> - - <page view-id="/index.xhtml" action="#{conversation.begin}"> - - <navigation from-action="#{identity.login}"> - <rule if="#{identity.loggedIn and identity.hasRole('admin')}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> + </page> - <page view-id="/main.xhtml" login-required="true"> + <page view-id="/index.xhtml"> + <action if="#{!identity.isLoggedIn()}" execute="#{authenticator.start}"/> <navigation from-action="#{authenticator.logout}"> <rule if-outcome="logout"> <end-conversation /> - <redirect view-id="/index.xhtml" /> + <redirect view-id="/index.html"/> </rule> </navigation> </page> @@ -68,7 +47,7 @@ </exception> <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> + <redirect view-id="/index.xhtml"> <message>Please log in first</message> </redirect> </exception> Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/CMForAlbum.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/fileUploadPanel.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/comments.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/imagePreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/mainImage.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld/web/src/main/webapp/includes/image/scroller.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/includes/image/scroller.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/slideshow.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview-backup.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview-backup.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/index/login.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/misc/slideShowPooler.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld/web/src/main/webapp/includes/news/recent.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/includes/news/recent.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/test-applications/realworld/web/src/main/webapp/includes/whatNew.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/includes/whatNew.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/test-applications/realworld/web/src/main/webapp/index-backup.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/index-backup.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/test-applications/realworld/web/src/main/webapp/layout/menu-backup.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/layout/menu-backup.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml 2009-02-02 18:40:23 UTC (rev 12531) +++ trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml 2009-02-02 19:25:27 UTC (rev 12532) @@ -11,12 +11,11 @@ <a4j:form id="menuform"> <rich:toolBar height="37" styleClass="main-menu-toolbar" id="menu" contentClass="main-menu-toolbar-content"> - <rich:toolBarGroup > - <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + <h:graphicImage rendered="false" value="/img/shell/general_panelbar_bullet.gif" /> <h:graphicImage height="30" - rendered="#{!renderLogic.isUserGuest() and messageManager.countUnreadedMessages > 0}" + rendered="false" value="/img/icons/message.gif"> <rich:toolTip followMouse="true" direction="top-right" showDelay="100" styleClass="tooltip"> @@ -24,33 +23,40 @@ #{messages['menu.message.tooltip']}</span> </rich:toolTip> </h:graphicImage> - <a4j:commandLink rendered="#{!renderLogic.isUserGuest()}" + <a4j:commandLink rendered="false" value="#{messages['menu.messages']}" actionListener="#{conversationState.setMainArea(navigationHelper.navigationEnumReadMessages)}" reRender="mainform:mainArea" /> - <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + <h:graphicImage rendered="false" value="/img/shell/general_panelbar_bullet.gif" /> - <a4j:commandLink value="#{messages['menu.search']}" + <a4j:commandLink rendered="false" value="#{messages['menu.search']}" actionListener="#{conversationState.setMainArea(navigationHelper.navigationEnumSearch)}" reRender="mainform:mainArea" /> - <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + <h:graphicImage rendered="false" value="/img/shell/general_panelbar_bullet.gif" /> - <a4j:commandLink rendered="#{!renderLogic.isUserGuest()}" + <a4j:commandLink rendered="false" value="#{messages['menu.image']}" actionListener="#{conversationState.setMainArea(navigationHelper.navigationEnumImagePreview)}" reRender="mainform:mainArea" /> - <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + <h:graphicImage rendered="false" value="/img/shell/general_panelbar_bullet.gif" /> - <a4j:commandLink rendered="#{!renderLogic.isUserGuest()}" + <a4j:commandLink rendered="false" value="#{messages['menu.user']}" actionListener="#{conversationState.showUserProfile(user)}" reRender="mainform:mainArea" /> - <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + <h:graphicImage rendered="false" value="/img/shell/general_panelbar_bullet.gif" /> - <a4j:commandLink rendered="#{!renderLogic.isUserGuest()}" + <h:outputText rendered="false" value=""></h:outputText> + <a4j:commandLink rendered="false" value="#{messages['menu.file']}" actionListener="#{conversationState.setMainArea(navigationHelper.navigationEnumFileUpload)}" reRender="mainform:mainArea" /> + <h:graphicImage rendered="false" + value="/img/shell/general_panelbar_bullet.gif" /> + <a4j:commandLink rendered="false" + value="New on site" + actionListener="#{conversationState.setMainArea(navigationHelper.navigationEnumWhatNew)}" + reRender="mainform:mainArea" /> </rich:toolBarGroup> </rich:toolBar> </a4j:form> Added: trunk/test-applications/realworld/web/src/main/webapp/layout/panelBar-backup.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/layout/panelBar-backup.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/panelBar.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld/web/src/main/webapp/layout/template3.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/layout/template3.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Deleted: trunk/test-applications/realworld/web/src/main/webapp/main.xhtml =================================================================== (Binary files differ)