richfaces-svn-commits
April 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 645 discussions
JBoss Rich Faces SVN: r13567 - in trunk/test-applications/realworld2/web/src/main: webapp/includes and 10 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-04-14 10:12:42 -0400 (Tue, 14 Apr 2009)
New Revision: 13567
Modified:
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/album/albumEditInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageEditInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/footer.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/header.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/menu.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/errorPanel.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/publicShelves.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/shelfResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/createShelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedAlbums.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelves.xhtml
Log:
internationalization
Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-04-14 14:11:42 UTC (rev 13566)
+++ trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-04-14 14:12:42 UTC (rev 13567)
@@ -224,4 +224,73 @@
shelf.albums=albums
pics=pics
tags=Tags
-original_size=Original size
\ No newline at end of file
+original_size=Original size
+
+album_name=Album name
+creation_date=Creation date
+description=Description
+shelf=Shelf:
+choose_album=Choose album
+error_during_upload=Error During upload:
+photo_upload_progress=Photo upload progress:
+photos_was_uploaded_to=photos was uploaded to
+photo_upload_complete=Photo upload complete:
+comments_for_this_photo_is_not_allowed=Comments for this photo is not allowed
+photo_name=Photo name
+upload_date=Upload date
+show_meta_information=Show meta information
+popular_tags=Popular tags
+direct_link=Direct link
+use_this_photo_like_current_album_cover=Use this photo like current album cover
+allow_commennts=Allow commennts
+terms_and_conditions=Terms And Conditions
+privacy_statement=Privacy Statement
+error_occurred=Error occurred
+error_occured_during_request=Error occured during request:
+how_it_works=How it works?
+no_results_found=No results found
+options=Options
+in=in
+in_shared_albums=in Shared Albums
+hide_options=Hide options
+add_shelf=Add shelf
+shelf_name=Shelf name
+search_criteria=Search criteria:
+keywords=Keywords:
+user_profile_=User profile
+
+all_new_images=All new images
+in_album=in album
+public_shelfs=Public Shelfs
+all_images=All images
+related_to_tag=related to tag
+my_all_albums=My all albums
+my_all_photos=My all photos
+ok=Ok
+all_shared_albums=All shared albums
+of_user=of user
+all_shared_images=All shared images
+my_album_shelfs=My album shelfs
+cancel=Cancel
+save=Save
+add_album=Add album
+delete_shelf=Delete shelf
+edit_shelf=Edit Shelf
+files_upload=Files upload
+create=Create
+file=File:
+see=See
+user_guide=User guide
+faq=F.A.Q.
+about_demo_at_jbosswiki=About Demo at JBossWiki
+about_demo_at_jbossforum=About Demo at JBossForum
+in_my_albums=in My Albums
+albums_small=albums
+photos=photos
+name=Name:
+male=Male
+female=Female
+
+search=Search
+find=Find
+my_album:=My Album:
\ 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-04-14 14:11:42 UTC (rev 13566)
+++ trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-04-14 14:12:42 UTC (rev 13567)
@@ -151,3 +151,73 @@
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
+
+album_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u0430
+creation_date=\u0414\u0430\u0442\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F
+description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
+shelf=\u041F\u043E\u043B\u043A\u0430
+choose_album=\u0412\u044B\u0431\u0438\u0440\u0435\u0442\u0435 \u0430\u043B\u044C\u0431\u043E\u043C
+error_during_upload=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432 \u0432\u0440\u0435\u043C\u044F \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438
+photo_upload_progress=\u0422\u0435\u0447\u0435\u043D\u0438\u0435 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438
+photos_was_uploaded_to=\u0424\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438 \u0431\u044B\u043B\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u044B \u0432
+photo_upload_complete=\u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0430 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0439 \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043D\u0430
+comments_for_this_photo_is_not_allowed=\u042D\u0442\u0443 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u044E \u043D\u0435\u043B\u044C\u0437\u044F \u043A\u043E\u043C\u0435\u043D\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+photo_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438
+upload_date=\u0414\u0430\u0442\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438
+show_meta_information=\u041E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0442\u044C \u043C\u0435\u0442\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044E
+popular_tags=\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u043D\u044B\u0435 \u0442\u0435\u0433\u0438
+direct_link=\u041F\u0440\u044F\u043C\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430
+use_this_photo_like_current_album_cover=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u043A\u0430\u043A \u043E\u0431\u043B\u043E\u0436\u043A\u0443 \u0430\u043B\u044C\u0431\u043E\u043C\u0430
+allow_commennts=\u041A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u044B
+error_occurred=\u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430
+error_occured_during_request=\u0412 \u0442\u0435\u0447\u0435\u043D\u0438\u0438 \u0437\u0430\u043F\u0440\u043E\u0441\u0430 \u043F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430
+how_it_works=\u041A\u0430\u043A \u044D\u0442\u043E \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442
+no_results_found=\u041D\u0438\u0447\u0435\u0433\u043E \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u043E
+in=\u0432
+in_shared_albums=\u0432 \u043E\u0431\u0449\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0445 \u0430\u043B\u044C\u0431\u043E\u043C\u0430\u0445
+add_shelf=\u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u043E\u043B\u043A\u0443
+shelf_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u043F\u043E\u043B\u043A\u0438
+search_criteria=\u041A\u0440\u0438\u0442\u0435\u0440\u0438\u0439 \u043F\u043E\u0438\u0441\u043A\u0430
+keywords=\u043A\u043B\u044E\u0447\u0435\u0432\u044B\u0435 \u0441\u043B\u043E\u0432\u0430
+user_profile_=\u041F\u0440\u043E\u0444\u0438\u043B\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
+
+all_new_images=\u0412\u0441\u0435 \u043D\u043E\u0432\u044B\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F
+in_album=\u0432 \u0430\u043B\u044C\u0431\u043E\u043C\u0435
+public_shelfs=\u041E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043F\u043E\u043B\u043A\u0438
+all_images=\u0432\u0441\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F
+my_all_albums=\u0412\u0441\u0435 \u043C\u043E\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u044B
+my_all_photos=\u0412\u0441\u0435 \u043C\u043E\u0438 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438
+all_shared_albums=\u0412\u0441\u0435 \u043E\u0431\u0449\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B
+all_shared_images=\u0412\u0441\u0435 \u043E\u0431\u0449\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438
+my_album_shelfs=\u041C\u043E\u0438 \u043F\u043E\u043B\u043A\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u043E\u0432
+cancel=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C
+save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
+add_album=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C
+delete_shelf=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u043E\u043B\u043A\u0443
+edit_shelf=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u043B\u043A\u0443
+files_upload=\u0417\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u044B\u0435 \u0444\u0430\u0439\u043B\u044B
+create=\u0421\u043E\u0437\u0434\u0430\u0442\u044C
+file=\u0424\u0430\u0439\u043B
+see=\u0421\u043C\u043E\u0442\u0440\u0435\u0442\u044C
+user_guide=\u0418\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
+in_my_albums=\u0412 \u043C\u043E\u0435\u043C \u0430\u043B\u044C\u0431\u043E\u043C\u0435
+albums_small=\u0430\u043B\u044C\u0431\u043E\u043C\u044B
+photos=\u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438
+name=\u0418\u043C\u044F\:
+
+search=\u041F\u043E\u0438\u0441\u043A
+find=\u041D\u0430\u0439\u0442\u0438
+my_album=\u041C\u043E\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u044B\:
+
+male=\u0413\u043E\u0441\u043F\u043E\u0434\u0438\u043D
+female=\u0414\u0430\u043C\u0430
+terms_and_conditions=Terms And Conditions
+privacy_statement=Privacy Statement
+options=\u041E\u043F\u0446\u0438\u0438
+hide_options=\u0421\u043F\u0440\u044F\u0442\u0430\u0442\u044C \u043E\u043F\u0446\u0438\u0438
+related_to_tag=\u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0435 \u0441 \u0442\u0435\u0433\u043E\u043C
+ok=Ok
+of_user=of user
+faq=F.A.Q.
+about_demo_at_jbosswiki=\u041E \u0414\u0435\u043C\u043E \u043D\u0430 JBossWiki
+about_demo_at_jbossforum=\u041E \u0414\u0435\u043C\u043E \u043D\u0430 JBossForum
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumEditInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageEditInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/footer.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/header.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/menu.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/errorPanel.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/publicShelves.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-04-14 14:11:42 UTC (rev 13566)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-04-14 14:12:42 UTC (rev 13567)
@@ -42,5 +42,5 @@
</h:panelGroup>
</h:panelGroup>
</a4j:repeat>
- <h:outputText rendered="#{result.size() == 0}" value="No results found" />
+ <h:outputText rendered="#{result.size() == 0}" value="#{messages['no_results_found']}" />
</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-04-14 14:11:42 UTC (rev 13566)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-04-14 14:12:42 UTC (rev 13567)
@@ -42,5 +42,5 @@
</a4j:repeat>
</h:panelGroup>
</a4j:outputPanel>
- <h:outputText rendered="#{result.size() == 0}" value="No results found" />
+ <h:outputText rendered="#{result.size() == 0}" value="#{messages['no_results_found']}" />
</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/shelfResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/shelfResult.xhtml 2009-04-14 14:11:42 UTC (rev 13566)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/shelfResult.xhtml 2009-04-14 14:12:42 UTC (rev 13567)
@@ -10,5 +10,5 @@
<ui:define name="header" />
</ui:decorate>
</a4j:outputPanel>
- <h:outputText rendered="#{result.size() == 0}" value="No results found" />
+ <h:outputText rendered="#{result.size() == 0}" value="#{messages['no_results_found']}" />
</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml 2009-04-14 14:11:42 UTC (rev 13566)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml 2009-04-14 14:12:42 UTC (rev 13567)
@@ -7,5 +7,5 @@
<a4j:repeat rendered="#{result.size() > 0}" id="tagList" value="#{result}" var="tag">
<a4j:commandLink reRender="mainArea" actionListener="#{controller.showTag(tag)}" value="#{tag.tag}"></a4j:commandLink><br/>
</a4j:repeat>
- <h:outputText rendered="#{result.size() == 0}" value="No results found" />
+ <h:outputText rendered="#{result.size() == 0}" value="#{messages['no_results_found']}" />
</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-04-14 14:11:42 UTC (rev 13566)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-04-14 14:12:42 UTC (rev 13567)
@@ -28,9 +28,9 @@
</h:outputText>
</h:panelGroup>
<h:panelGroup layout="block" styleClass="photo_data">
- <a4j:commandLink reRender="tree, mainArea" actionListener="#{controller.showSharedAlbums(searchedUser)}" ><h:outputText value="#{searchedUser.sharedAlbums.size} albums "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(searchedUser)}"><h:outputText value="#{searchedUser.sharedImages.size} photos"/></a4j:commandLink>
+ <a4j:commandLink reRender="tree, mainArea" actionListener="#{controller.showSharedAlbums(searchedUser)}" ><h:outputText value="#{searchedUser.sharedAlbums.size} #{messages['albums_small']} "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(searchedUser)}"><h:outputText value="#{searchedUser.sharedImages.size} #{messages['photos']}"/></a4j:commandLink>
</h:panelGroup>
</h:panelGroup>
</a4j:repeat>
- <h:outputText rendered="#{result.size() == 0}" value="No results found" />
+ <h:outputText rendered="#{result.size() == 0}" value="#{messages['no_results_found']}" />
</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml
===================================================================
(Binary files differ)
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/createShelf.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml 2009-04-14 14:11:42 UTC (rev 13566)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml 2009-04-14 14:12:42 UTC (rev 13567)
@@ -9,7 +9,7 @@
<table style="border-collapse : collapse;" cellpadding="5" border="0">
<tr>
<td valign="top" nowrap="true" style="padding-top : 8px">
- Shelf name
+ #{messages['shelf_name']}
</td>
<td valign="top" colspan="2">
<h:inputText value="#{shelf.name}" styleClass="shelf-edit-input" />
@@ -17,7 +17,7 @@
</tr>
<tr>
<td valign="top" nowrap="true" style="padding-top : 8px">
- Creation date
+ #{messages['creation_date']}
</td>
<td valign="top">
<a4j:outputPanel id="calendar" layout="block">
@@ -30,7 +30,7 @@
</tr>
<tr>
<td valign="top" nowrap="true" style="padding-top : 8px">
- Description
+ #{messages['description']}
</td>
<td valign="top" colspan="2">
<h:inputTextarea value="#{shelf.description}" styleClass="shelf-edit-area" />
@@ -42,8 +42,8 @@
</td>
<td valign="top" align="right" colspan="2" style="padding : 10px;">
- <richx:commandButton id="cancelButton" value="Cancel" style="float: left" immediate="true" actionListener="#{controller.cancelEditShelf()}" reRender="mainArea" />
- <richx:commandButton id="saveButton" value="Save" actionListener="#{shelfManager.editShelf(shelf)}" reRender="mainArea" />
+ <richx:commandButton id="cancelButton" value="#{messages['cancel']}" style="float: left" immediate="true" actionListener="#{controller.cancelEditShelf()}" reRender="mainArea" />
+ <richx:commandButton id="saveButton" value="#{messages['save']}" actionListener="#{shelfManager.editShelf(shelf)}" reRender="mainArea" />
</td>
</tr>
</table>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedAlbums.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelves.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13566 - trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-04-14 10:11:42 -0400 (Tue, 14 Apr 2009)
New Revision: 13566
Modified:
trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js
Log:
https://jira.jboss.org/jira/browse/RF-6781
Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js
===================================================================
--- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-04-14 14:09:46 UTC (rev 13565)
+++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-04-14 14:11:42 UTC (rev 13566)
@@ -221,9 +221,8 @@
},
_setSelector: function(color) {
- var rgb = color.toRGB();
var hsb = color.toHSB();
- this.selector.css('backgroundColor', '#' + this._RGBToHex(rgb));
+ this.selector.css('backgroundColor', '#' + this._RGBToHex(new HSBColor([hsb.h,100,100]).toRGB()));
this.selectorIndic.css({
left: parseInt(150 * hsb.s/100, 10),
top: parseInt(150 * (100-hsb.b)/100, 10)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13565 - in trunk/ui/colorPicker/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-04-14 10:09:46 -0400 (Tue, 14 Apr 2009)
New Revision: 13565
Modified:
trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss
trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js
trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx
Log:
https://jira.jboss.org/jira/browse/RF-6752
Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss
===================================================================
--- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 2009-04-14 13:44:09 UTC (rev 13564)
+++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 2009-04-14 14:09:46 UTC (rev 13565)
@@ -4,14 +4,14 @@
xmlns="http://www.w3.org/1999/xhtml" >
<f:verbatim>
<![CDATA[
-.rich-colorPicker-wrapper{
+.rich-color-picker-wrapper{
display:none;
overflow:hidden;
position:absolute;
width:350px;
z-index: 3;
}
-.rich-colorPicker-ext{
+.rich-color-picker-ext{
border: 1px solid;
position: relative;
height: 170px;
@@ -19,10 +19,10 @@
margin: 0px;
}
-.rich-colorPicker-rainbow div{
+.rich-color-picker-rainbow div{
background: transparent no-repeat scroll left top;
}
-.rich-colorPicker-color {
+.rich-color-picker-color {
background:#FF0000 none repeat scroll 0 0;
cursor:crosshair;
left:7px;
@@ -34,7 +34,7 @@
border: 1px solid;
}
-.rich-colorPicker-color div {
+.rich-color-picker-color div {
left:0;
position:absolute;
top:0;
@@ -42,7 +42,7 @@
width:150px;
}
-.rich-colorPicker-color div div {
+.rich-color-picker-color div div {
left:0;
top:0;
position:absolute;
@@ -52,7 +52,7 @@
height:11px;
}
-.rich-colorPicker-rainbow{
+.rich-color-picker-rainbow{
cursor:n-resize;
height:150px;
left:160px;
@@ -61,7 +61,7 @@
width:35px;
text-align: center;
}
-.rich-colorPicker-rainbow div{
+.rich-color-picker-rainbow div{
height:9px;
left:1px;
margin:-4px 0 0;
@@ -70,7 +70,7 @@
width:35px;
}
-.rich-colorPicker-new-color, .rich-colorPicker-current-color{
+.rich-color-picker-new-color, .rich-color-picker-current-color{
position:absolute;
top:7px;
width: 60px;
@@ -78,22 +78,22 @@
border: 1px solid;
}
-.rich-colorPicker-current-color{
+.rich-color-picker-current-color{
right:7px;
top:7px;
}
-.rich-colorPicker-new-color{
+.rich-color-picker-new-color{
left:198px;
}
-.rich-colorPicker-hex-wrapper {
+.rich-color-picker-hex-wrapper {
height:22px;
left:202px;
position:absolute;
top:119px;
}
-.rich-colorPicker-rgb-wrapper{
+.rich-color-picker-rgb-wrapper{
left:184px;
position:absolute;
top:55px;
@@ -103,7 +103,7 @@
margin-bottom: 2px
}
-.rich-colorPicker-hsb-wrapper{
+.rich-color-picker-hsb-wrapper{
right:7px;
position:absolute;
top:55px;
@@ -112,46 +112,46 @@
text-align: right;
margin-bottom: 2px
}
-.rich-colorPicker-hsb-h, .rich-colorPicker-rgb-r{
+.rich-color-picker-hsb-h, .rich-color-picker-rgb-r{
top:45px;
}
-.rich-colorPicker-hsb-s, .rich-colorPicker-rgb-g{
+.rich-color-picker-hsb-s, .rich-color-picker-rgb-g{
top:70px;
}
-.rich-colorPicker-hsb-b, .rich-colorPicker-rgb-b{
+.rich-color-picker-hsb-b, .rich-color-picker-rgb-b{
top:95px;
}
-.rich-colorPicker-rgb-wrapper label {
+.rich-color-picker-rgb-wrapper label {
padding-top: 2px;
font-size: 16px;
}
-.rich-colorPicker-colors-input{
+.rich-color-picker-colors-input{
width: 35px;
border: 1px solid;
}
-.rich-colorPicker-hex-wrapper input{
+.rich-color-picker-hex-wrapper input{
width:60px;
font-size: 13px;
}
-.rich-colorPicker-submit, .rich-colorPicker-cancel{
+.rich-color-picker-submit, .rich-color-picker-cancel{
position:absolute;
right:75px;
top:144px;
}
-.rich-colorPicker-cancel{
+.rich-color-picker-cancel{
right:7px;
}
-.rich-colorPicker-span input{
+.rich-color-picker-span input{
border: 1px solid;
width:130px;
vertical-align:middle;
}
-.rich-colorPicker-icon {
+.rich-color-picker-icon {
display:inline;
cursor:pointer;
height:16px;
@@ -159,7 +159,7 @@
vertical-align:middle;
border: 1px solid;
}
-.rich-colorPicker-icon-disabled{
+.rich-color-picker-icon-disabled{
background-color: #cccccc;
height:16px;
width:16px;
@@ -167,12 +167,12 @@
]]>
</f:verbatim>
- <u:selector name=".rich-colorPicker-ext">
+ <u:selector name=".rich-color-picker-ext">
<u:style name="border-color" skin="panelBorderColor"/>
<u:style name="background-color" skin="generalBackgroundColor"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".rich-colorPicker-span input">
+ <u:selector name=".rich-color-picker-span input">
<u:style name="background-repeat" value="repeat-x" />
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage" />
@@ -181,45 +181,45 @@
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".rich-colorPicker-ext input">
+ <u:selector name=".rich-color-picker-ext input">
<u:style name="color" skin="controlTextColor"/>
<u:style name="background-color" skin="controlBackgroundColor"/>
</u:selector>
- <u:selector name=".rich-colorPicker-ext label">
+ <u:selector name=".rich-color-picker-ext label">
<u:style name="color" skin="generalSizeFont"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".rich-colorPicker-icon">
+ <u:selector name=".rich-color-picker-icon">
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
- <u:selector name=".rich-colorPicker-color">
+ <u:selector name=".rich-color-picker-color">
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
- <u:selector name=".rich-colorPicker-new-color">
+ <u:selector name=".rich-color-picker-new-color">
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
- <u:selector name=".rich-colorPicker-current-color">
+ <u:selector name=".rich-color-picker-current-color">
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
- <u:selector name=".rich-colorPicker-cancel">
+ <u:selector name=".rich-color-picker-cancel">
<u:style name="font-size" skin="buttonFontSize"/>
<u:style name="font-family" skin="buttonFamilyFont"/>
<u:style name="color" skin="headerTextColor"/>
<u:style name="border-color" skin="headerBackgroundColor"/>
</u:selector>
- <u:selector name=".rich-colorPicker-submit">
+ <u:selector name=".rich-color-picker-submit">
<u:style name="font-size" skin="buttonFontSize"/>
<u:style name="font-family" skin="buttonFamilyFont"/>
<u:style name="color" skin="headerTextColor"/>
<u:style name="border-color" skin="headerBackgroundColor"/>
</u:selector>
- <u:selector name=".rich-colorPicker-color div">
+ <u:selector name=".rich-color-picker-color div">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/colorpicker_overlay.png" />
</u:style>
</u:selector>
- <u:selector name=".rich-colorPicker-colors-input">
+ <u:selector name=".rich-color-picker-colors-input">
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
<u:style name="color" skin="generalTextColor"/>
@@ -227,17 +227,17 @@
<u:style name="background-color" skin="controlBackgroundColor"/>
</u:selector>
- <u:selector name=".rich-colorPicker-color div div">
+ <u:selector name=".rich-color-picker-color div div">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/colorpicker_select.gif" />
</u:style>
</u:selector>
- <u:selector name=".rich-colorPicker-rainbow div">
+ <u:selector name=".rich-color-picker-rainbow div">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/rangearrows.gif" />
</u:style>
</u:selector>
- <u:selector name=".rich-colorPicker-submit, .rich-colorPicker-cancel">
+ <u:selector name=".rich-color-picker-submit, .rich-color-picker-cancel">
<u:style name="color" skin="headerTextColor" />
<u:style name="border-color" skin="panelBorderColor" />
<u:style name="font-size" skin="generalSizeFont" />
Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js
===================================================================
--- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-04-14 13:44:09 UTC (rev 13564)
+++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-04-14 14:09:46 UTC (rev 13565)
@@ -146,21 +146,21 @@
- this.selector = this.picker.find('div.rich-colorPicker-color').bind('mousedown', function(e) { return self._downSelector.call(self, e); });
+ this.selector = this.picker.find('div.rich-color-picker-color').bind('mousedown', function(e) { return self._downSelector.call(self, e); });
this.selectorIndic = this.selector.find('div div');
- this.hue = this.picker.find('div.rich-colorPicker-rainbow div');
- this.picker.find('div.rich-colorPicker-rainbow').bind('mousedown', function(e) { return self._downHue.call(self, e); });
+ this.hue = this.picker.find('div.rich-color-picker-rainbow div');
+ this.picker.find('div.rich-color-picker-rainbow').bind('mousedown', function(e) { return self._downHue.call(self, e); });
- this.newColor = this.picker.find('div.rich-colorPicker-new-color');
- this.currentColor = this.picker.find('div.rich-colorPicker-current-color');
- this.iconColor = $(o.clientId.toString()+' .rich-colorPicker-icon');
+ this.newColor = this.picker.find('div.rich-color-picker-new-color');
+ this.currentColor = this.picker.find('div.rich-color-picker-current-color');
+ this.iconColor = $(o.clientId.toString()+' .rich-color-picker-icon');
- this.picker.find('.rich-colorPicker-submit')
+ this.picker.find('.rich-color-picker-submit')
.bind('mouseenter', function(e) { return self._enterSubmit.call(self, e); })
.bind('mouseleave', function(e) { return self._leaveSubmit.call(self, e); })
.bind('click', function(e) { return self._clickSubmit.call(self, e); });
- this.picker.find('.rich-colorPicker-cancel')
+ this.picker.find('.rich-color-picker-cancel')
.bind('mouseenter', function(e) { return self._enterCancel.call(self, e); })
.bind('mouseleave', function(e) { return self._leaveCancel.call(self, e); })
.bind('click', function(e) { return self._clickCancel.call(self, e); });
@@ -310,20 +310,20 @@
this._trigger('change', e, this._createEventArgument(col));
},
_blur: function(e) {
- this.fields.parent().removeClass('rich-colorPicker-focus');
+ this.fields.parent().removeClass('rich-color-picker-focus');
},
_focus: function(e) {
this.charMin = e.target.parentNode.className.indexOf('-hex') > 0 ? 70 : 65;
- this.fields.parent().removeClass('rich-colorPicker-focus');
- $(e.target.parentNode).addClass('rich-colorPicker-focus');
+ this.fields.parent().removeClass('rich-color-picker-focus');
+ $(e.target.parentNode).addClass('rich-color-picker-focus');
},
_downHue: function(e) {
this.currentHue = {
- y: this.picker.find('div.rich-colorPicker-rainbow').offset().top
+ y: this.picker.find('div.rich-color-picker-rainbow').offset().top
};
this._change.apply(this, [e, this
@@ -358,7 +358,7 @@
var self = this;
this.currentSelector = {
- pos: this.picker.find('div.rich-colorPicker-color').offset()
+ pos: this.picker.find('div.rich-color-picker-color').offset()
};
this._change.apply(this, [e, this
@@ -395,16 +395,16 @@
return false;
},
_enterSubmit: function(e) {
- this.picker.find('.rich-colorPicker-submit').addClass('rich-colorPicker-focus');
+ this.picker.find('.rich-color-picker-submit').addClass('rich-color-picker-focus');
},
_leaveSubmit: function(e) {
- this.picker.find('.rich-colorPicker-submit').removeClass('rich-colorPicker-focus');
+ this.picker.find('.rich-color-picker-submit').removeClass('rich-color-picker-focus');
},
_enterCancel: function(e) {
- this.picker.find('.rich-colorPicker-cancel').addClass('rich-colorPicker-focus');
+ this.picker.find('.rich-color-picker-cancel').addClass('rich-color-picker-focus');
},
_leaveCancel: function(e) {
- this.picker.find('.rich-colorPicker-cancel').removeClass('rich-colorPicker-focus');
+ this.picker.find('.rich-color-picker-cancel').removeClass('rich-color-picker-focus');
},
_clickSubmit: function(e) {
Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx
===================================================================
--- trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-04-14 13:44:09 UTC (rev 13564)
+++ trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-04-14 14:09:46 UTC (rev 13565)
@@ -23,7 +23,7 @@
<f:call name="addPopupToAjaxRendered" />
- <span id="#{clientId}" class="rich-colorPicker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style">
+ <span id="#{clientId}" class="rich-color-picker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style">
<input readonly="readonly" type="text" name="#{clientId}" value="#{value}"/>
<jsp:scriptlet><![CDATA[
if(component.getFacet("icon")!=null && component.getFacet("icon").isRendered()) {
@@ -32,20 +32,20 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <img src="#{arrow}" class="rich-colorPicker-icon #{component.attributes['iconClass']}" style="#{component.attributes['iconStyle']}" vertical-align="middle"/>
+ <img src="#{arrow}" class="rich-color-picker-icon #{component.attributes['iconClass']}" style="#{component.attributes['iconStyle']}" vertical-align="middle"/>
<jsp:scriptlet><![CDATA[
}
]]></jsp:scriptlet>
</span>
-<div id="#{clientId}-colorPicker-popup" class="rich-colorPicker-wrapper">
- <div class="rich-colorPicker-ext">
- <div class="rich-colorPicker-color">
+<div id="#{clientId}-colorPicker-popup" class="rich-color-picker-wrapper">
+ <div class="rich-color-picker-ext">
+ <div class="rich-color-picker-color">
<div>
<div></div>
</div>
</div>
- <div class="rich-colorPicker-rainbow">
+ <div class="rich-color-picker-rainbow">
<img src="#{rainbow}" alt="rainbow" />
<jsp:scriptlet>
<![CDATA[if(component.getFacet("arrows")!=null && component.getFacet("arrows").isRendered()) {]]>
@@ -65,43 +65,43 @@
</div>
- <div class="rich-colorPicker-new-color"></div>
- <div class="rich-colorPicker-current-color"></div>
- <div class="rich-colorPicker-hex-wrapper">
- <label for="rich-colorPicker-hex-wrapper" title="hex">#:</label>
- <input id="#{clientId}-colorPicker-hex" class="rich-colorPicker-colors-input" type="text" maxlength="6" size="6" />
+ <div class="rich-color-picker-new-color"></div>
+ <div class="rich-color-picker-current-color"></div>
+ <div class="rich-color-picker-hex-wrapper">
+ <label for="rich-color-picker-hex-wrapper" title="hex">#:</label>
+ <input id="#{clientId}-colorPicker-hex" class="rich-color-picker-colors-input" type="text" maxlength="6" size="6" />
</div>
- <div class="rich-colorPicker-rgb-wrapper rich-colorPicker-rgb-r">
+ <div class="rich-color-picker-rgb-wrapper rich-color-picker-rgb-r">
<label for="rgb">R:</label>
- <input id="#{clientId}-colorPicker-rgb-r" class="rich-colorPicker-colors-input" type="text" maxlength="3" size="2" />
+ <input id="#{clientId}-colorPicker-rgb-r" class="rich-color-picker-colors-input" type="text" maxlength="3" size="2" />
</div>
- <div class="rich-colorPicker-rgb-wrapper rich-colorPicker-rgb-g">
+ <div class="rich-color-picker-rgb-wrapper rich-color-picker-rgb-g">
<label for="rgb-g">G:</label>
- <input id="#{clientId}-colorPicker-rgb-g" class="rich-colorPicker-colors-input" type="text" maxlength="3" size="2" />
+ <input id="#{clientId}-colorPicker-rgb-g" class="rich-color-picker-colors-input" type="text" maxlength="3" size="2" />
</div>
- <div class="rich-colorPicker-rgb-wrapper rich-colorPicker-rgb-b">
+ <div class="rich-color-picker-rgb-wrapper rich-color-picker-rgb-b">
<label for="rgb-b">B:</label>
- <input id="#{clientId}-colorPicker-rgb-b" class="rich-colorPicker-colors-input" type="text" maxlength="3" size="2" />
+ <input id="#{clientId}-colorPicker-rgb-b" class="rich-color-picker-colors-input" type="text" maxlength="3" size="2" />
</div>
- <div class="rich-colorPicker-hsb-h rich-colorPicker-hsb-wrapper">
+ <div class="rich-color-picker-hsb-h rich-color-picker-hsb-wrapper">
<label for="hsb-h">H:</label>
- <input id="#{clientId}-colorPicker-hsb-h" class="rich-colorPicker-colors-input" type="text" maxlength="3" size="2" />
+ <input id="#{clientId}-colorPicker-hsb-h" class="rich-color-picker-colors-input" type="text" maxlength="3" size="2" />
</div>
- <div class="rich-colorPicker-hsb-s rich-colorPicker-hsb-wrapper">
+ <div class="rich-color-picker-hsb-s rich-color-picker-hsb-wrapper">
<label for="hsb-s">S:</label>
- <input id="#{clientId}-colorPicker-hsb-s" class="rich-colorPicker-colors-input" type="text" maxlength="3" size="2" />
+ <input id="#{clientId}-colorPicker-hsb-s" class="rich-color-picker-colors-input" type="text" maxlength="3" size="2" />
</div>
- <div class="rich-colorPicker-hsb-b rich-colorPicker-hsb-wrapper">
+ <div class="rich-color-picker-hsb-b rich-color-picker-hsb-wrapper">
<label for="hsb-b">B:</label>
- <input id="#{clientId}-colorPicker-hsb-b" class="rich-colorPicker-colors-input" type="text" maxlength="3" size="2" />
+ <input id="#{clientId}-colorPicker-hsb-b" class="rich-color-picker-colors-input" type="text" maxlength="3" size="2" />
</div>
- <button type="button" class="rich-colorPicker-submit" name="submit">Apply</button>
- <button type="button" class="rich-colorPicker-cancel" name="cancel">Cancel</button>
+ <button type="button" class="rich-color-picker-submit" name="submit">Apply</button>
+ <button type="button" class="rich-color-picker-cancel" name="cancel">Cancel</button>
</div>
</div>
<div style="display: none;" id="#{clientId}-colorPicker-script">
<script type="text/javascript">
- jQuery('div.rich-colorPicker-color').pngFix();
+ jQuery('div.rich-color-picker-color').pngFix();
<jsp:scriptlet><![CDATA[
Boolean flat = (Boolean) component.getAttributes().get("flat");
colorMode = (String) component.getAttributes().get("colorMode");
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13563 - trunk/docs/common-resources/en/src/main/xslt.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-04-14 09:14:28 -0400 (Tue, 14 Apr 2009)
New Revision: 13563
Modified:
trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
Log:
https://jira.jboss.org/jira/browse/RF-6599 - feedback is fixed;
Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-04-14 12:42:25 UTC (rev 13562)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-04-14 13:14:28 UTC (rev 13563)
@@ -79,13 +79,14 @@
<xsl:apply-templates mode="titlepage.mode"/>
</div>
</xsl:template>
+
<xsl:template name="feedback">
<!--[if IE 6]><iframe frameborder="0" class="problemLayer" id="place"><xsl:text> </xsl:text></iframe><![endif]-->
<div class="time_out_div" id="timeOutDiv"><xsl:text> </xsl:text></div>
<div id="feedback-maincontainer">
<h3 id="feedback-header">
Create new RichFaces Documentation Jira issue
- <a href="#" onclick="hidePopup('feedback-maincontainer', 'feedback-mailform', 'feedback-iFrame','feedback-submit', 'feedback-maincontainer');" id="feedback-close">
+ <a href="javascript:void(0);" onclick="hidePopup('feedback-maincontainer', 'feedback-mailform', 'feedback-iFrame','feedback-submit', 'feedback-maincontainer');" id="feedback-close">
<img src="images/close_org.png" class="feedback-images" />
</a>
</h3>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13562 - in trunk/test-applications/realworld2/web/src/main/webapp: includes/misc and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-14 08:42:25 -0400 (Tue, 14 Apr 2009)
New Revision: 13562
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/modalPanels.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
Log:
Fix Slideshow
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/misc/modalPanels.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13561 - trunk/test-applications/realworld2/web/src/main/webapp/includes/image.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-14 08:32:11 -0400 (Tue, 14 Apr 2009)
New Revision: 13561
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml
Log:
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13560 - in trunk/samples/richfaces-demo/src/main/webapp/templates: page and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-14 08:28:46 -0400 (Tue, 14 Apr 2009)
New Revision: 13560
Added:
trunk/samples/richfaces-demo/src/main/webapp/templates/page/
trunk/samples/richfaces-demo/src/main/webapp/templates/page/template.xhtml
Log:
page/layouts templates
Added: trunk/samples/richfaces-demo/src/main/webapp/templates/page/template.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/page/template.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/page/template.xhtml 2009-04-14 12:28:46 UTC (rev 13560)
@@ -0,0 +1,30 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+<rich:page width="800" sidebarWidth="100">
+ <f:facet name="sidebar">
+ <h:outputText value="Menu Goes here" />
+ </f:facet>
+ <f:facet name="header">
+ <h:outputText value="Header" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="Footer" />
+ </f:facet>
+ <rich:layout>
+ <rich:layoutPanel position="left" width="33">
+ <h:outputText value="left" />
+ </rich:layoutPanel>
+ <rich:layoutPanel position="center" width="33">
+ <h:outputText value="center" />
+ </rich:layoutPanel>
+ <rich:layoutPanel position="right" width="33">
+ <h:outputText value="right" />
+ </rich:layoutPanel>
+ </rich:layout>
+</rich:page>
+</ui:composition>
\ No newline at end of file
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13559 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/util and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-14 07:57:36 -0400 (Tue, 14 Apr 2009)
New Revision: 13559
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
Log:
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-14 11:57:28 UTC (rev 13558)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-14 11:57:36 UTC (rev 13559)
@@ -185,7 +185,7 @@
@Observer(Constants.IMAGE_DELETED_EVENT)
public void onImageDeleted(Image image, String path){
- model.resetModel(NavigationEnum.ALBUM_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), null, image.getAlbum().getImages());
+ model.resetModel(NavigationEnum.ALBUM_PREVIEW, model.getSelectedUser(), model.getSelectedShelf(), model.getSelectedAlbum(), null, model.getSelectedAlbum().getImages());
}
@Observer(Constants.AUTHENTICATED_EVENT)
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-14 11:57:28 UTC (rev 13558)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-14 11:57:36 UTC (rev 13559)
@@ -107,6 +107,18 @@
deleteDirectory(user.getPath());
}
+ @Observer(Constants.SHELF_ADDED_EVENT)
+ public void onShelfAdded(Shelf shelf){
+ File directory = getFileByPath(shelf.getPath());
+ FileUtils.addDirectory(directory);
+ }
+
+ @Observer(Constants.ALBUM_ADDED_EVENT)
+ public void onShelfAdded(Album album){
+ File directory = getFileByPath(album.getPath());
+ FileUtils.addDirectory(directory);
+ }
+
@Restrict("#{s:hasRole('admin')}")
public boolean saveAvatar(String path, User user) {
return writeFile(user.getPath() +
@@ -166,6 +178,9 @@
}
public String transformPath(String target, String substitute) {
+ if(target.length()<2 || target.lastIndexOf(Constants.DOT) == -1){
+ return "";
+ }
final String begin = target.substring(0, target.lastIndexOf(Constants.DOT));
final String end = target.substring(target.lastIndexOf(Constants.DOT));
return begin + substitute + end;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-14 11:57:28 UTC (rev 13558)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-14 11:57:36 UTC (rev 13559)
@@ -206,4 +206,11 @@
return ret;
}
+
+ public static void addDirectory(File directory) {
+ if (directory.exists()) {
+ deleteDirectory(directory, false);
+ }
+ directory.mkdirs();
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-14 11:57:28 UTC (rev 13558)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-14 11:57:36 UTC (rev 13559)
@@ -25,11 +25,11 @@
@Destroy @Transactional @Observer("org.jboss.seam.sessionExpired")
public void onDestroy(){
- if(user.getId() != null && !user.isPreDefined()){
+ /*if(user.getId() != null && !user.isPreDefined()){
user = em.merge(user);
em.remove(user);
em.flush();
Events.instance().raiseEvent(Constants.USER_DELETED_EVENT, user);
- }
+ }*/
}
}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml 2009-04-14 11:57:28 UTC (rev 13558)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml 2009-04-14 11:57:36 UTC (rev 13559)
@@ -8,7 +8,7 @@
<locale-config>
<default-locale>en</default-locale>
<supported-locale>en</supported-locale>
- <supported-locale>ru</supported-locale>
+ <!-- <supported-locale>ru</supported-locale>-->
</locale-config>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
</application>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13558 - in trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld: service and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-14 07:57:28 -0400 (Tue, 14 Apr 2009)
New Revision: 13558
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
Log:
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-04-14 01:55:10 UTC (rev 13557)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-04-14 11:57:28 UTC (rev 13558)
@@ -89,7 +89,7 @@
@Temporal(TemporalType.TIMESTAMP)
private Date created;
- @OneToOne(cascade = CascadeType.ALL, optional = true)
+ @OneToOne(optional = true)
private Image coveringImage;
// ********************** Accessor Methods ********************** //
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-04-14 01:55:10 UTC (rev 13557)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-04-14 11:57:28 UTC (rev 13558)
@@ -120,7 +120,7 @@
@Length(min = 3)
private String path;
- @ManyToMany(cascade = CascadeType.ALL)
+ @ManyToMany(cascade = CascadeType.PERSIST)
@JoinTable(name = "IMAGES_METATAGS",
joinColumns =
@JoinColumn(name = "CI_IMAGE_ID",
@@ -440,7 +440,7 @@
* @return if this image is covering for containing album
*/
public boolean isCovering() {
- return this.equals(this.getAlbum().getCoveringImage());
+ return covering;
}
/**
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-04-14 01:55:10 UTC (rev 13557)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-04-14 11:57:28 UTC (rev 13558)
@@ -86,7 +86,9 @@
//Populate set of tokens - 'candidates to metatags'
Set<String> toks = new HashSet<String>();
for (String s : tokens) {
- toks.add(s.trim());
+ if(!s.equals("")){
+ toks.add(s.trim());
+ }
}
for (String s : toks) {
@@ -110,6 +112,7 @@
em.persist(t);
}
}
+ t = null;
}
for (MetaTag tag : removals) {
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13557 - in trunk: samples/layout-sample/src/main/webapp and 9 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-04-13 21:55:10 -0400 (Mon, 13 Apr 2009)
New Revision: 13557
Added:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java
trunk/samples/layout-sample/src/main/webapp/images/
trunk/samples/layout-sample/src/main/webapp/images/icons/
trunk/samples/layout-sample/src/main/webapp/images/icons/arrow.png
trunk/samples/layout-sample/src/main/webapp/images/icons/copy.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/create_doc.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/create_folder.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/cut.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/delete.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/edit.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/filter.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/find.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/ico_new_group.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/ico_new_item.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/open.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/paste.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/redo.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/reload.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/repeat.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/save.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/save_all.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/save_as.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/undo.gif
trunk/samples/layout-sample/src/main/webapp/images/icons/verify.gif
trunk/samples/themes/src/main/java/org/richfaces/theme/images/PageBackground.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java
Modified:
trunk/samples/layout-sample/src/main/webapp/pages/index.xhtml
trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java
trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme1.xcss
trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss
trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx
trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java
trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss
Log:
Theme 2 done, Theme 1 started
Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java 2009-04-14 01:55:10 UTC (rev 13557)
@@ -0,0 +1,218 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.html;
+
+import java.awt.Dimension;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+
+import org.richfaces.renderkit.html.BaseGradient;
+import org.richfaces.renderkit.html.images.GradientType;
+import org.richfaces.renderkit.html.images.GradientType.BiColor;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class Base2WayGradient extends BaseGradient {
+
+
+
+
+ /**
+ * @param horizontal
+ */
+ public Base2WayGradient(boolean horizontal) {
+ super(horizontal);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param width
+ * @param height
+ * @param horizontal
+ */
+ public Base2WayGradient(int width, int height, boolean horizontal) {
+ super(width, height, horizontal);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param width
+ * @param height
+ * @param gradientHeight
+ * @param horizontal
+ */
+ public Base2WayGradient(int width, int height, int gradientHeight,
+ boolean horizontal) {
+ super(width, height, gradientHeight, horizontal);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param width
+ * @param height
+ * @param gradientHeight
+ * @param baseColor
+ * @param gradientColor
+ * @param horizontal
+ */
+ public Base2WayGradient(int width, int height, int gradientHeight,
+ String baseColor, String gradientColor, boolean horizontal) {
+ super(width, height, gradientHeight, baseColor, gradientColor, horizontal);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param width
+ * @param height
+ * @param gradientHeight
+ * @param baseColor
+ * @param gradientColor
+ */
+ public Base2WayGradient(int width, int height, int gradientHeight,
+ String baseColor, String gradientColor) {
+ super(width, height, gradientHeight, baseColor, gradientColor);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param width
+ * @param height
+ * @param gradientHeight
+ */
+ public Base2WayGradient(int width, int height, int gradientHeight) {
+ super(width, height, gradientHeight);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param width
+ * @param height
+ * @param baseColor
+ * @param gradientColor
+ * @param horizontal
+ */
+ public Base2WayGradient(int width, int height, String baseColor,
+ String gradientColor, boolean horizontal) {
+ super(width, height, baseColor, gradientColor, horizontal);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param width
+ * @param height
+ * @param baseColor
+ * @param gradientColor
+ */
+ public Base2WayGradient(int width, int height, String baseColor,
+ String gradientColor) {
+ super(width, height, baseColor, gradientColor);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param width
+ * @param height
+ */
+ public Base2WayGradient(int width, int height) {
+ super(width, height);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param baseColor
+ * @param gradientColor
+ * @param horizontal
+ */
+ public Base2WayGradient(String baseColor, String gradientColor,
+ boolean horizontal) {
+ super(baseColor, gradientColor, horizontal);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param baseColor
+ * @param gradientColor
+ */
+ public Base2WayGradient(String baseColor, String gradientColor) {
+ super(baseColor, gradientColor);
+ // TODO Auto-generated constructor stub
+ }
+
+
+ protected void drawBackGradient(Graphics2D g2d, Rectangle2D rectangle, BiColor colors, int height) {
+ if (colors != null) {
+ GradientPaint gragient = new GradientPaint(0, (float)(rectangle.getHeight()-height), colors.getBottomColor(), 0, (float) rectangle.getHeight(), colors.getTopColor());
+ g2d.setPaint(gragient);
+ g2d.fill(rectangle);
+ }
+ }
+
+
+ @Override
+ protected void paintGradient(Graphics2D g2d, Data data) {
+ Integer headerBackgroundColor = data.getHeaderBackgroundColor();
+ Integer headerGradientColor = data.getHeaderGradientColor();
+
+ if (headerBackgroundColor != null && headerGradientColor != null) {
+ BiColor biColor = new GradientType.BiColor(headerBackgroundColor, headerGradientColor);
+
+ GradientType type = data.getGradientType();
+ BiColor firstLayer = type.getFirstLayerColors(biColor);
+ BiColor secondLayer = type.getSecondLayerColors(biColor);
+
+ Dimension dim = getDimensions(null, data);
+
+ if (isHorizontal()) {
+ //x -> y, y -> x
+ g2d.transform(new AffineTransform(0, 1, 1, 0, 0, 0));
+ dim.setSize(dim.height, dim.width);
+ }
+
+ int localGradientHeight = getGradientHeight();
+ if (localGradientHeight < 0) {
+ localGradientHeight = dim.height/2;
+ }
+
+ Rectangle2D rect = new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ localGradientHeight);
+
+ drawGradient(g2d, rect, firstLayer, localGradientHeight);
+
+ rect = new Rectangle2D.Float(
+ 0,
+ localGradientHeight,
+ dim.width,
+ dim.height);
+
+ drawBackGradient(g2d, rect, firstLayer, localGradientHeight);
+
+ int smallGradientHeight = localGradientHeight / 2;
+
+ rect = new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ smallGradientHeight);
+
+ drawGradient(g2d, rect, secondLayer, smallGradientHeight);
+
+ rect = new Rectangle2D.Float(
+ 0,
+ dim.height-smallGradientHeight,
+ dim.width,
+ dim.height);
+
+ drawBackGradient(g2d, rect, secondLayer, smallGradientHeight);
+ }
+ }
+
+
+}
Property changes on: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/Base2WayGradient.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/arrow.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/arrow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/copy.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/copy.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/create_doc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/create_doc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/create_folder.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/create_folder.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/cut.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/cut.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/delete.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/delete.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/edit.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/edit.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/filter.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/filter.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/find.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/find.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/ico_new_group.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/ico_new_group.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/ico_new_item.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/ico_new_item.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/open.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/open.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/paste.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/paste.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/redo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/redo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/reload.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/reload.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/repeat.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/repeat.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/save.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/save.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/save_all.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/save_all.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/save_as.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/save_as.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/undo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/undo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/layout-sample/src/main/webapp/images/icons/verify.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/layout-sample/src/main/webapp/images/icons/verify.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/samples/layout-sample/src/main/webapp/pages/index.xhtml
===================================================================
(Binary files differ)
Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java 2009-04-14 01:55:10 UTC (rev 13557)
@@ -10,6 +10,7 @@
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
+import org.richfaces.renderkit.html.Base2WayGradient;
import org.richfaces.renderkit.html.BaseGradient;
import org.richfaces.renderkit.html.images.GradientType;
import org.richfaces.renderkit.html.images.GradientType.BiColor;
@@ -18,80 +19,11 @@
* @author asmirnov
*
*/
-public class FooterBackground extends BaseGradient {
+public class FooterBackground extends Base2WayGradient {
public FooterBackground() {
- super(1, 95, 47,"panelBorderColor","generalBackgroundColor", false);
+ super(1, 96, 48,"panelBorderColor","generalBackgroundColor", false);
}
- protected void drawBackGradient(Graphics2D g2d, Rectangle2D rectangle, BiColor colors, int height) {
- if (colors != null) {
- GradientPaint gragient = new GradientPaint(0, (float)(rectangle.getHeight()-height), colors.getBottomColor(), 0, (float) rectangle.getHeight(), colors.getTopColor());
- g2d.setPaint(gragient);
- g2d.fill(rectangle);
- }
- }
-
- @Override
- protected void paintGradient(Graphics2D g2d, Data data) {
- Integer headerBackgroundColor = data.getHeaderBackgroundColor();
- Integer headerGradientColor = data.getHeaderGradientColor();
-
- if (headerBackgroundColor != null && headerGradientColor != null) {
- BiColor biColor = new GradientType.BiColor(headerBackgroundColor, headerGradientColor);
-
- GradientType type = data.getGradientType();
- BiColor firstLayer = type.getFirstLayerColors(biColor);
- BiColor secondLayer = type.getSecondLayerColors(biColor);
-
- Dimension dim = getDimensions(null, data);
-
- if (isHorizontal()) {
- //x -> y, y -> x
- g2d.transform(new AffineTransform(0, 1, 1, 0, 0, 0));
- dim.setSize(dim.height, dim.width);
- }
-
- int localGradientHeight = getGradientHeight();
- if (localGradientHeight < 0) {
- localGradientHeight = dim.height/2;
- }
-
- Rectangle2D rect = new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- localGradientHeight);
-
- drawGradient(g2d, rect, firstLayer, localGradientHeight);
-
- rect = new Rectangle2D.Float(
- 0,
- localGradientHeight,
- dim.width,
- dim.height);
-
- drawBackGradient(g2d, rect, firstLayer, localGradientHeight);
-
- int smallGradientHeight = localGradientHeight / 2;
-
- rect = new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- smallGradientHeight);
-
- drawGradient(g2d, rect, secondLayer, smallGradientHeight);
-
- rect = new Rectangle2D.Float(
- 0,
- dim.height-smallGradientHeight,
- dim.width,
- dim.height);
-
- drawBackGradient(g2d, rect, secondLayer, smallGradientHeight);
- }
- }
-
}
Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java 2009-04-14 01:55:10 UTC (rev 13557)
@@ -16,7 +16,7 @@
public class HeaderBackground extends BaseGradient {
public HeaderBackground() {
- super(1, 95, 47,"headerBackgroundColor","headerGradientColor", false);
+ super(1, 95, 80,"headerBackgroundColor","headerGradientColor", false);
}
@Override
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/PageBackground.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/PageBackground.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/PageBackground.java 2009-04-14 01:55:10 UTC (rev 13557)
@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package org.richfaces.theme.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class PageBackground extends BaseGradient {
+
+ public PageBackground() {
+ super(1, 450, 450, "headerBackgroundColor", "headerGradientColor");
+ }
+
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/PageBackground.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java 2009-04-14 01:55:10 UTC (rev 13557)
@@ -0,0 +1,36 @@
+/**
+ *
+ */
+package org.richfaces.theme.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ShadowHeaderBackground extends BaseGradient {
+
+ public ShadowHeaderBackground() {
+ super(15, 95, 80,"headerGradientColor","headerBackgroundColor", false);
+ }
+
+ @Override
+ protected void paintGradient(Graphics2D g2d, Data data) {
+ // Paint gradient itself
+ super.paintGradient(g2d, data);
+ // Paint lower bar
+ Dimension dim = getDimensions(null, data);
+ Integer headerBackgroundColor = data.getHeaderBackgroundColor();
+
+ if(headerBackgroundColor != null && dim.height > getGradientHeight() && getGradientHeight() >=0){
+ g2d.setPaint(null);
+ g2d.setColor(new Color(headerBackgroundColor));
+ g2d.fillRect(0,getGradientHeight(),dim.width,dim.height);
+ }
+ }
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme1.xcss
===================================================================
--- trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme1.xcss 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme1.xcss 2009-04-14 01:55:10 UTC (rev 13557)
@@ -3,14 +3,46 @@
<f:template xmlns:f='http:/jsf.exadel.com/template'
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml">
+ <u:selector name="body">
+ <u:style name="background" skin="headerGradientColor"/>
+ <u:style name="margin" value="0px"/>
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.theme.images.PageBackground"/>
+ </u:style>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-position" value="top left"/>
+ </u:selector>
+ <u:selector name=".header_content">
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.theme.images.ShadowHeaderBackground"/>
+ </u:style>
+ <u:style name="margin" value="0px 10px 0px 10px" />
+ <u:style name="border-bottom-color" skin="generalBackgroundColor" />
+ <u:style name="background-color" skin="headerBackgroundColor"/>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-position" value="top left"/>
+ </u:selector>
+
+ <u:selector name=".footer_bg">
+ <u:style name="background-image">
+ <!-- images/bg_footer.png -->
+ <f:resource f:key="org.richfaces.theme.images.FooterBackground"/>
+ </u:style>
+ <u:style name="border-top" value="1px solid" />
+ <u:style name="border-top-color" skin="generalBackgroundColor" />
+ <u:style name="background-color" skin="panelBorderColor"/>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-position" value="center left"/>
+ </u:selector>
<f:verbatim>
<![CDATA[
.page_size{width : 90%;}
.menu_width{width : 300px;}
-body {margin : 0px; background : url(images/bg_page.png) top left #93C4E5;}
-.common_box {margin : 0px; background : url(images/bg_grad_page.png) top left repeat-x;}
+.common_box {margin : 0px; }
.header_bg_left {background : url(images/bg_header_left.png) top left no-repeat;}
.header_bg_right {background : url(images/bg_header_right.png) top right no-repeat; height : 105px;}
.header_content {margin : 0px 10px 0px 10px; height : 80px; position : relative;}
Modified: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss
===================================================================
--- trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss 2009-04-14 01:55:10 UTC (rev 13557)
@@ -64,7 +64,7 @@
</u:selector>
<f:verbatim>
<![CDATA[
-.menu_width{width : 300px;}
+/*.menu_width{width : 300px;}*/
.page_size {
Modified: trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx
===================================================================
--- trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx 2009-04-14 01:55:10 UTC (rev 13557)
@@ -15,15 +15,27 @@
<html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}"
>
<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>#{component.attributes['pageTitle']}</title>
<f:call name="themeStyle"/>
<f:call name="themeScript"/>
+ <style type="text/css">
+ <jsp:scriptlet><![CDATA[
+ Integer width = (Integer) component.getAttributes().get("width");
+ if (null != width && width.intValue() > 0) {
+ StringBuilder format = new StringBuilder(
+ ".rich-page{margin:auto;text-align:left;");
+ format.append("width:").append(width).append("px;");
+ writer.write(format.toString());
+ } else {
+ writer.write(".rich-page{width:100%;}\n");
+ }
+ ]]></jsp:scriptlet>
+ </style>
<u:insertFacet name="pageHeader"/>
</head>
<body x:passThruWithExclusions="value,name,type,id">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="rich-page" border="0" cellpadding="0" cellspacing="0">
<tr>
<td align="center" class="common_box">
@@ -48,7 +60,7 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
<tr>
<td class="menu_col">
- <div class="menu_width spacer"></div>
+ <div class="spacer" style="width:#{component.attributes['sidebarWidth']}px"></div>
<u:insertFacet name="sidebar"/>
</td>
<td class="content_col">
Modified: trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
===================================================================
--- trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx 2009-04-14 01:55:10 UTC (rev 13557)
@@ -19,8 +19,19 @@
<title>#{component.attributes['pageTitle']}</title>
<f:call name="themeStyle"/>
<f:call name="themeScript"/>
- <jsp:scriptlet>
- </jsp:scriptlet>
+ <style type="text/css">
+ <jsp:scriptlet><![CDATA[
+ Integer width = (Integer) component.getAttributes().get("width");
+ if (null != width && width.intValue() > 0) {
+ StringBuilder format = new StringBuilder(
+ ".rich-page{margin:auto;text-align:left;");
+ format.append("width:").append(width).append("px;");
+ writer.write(format.toString());
+ } else {
+ writer.write(".rich-page{width:100%;}\n");
+ }
+ ]]></jsp:scriptlet>
+ </style>
<u:insertFacet name="pageHeader"/>
</head>
@@ -40,7 +51,7 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
<tr>
<td class="menu_col">
- <div class="menu_width spacer" style="width:#{component.attributes['sidebarWidth']}"></div>
+ <div class="menu_width spacer" style="width:#{component.attributes['sidebarWidth']}px"></div>
<!-- begin menu -->
<u:insertFacet name="sidebar"/>
<!-- end meny -->
Modified: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-04-14 01:55:10 UTC (rev 13557)
@@ -185,11 +185,11 @@
String position;
if ("right".equals(sidebarPosition)) {
writer
- .write(".rich-page-main{float:left;margin-right:-25em;}\n");
+ .write(".rich-page-main{float:left;margin-right:-30em;}\n");
position = "right";
} else {
writer
- .write(".rich-page-main{float:right;margin-left:-25em;}\n");
+ .write(".rich-page-main{float:right;margin-left:-30em;}\n");
position = "left";
}
Integer sidebarWidth = (Integer) attributes.get("sidebarWidth");
Modified: trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java 2009-04-14 01:55:10 UTC (rev 13557)
@@ -3,15 +3,16 @@
*/
package org.richfaces.renderkit.html.images;
+import org.richfaces.renderkit.html.Base2WayGradient;
import org.richfaces.renderkit.html.BaseGradient;
/**
* @author asmirnov
*
*/
-public class PageFooterGradient extends BaseGradient {
+public class PageFooterGradient extends Base2WayGradient {
public PageFooterGradient() {
- super(1, 95, 47,"panelBorderColor","generalBackgroundColor", false);
+ super(1, 100, 50,"panelBorderColor","generalBackgroundColor", false);
}
}
Modified: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss
===================================================================
--- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-04-14 00:04:45 UTC (rev 13556)
+++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-04-14 01:55:10 UTC (rev 13557)
@@ -29,16 +29,16 @@
<u:style name="background-position" value="top left"/>
<u:style name="border-bottom" value="1px solid" />
<u:style name="border-bottom-color" skin="generalBackgroundColor" />
- <u:style name="background-color" skin="headerBackgroundColor"/>
+ <u:style name="background-color" skin="headerGradientColor"/>
<u:style name="min-height" value="40px" />
<u:style name="padding" value="0 20px" />
<u:style name="color" skin="trimColor" />
</u:selector>
<u:selector name=".rich-page-content">
- <u:style name="background-image">
+ <!-- u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.PageContentGradient"/>
- </u:style>
+ </u:style-->
<u:style name="min-height" value="200px" />
<u:style name="background-color" skin="generalBackgroundColor"/>
<u:style name="background-repeat" value="repeat-x"/>
@@ -46,15 +46,15 @@
</u:selector>
<u:selector name=".rich-page-main">
+ <u:style name="border-top" value="2px solid" />
+ <u:style name="border-top-color" skin="panelBorderColor" />
+ <u:style name="border-bottom" value="2px solid" />
+ <u:style name="border-bottom-color" skin="panelBorderColor" />
</u:selector>
<u:selector name=".rich-page-body">
<u:style name="vertical-align" value="top"/>
<u:style name="width" value="100%"/>
- <u:style name="border-top" value="2px solid" />
- <u:style name="border-top-color" skin="panelBorderColor" />
- <u:style name="border-bottom" value="2px solid" />
- <u:style name="border-bottom-color" skin="panelBorderColor" />
</u:selector>
<u:selector name=".rich-page-footer">
@@ -65,7 +65,7 @@
<u:style name="border-top-color" skin="generalBackgroundColor" />
<u:style name="background-color" skin="panelBorderColor"/>
<u:style name="background-repeat" value="repeat-x"/>
- <u:style name="background-position" value="top left"/>
+ <u:style name="background-position" value="center left"/>
<u:style name="text-align" value="center" />
<u:style name="padding" value="20px 0" />
</u:selector>
@@ -73,8 +73,6 @@
<u:selector name=".rich-page-sidebar">
<!--u:style name="padding" value="0 20px 0 20px" /-->
<u:style name="vertical-align" value="top"/>
- <u:style name="border-top" value="2px solid" />
- <u:style name="border-top-color" skin="panelBorderColor" />
<u:style name="border-right" value="2px solid" />
<u:style name="border-right-color" skin="panelBorderColor" />
<u:style name="border-bottom" value="2px solid" />
15 years, 2 months
- 1
- 0