Author: alevkovsky Date: 2009-01-27 10:59:21 -0500 (Tue, 27 Jan 2009) New Revision: 12439 Added: trunk/test-applications/realworld/web/src/main/webapp/META-INF/skins/ trunk/test-applications/realworld/web/src/main/webapp/META-INF/skins/realworld.skin.properties trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml Removed: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml trunk/test-applications/realworld/web/src/main/webapp/layout/template2.xhtml trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css Log: Redesign realworld application Added: trunk/test-applications/realworld/web/src/main/webapp/META-INF/skins/realworld.skin.properties =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/META-INF/skins/realworld.skin.properties (rev 0) +++ trunk/test-applications/realworld/web/src/main/webapp/META-INF/skins/realworld.skin.properties 2009-01-27 15:59:21 UTC (rev 12439) @@ -0,0 +1,75 @@ +#Colors +headerBackgroundColor=#000000 +headerGradientColor=#F2F7FF +headerTextColor=#000000 +headerWeightFont=bold + +generalBackgroundColor=#D7D7D7 +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#ECF4FE + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#000000 +subBorderColor=#ffffff + +tabBackgroundColor=#C6DEFF +tabDisabledTextColor=#8DB7F3 + +trimColor=#D6E6FB + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#0078D0 +hoverLinkColor=#0090FF +visitedLinkColor=#0090FF + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + + +tableBackgroundColor=#D7D7D7 +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 +tableBorderWidth=1px + + +#Calendar colors +calendarWeekBackgroundColor=#F5F5F5 + +calendarHolidaysBackgroundColor=#FFEBDA +calendarHolidaysTextColor=#FF7800 + +calendarCurrentBackgroundColor=#FF7800 +calendarCurrentTextColor=#FFEBDA + +calendarSpecBackgroundColor=#E4F5E2 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FEFFDA + +#Gradients +gradientType=plain Property changes on: trunk/test-applications/realworld/web/src/main/webapp/META-INF/skins/realworld.skin.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml 2009-01-27 15:46:10 UTC (rev 12438) +++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml 2009-01-27 15:59:21 UTC (rev 12439) @@ -25,9 +25,9 @@ </filter-mapping> <context-param> - <param-name>org.richfaces.SKIN</param-name> - <param-value>blueSky</param-value> - </context-param> + <param-name>org.richfaces.SKIN</param-name> + <param-value>realworld</param-value> + </context-param> <context-param> <param-name>facelets.LIBRARIES</param-name> Deleted: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml (rev 0) +++ trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml 2009-01-27 15:59:21 UTC (rev 12439) @@ -0,0 +1,68 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:richx="http://richfaces.org/richx"> + <a4j:form id="menuform"> + + <rich:toolBar height="37" styleClass="main-menu-toolbar" id="menu" contentClass="main-menu-toolbar-content"> + + <rich:toolBarGroup > + <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + value="/img/shell/general_panelbar_bullet.gif" /> + <h:graphicImage height="30" + rendered="#{!renderLogic.isUserGuest() and messageManager.countUnreadedMessages > 0}" + value="/img/icons/message.gif"> + <rich:toolTip followMouse="true" direction="top-right" + showDelay="100" styleClass="tooltip"> + <span style="white-space: nowrap"> + #{messages['menu.message.tooltip']}</span> + </rich:toolTip> + </h:graphicImage> + <a4j:commandLink rendered="#{!renderLogic.isUserGuest()}" + value="#{messages['menu.messages']}" + actionListener="#{conversationState.setMainArea(navigationHelper.navigationEnumReadMessages)}" + reRender="mainform:mainArea" /> + <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + value="/img/shell/general_panelbar_bullet.gif" /> + <a4j:commandLink value="#{messages['menu.search']}" + actionListener="#{conversationState.setMainArea(navigationHelper.navigationEnumSearch)}" + reRender="mainform:mainArea" /> + <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + value="/img/shell/general_panelbar_bullet.gif" /> + <a4j:commandLink rendered="#{!renderLogic.isUserGuest()}" + value="#{messages['menu.image']}" + actionListener="#{conversationState.setMainArea(navigationHelper.navigationEnumImagePreview)}" + reRender="mainform:mainArea" /> + <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + value="/img/shell/general_panelbar_bullet.gif" /> + <a4j:commandLink rendered="#{!renderLogic.isUserGuest()}" + value="#{messages['menu.user']}" + actionListener="#{conversationState.showUserProfile(user)}" + reRender="mainform:mainArea" /> + <h:graphicImage rendered="#{!renderLogic.isUserGuest()}" + value="/img/shell/general_panelbar_bullet.gif" /> + <a4j:commandLink rendered="#{!renderLogic.isUserGuest()}" + value="#{messages['menu.file']}" + actionListener="#{treeManager.setMainArea(navigationHelper.navigationEnumFileUpload)}" + reRender="mainform:mainArea" /> + </rich:toolBarGroup> + <rich:toolBarGroup location="right"> + <h:panelGroup> + <h:commandLink action="#{localeSelector.selectLanguage('en')}"> + <h:graphicImage url="/img/gb.png" /> + </h:commandLink> + + <h:commandLink action="#{localeSelector.selectLanguage('ru')}"> + <h:graphicImage url="/img/ru.png" /> + </h:commandLink> + </h:panelGroup> + </rich:toolBarGroup> + </rich:toolBar> + </a4j:form> +</ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/template2.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css 2009-01-27 15:46:10 UTC (rev 12438) +++ trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld2.css 2009-01-27 15:59:21 UTC (rev 12439) @@ -4,10 +4,17 @@ height: 100%; } -.header-div { +.header-panel { height: 116px; + border: none; + padding: 0px; + background: none; } +.header-panel-body { + padding: 0px; +} + .header-content-div { height: 79px; position: relative; @@ -27,6 +34,11 @@ top: 14px; } +.top-right-menu-toolbar { + background: none; + border: none; +} + .top-right-menu-item { vertical-align: top; } @@ -38,31 +50,43 @@ font-weight: normal; } -.main-menu { +.main-menu-panel { height: 37px; position: relative; + border: none; + padding: 0px; background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807; - padding-left: 15px; } -.body-main-div { +.main-menu-panel-body { + border: none; + padding: 0px; +} + +.body-main-panel { background: url(../img/shell/general_panel_bg.gif) right top repeat-y; height: 100%; + padding: 0px; + border: none; } -.body-main-div-top { +.body-main-panel-header { height: 15px; background: url(../img/shell/general_panel_header_bg.gif) right top; font-size: 1px; + padding: 0px; + border: none; } -.footer-div { +.footer-panel { height: 82px; position: relative; background: url(../img/shell/footer_bg.gif) repeat-x #000000; + border: none; + padding: 0px; } -.footer-div-content { +.footer-panel-content { position: absolute; left: 8px; top: 51px;