Author: alevkovsky
Date: 2009-03-03 10:20:32 -0500 (Tue, 03 Mar 2009)
New Revision: 12808
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.gif
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_down.gif
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_up.gif
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_120.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_200.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_80.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_120.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_200.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_80.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_bg.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_option_bg.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/spacer.gif
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_album.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_minus.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_plus.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_shelf.png
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_slid.png
trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.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/shelf/shelfImagesPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
Log:
Realworld: add user photo markup, apply new design
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-03
15:19:56 UTC (rev 12807)
+++
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-03
15:20:32 UTC (rev 12808)
@@ -26,7 +26,7 @@
USER_PREFS("includes/userPrefs.xhtml"),
SEARCH("includes/search.xhtml"),
WHAT_NEW("includes/recent.xhtml"),
- ALBUM_PREVIEW("includes/albumPreview.xhtml"),
+ ALBUM_PREVIEW("includes/userImage.xhtml"),
SHELF_PREVIEW("/includes/userAlbum.xhtml"),
ALL_SHELFS("/includes/userShelfs.xhtml"),
TAGS("includes/tags.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-03
15:19:56 UTC (rev 12807)
+++
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-03
15:20:32 UTC (rev 12808)
@@ -226,6 +226,24 @@
setSelectedShelf(album.getParent());
setSelectedUser(album.getOwner());
}
+
+ public void showImageFromShelf(Image image){
+ if(!image.getAlbum().isShared() && !image.getAlbum().getOwner().equals(user)){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new
Exception(HAVENT_ACCESS));
+ return;
+ }
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT,
NavigationEnum.ALBUM_PREVIEW);
+ setSelectedAlbum(image.getAlbum());
+ setSelectedImage(image);
+ Integer index = getSelectedAlbum().getIndex(getSelectedImage());
+ setSelectedImageIndex(index);
+ UIComponent component = FacesContext.getCurrentInstance().getViewRoot();
+ UIDatascroller scroller =
(UIDatascroller)component.findComponent(Constants.DATASCROLLER_ID);
+ Map<String, Object> attributes = scroller.getDataTable().getAttributes();
+ attributes.put(UIDatascroller.SCROLLER_STATE_ATTRIBUTE, index+1);
+ setSelectedImageIndex(index+1);
+ setSelectedUser(image.getAlbum().getOwner());
+ }
public void selectMyAlbums(){
setSelectedAlbum(null);
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_down.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_down.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_up.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_up.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_120.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_120.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_200.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_200.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_80.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_80.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_120.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_120.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_200.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_200.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_80.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_80.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_bg.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_bg.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_option_bg.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_option_bg.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/spacer.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/spacer.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_album.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_album.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_minus.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_minus.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_plus.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_plus.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_shelf.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_shelf.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_slid.png
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_slid.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfImagesPreview.xhtml
===================================================================
(Binary files differ)
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.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/stylesheet/realworld2.css
===================================================================
---
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-03
15:19:56 UTC (rev 12807)
+++
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-03
15:20:32 UTC (rev 12808)
@@ -288,6 +288,47 @@
color: black;
}
+a{color : #DF6400;}
+h1{font-size : 175%; font-weight : normal; margin : 0px;}
+
+.preview_box_album_80 {width : 100px; height : 100px; position : relative; float : left;
margin : 0px 10px 20px 0px;}
+.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position :
absolute;}
+.preview_box_album_80 table{position : relative; width : 100px; height : 100px;
text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;}
+
+.preview_box_album_120 {width : 140px; height : 140px; position : relative; float : left;
margin : 0px 10px 20px 0px;}
+.preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position :
absolute;}
+.preview_box_album_120 table{position : relative; width : 140px; height : 140px;
text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_120 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;}
+
+.preview_box_album_160 {width : 180px; height : 180px; position : relative; float : left;
margin : 0px 10px 20px 0px;}
+.preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position :
absolute;}
+.preview_box_album_160 table{position : relative; width : 180px; height : 180px;
text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_160 table img{margin: 0px 0px 1px 1px; border : 1px solid #FFFFFF;}
+
+
+
+.preview_box_photo_80 {width : 100px; height : 100px; position : relative; float : left;
margin : 0px 10px 20px 0px;}
+.preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position :
absolute;}
+.preview_box_photo_80 table{position : relative; width : 100px; height : 100px;
text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_80 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+
+.preview_box_photo_120 {width : 140px; height : 140px; position : relative; float : left;
margin : 0px 10px 20px 0px;}
+.preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position :
absolute;}
+.preview_box_photo_120 table{position : relative; width : 140px; height : 140px;
text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_120 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+
+.preview_box_photo_160 {width : 180px; height : 180px; position : relative; float : left;
margin : 0px 10px 20px 0px;}
+.preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position :
absolute;}
+.preview_box_photo_160 table{position : relative; width : 180px; height : 180px;
text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_160 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+
+.preview_box_photo_nav {width : 50px; height : 50px; position : relative; float : left;
margin : 0px 2px 0px 0px;}
+.preview_box_photo_nav img.pr_photo_bg {width : 50px; height : 50px; position :
absolute;}
+.preview_box_photo_nav table{position : relative; width : 50px; height : 50px; text-align
: center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+.preview_box_photo_nav table img.sel{margin: 0px 0px 0px 0px; border : 3px solid
#DF6400;}
+
.search-div {
height: 65px;
width: 339px;
@@ -401,4 +442,4 @@
.dr-tree-h-text {
white-space: normal;
-}
\ No newline at end of file
+}
Show replies by thread