Author: alevkovsky Date: 2009-03-13 09:59:13 -0400 (Fri, 13 Mar 2009) New Revision: 12952 Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/avatar_w_default.png Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css Log: Realworld: apply new design for search, add default woman avatar, add security check for editing and deleting Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-03-13 13:58:57 UTC (rev 12951) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-03-13 13:59:13 UTC (rev 12952) @@ -21,7 +21,7 @@ @Override public String getSearchResultName() { - return "Albums"; + return "Albums search result"; } @Override Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-03-13 13:58:57 UTC (rev 12951) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-03-13 13:59:13 UTC (rev 12952) @@ -3,12 +3,10 @@ */ package org.richfaces.realworld.search; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jboss.seam.annotations.In; import org.jboss.seam.core.Events; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.service.ISearchAction; @@ -30,7 +28,7 @@ @Override public String getSearchResultName() { - return "Images"; + return "Images search result"; } @Override Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-03-13 13:58:57 UTC (rev 12951) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-03-13 13:59:13 UTC (rev 12952) @@ -28,7 +28,7 @@ */ @Override public String getSearchResultName() { - return "Tags"; + return "Tags search result"; } /* (non-Javadoc) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-03-13 13:58:57 UTC (rev 12951) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-03-13 13:59:13 UTC (rev 12952) @@ -28,7 +28,7 @@ */ @Override public String getSearchResultName() { - return "Users"; + return "Users search result"; } /* (non-Javadoc) Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/avatar_w_default.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/avatar_w_default.png ___________________________________________________________________ Name: svn:mime-type + image/png Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-13 13:58:57 UTC (rev 12951) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-13 13:59:13 UTC (rev 12952) @@ -38,6 +38,9 @@ <f:convertDateTime /> </h:outputText> </h:panelGroup> + <h:panelGroup layout="block" styleClass="album_data"> + <a href="#">#{album.owner.firstName} #{album.owner.secondName}</a> + </h:panelGroup> </h:panelGroup> </a4j:repeat> </ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-03-13 13:58:57 UTC (rev 12951) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-03-13 13:59:13 UTC (rev 12952) @@ -27,7 +27,10 @@ <h:outputText value="#{image.created}"> <f:convertDateTime /> </h:outputText> - </h:panelGroup> + </h:panelGroup> + <h:panelGroup layout="block" styleClass="photo_data"> + <a href="#">#{image.album.owner.firstName} #{image.album.owner.secondName}</a> + </h:panelGroup> </h:panelGroup> </a4j:repeat> </ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-13 13:58:57 UTC (rev 12951) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-13 13:59:13 UTC (rev 12952) @@ -5,9 +5,31 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> <a4j:repeat id="userList" value="#{result}" var="user"> - <a4j:mediaOutput rendered="#{user.hasAvatar}" element="img" createContent="#{imageLoader.paintImage}" - styleClass="avatar" - value="/#{user.login}/avatar.jpg" /> - <a4j:commandLink reRender="mainArea" actionListener="#{controller.showUser(user)}" value="#{user.login}"></a4j:commandLink><br/> + <h:panelGroup layout="block" styleClass="preview_box_photo_120"> + <h:graphicImage styleClass="pr_photo_bg" value="/img/shell/frame_photo_200.png" style="border:none"/> + <h:panelGrid cellpadding="0"> + <h:panelGroup> + <a4j:commandLink reRender="mainArea" actionListener="#{controller.showUser(user)}"> + <a4j:mediaOutput rendered="#{user.hasAvatar}" element="img" createContent="#{imageLoader.paintImage}" + styleClass="avatar" + value="/#{user.login}/avatar.jpg" /> + <h:graphicImage rendered="#{!user.hasAvatar and user.sex.key =='1' }" value="/img/shell/avatar_default.png" width="80" height="80" alt="" style="border:none"/> + <h:graphicImage rendered="#{!user.hasAvatar and user.sex.key =='0' }" value="/img/shell/avatar_w_default.png" width="80" height="80" alt="" style="border:none"/> + </a4j:commandLink> + <br/> + </h:panelGroup> + </h:panelGrid> + <h:panelGroup layout="block" styleClass="photo_name"> + <strong>#{user.firstName} #{user.secondName}</strong> + </h:panelGroup> + <h:panelGroup layout="block" styleClass="photo_data"> + <h:outputText value="#{user.birthDate}" > + <f:convertDateTime /> + </h:outputText> + </h:panelGroup> + <h:panelGroup layout="block" styleClass="photo_data"> + <a href="#"><h:outputText value="#{userManager.countAlbums(user)} albums "/></a> | <a href="#"><h:outputText value="#{userManager.countImages(user)} photos"/></a> + </h:panelGroup> + </h:panelGroup> </a4j:repeat> </ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.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/stylesheet/realworld2.css =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-13 13:58:57 UTC (rev 12951) +++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-13 13:59:13 UTC (rev 12952) @@ -661,4 +661,42 @@ .main-menu-add-icons-img{ padding : 4px 0px 0px 5px; border : 0px; +} + +.rich-tabpanel-content{ + border: none; + background: none; +} +.rich-tabhdr-side-cell{ + border: none; +} +.rich-tabhdr-side-border{ + border: none; + background: none; +} +.rich-tab-bottom-line{ + border: none; + background: none; +} + +.rich-tab-active{ + border-right: 1px solid; + border-right-color: black; + border-left: 0px; + border-top: 0px; + font-size : 175%; + background: none; + font-weight : normal; + margin : 4px; +} + +.rich-tab-inactive{ + border-right: 1px solid; + border-right-color: black; + border-left: 0px; + border-top: 0px; + background: none; + color : #DF6400; + text-decoration: underline; + cursor: pointer; } \ No newline at end of file