[richfaces-svn-commits] JBoss Rich Faces SVN: r21544 - in trunk/examples/richfaces-showcase/src/main/webapp: resources/css and 3 other directories.

Author: ilya_shaikovsky Date: 2011-02-08 11:48:22 -0500 (Tue, 08 Feb 2011) New Revision: 21544 Added: trunk/examples/richfaces-showcase/src/main/webapp/images/body-bg.jpg trunk/examples/richfaces-showcase/src/main/webapp/images/footer.png trunk/examples/richfaces-showcase/src/main/webapp/images/header-bg.png trunk/examples/richfaces-showcase/src/main/webapp/images/page-bg.png trunk/examples/richfaces-showcase/src/main/webapp/images/rf-logo.png trunk/examples/richfaces-showcase/src/main/webapp/images/select-skin-button.png trunk/examples/richfaces-showcase/src/main/webapp/images/sep.gif trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml Log: http://jira.jboss.org/browse/RF-9636 Added: trunk/examples/richfaces-showcase/src/main/webapp/images/body-bg.jpg =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/body-bg.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/footer.png =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/footer.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/header-bg.png =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/header-bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/page-bg.png =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/page-bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/rf-logo.png =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/rf-logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/select-skin-button.png =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/select-skin-button.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/sep.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/sep.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css 2011-02-08 16:48:22 UTC (rev 21544) @@ -0,0 +1,142 @@ +* { + margin:0; + padding:0; +} +html{ + height:100%; +} +body{ + background:#94aebc url(#{facesContext.externalContext.requestContextPath}/images/body-bg.jpg) left bottom repeat; + font:normal 12px "Lucida Sans Unicode","Lucida Grande",Geneva,Verdana,Arial,sans-serif; + height:100%; +} +ul{ + list-style:none; +} +a{ + color:#5a8eba; + outline:none; + text-decoration:none; +} +a:hover{ + text-decoration:underline; +} +p{ + margin:0; + padding:0 0 6px; +} +#page{ + margin:0 auto; + width:987px; +} +#header{ + background:url(#{facesContext.externalContext.requestContextPath}/images/header-bg.png) no-repeat top left; + height:90px; +} +#header .logo{ + float:left; + margin-left:7px; + text-decoration:none; +} +#header .logo img{ + border:none; +} +#header .right-controls{ + float:right; +} +#header ul.top-links{ + margin:5px 15px 0 0; + text-align:right; +} +#header ul.top-links li{ + display:inline; + font-size:11px; +} +#header ul.top-links li a{ + background:url(#{facesContext.externalContext.requestContextPath}/images/sep.gif) center right no-repeat; + color:#fff; + padding:0 8px 0 3px; +} +#header ul.top-links li.last a{ + background:none; + padding:0 0 0 3px; +} +#header ul.top-links li.download-link a{ + color:#eccb7b; +} +#header ul#skin-menu{ + color:#89a0be; + cursor:default; + font-weight:bold; + margin:38px 15px 0 0; + text-align:right; +} +#header ul#skin-menu li{ + cursor:pointer; + display:inline-block; + float:right; + height:25px; + margin-left:4px; + padding-left:5px; +} +#header ul#skin-menu li span{ + height:25px; + padding:3px 5px 0 0; + display:inline-block; +} +#header ul#skin-menu li span:hover{ + text-decoration:underline; +} +#header ul#skin-menu li.label{ + color:#999999; + cursor:default; + font-weight:normal; +} + +#header ul#skin-menu li.current-skin{ + background:url(#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png) left -75px no-repeat; + color:#fff; +} +#header ul#skin-menu li.current-skin span{ + background:url(#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png) right 0 repeat-x; +} +#header ul#skin-menu li.label span:hover, +#header ul#skin-menu li.current-skin span:hover{ + text-decoration:none; +} +#page-content{ + background:url(#{facesContext.externalContext.requestContextPath}/images/page-bg.png) 0 0 repeat-y; + height:100%; + min-height:520px; + padding:10px 20px 0; +} +#page-content .left-menu{ + float:left; + margin-right:10px; + min-height:450px; + width:210px; +} +#page-content .content-container { + float:left; + width:720px; +} + +#page-content:after{ + content: "."; + display: block; + clear: both; + visibility: hidden; + line-height: 0; + height: 0; +} + +#footer{ + background:url(#{facesContext.externalContext.requestContextPath}/images/footer.png) top left no-repeat; + color:#2d4351; + text-align:center; + padding:15px 20px 10px; +} + +.source .syntaxhighlighter .line{ + white-space: normal !important; +} \ No newline at end of file Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2011-02-08 16:06:14 UTC (rev 21543) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2011-02-08 16:48:22 UTC (rev 21544) @@ -3,29 +3,32 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich" + xmlns:c="http://java.sun.com/jsp/jstl/core"> <ui:composition template="/templates/main.xhtml"> <ui:define name="demoSampleParameters"> <f:metadata> <f:viewParam name="sample" value="#{demoNavigator.sample}" /> <f:viewParam name="demo" value="#{demoNavigator.demo}" /> - <f:viewParam name="skin" value="#{skinBean.skin}"/> + <f:viewParam name="skin" value="#{skinBean.skin}" /> </f:metadata> </ui:define> <ui:define name="body"> - <rich:panel styleClass="samples-navigator"> - <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s" varStatus="status"> - <h:link value="#{s.name}" includeViewParams="true"> - <f:param name="sample" value="#{s.id}" /> - <f:attribute name="style" value="#{(s.id == demoNavigator.currentSample.id) ? 'color:orange' : ''}"/> - </h:link> - <h:outputText rendered="#{s.newItem}" value="NEW!" styleClass="new_marker" /> - <h:outputText value=" | " rendered="#{not status.last}" /> - </ui:repeat> - </rich:panel> - <fieldset><legend><b>#{demoNavigator.currentSample.name}</b></legend> - <ui:include src="#{demoNavigator.sampleURI}" /></fieldset> + <style> +.navigation .rf-tab-hdr-brd,.navigation .rf-tab { + display: none; +} +</style> + <rich:tabPanel switchType="client" styleClass="navigation" + activeItem="#{demoNavigator.currentSample.id}" + onbeforeitemchange="return false;"> + <c:forEach items="#{demoNavigator.currentDemo.samples}" var="s"> + <rich:tab header="#{s.name}" name="#{s.id}" + onheaderclick="document.location='#{facesContext.externalContext.requestContextPath}/richfaces/component-sample.jsf?demo=#{d.id}&amp;sample=#{s.id}&amp;skin=#{skinBean.skin}'" /> + </c:forEach> + </rich:tabPanel> + <fieldset><ui:include src="#{demoNavigator.sampleURI}" /></fieldset> </ui:define> </ui:composition> Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2011-02-08 16:06:14 UTC (rev 21543) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2011-02-08 16:48:22 UTC (rev 21544) @@ -3,29 +3,18 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <rich:panel style="width:300px" styleClass="rf-p-c"> - <f:facet name="header"> - <h:outputText value="Navigation" /> - </f:facet> - <ul> - <a4j:repeat value="#{demoNavigator.groups}" var="gr"> - <li> - <h:outputText value="#{gr.name}" style="font-weight:bold"/> - <h:outputText rendered="#{gr.newItem}" value="NEW!" styleClass="new_marker" /> - </li> - <ul> - <a4j:repeat value="#{gr.demos}" var="d"> - <li> - <h:link outcome="/richfaces/component-sample.xhtml" value="#{d.name}" includeViewParams="false"> - <f:attribute name="style" value="#{(d.id == demoNavigator.currentDemo.id) ? 'color:orange' : ''}"/> - <f:param name="demo" value="#{d.id}"/> - </h:link> - <h:outputText rendered="#{d.newItem or gr.newItem}" value="NEW!" styleClass="new_marker" /> - </li> - </a4j:repeat> - </ul> - </a4j:repeat> - </ul> - </rich:panel> + xmlns:rich="http://richfaces.org/rich" + xmlns:c="http://java.sun.com/jsp/jstl/core"> + <rich:panelMenu activeItem="#{demoNavigator.currentDemo.id}"> + <c:forEach items="#{demoNavigator.groups}" var="gr"> + <rich:panelMenuGroup label="#{gr.name}"> + <c:forEach items="#{gr.demos}" var="d"> + <rich:panelMenuItem label="#{d.name}" action="#{d.id}" + mode="client" name="#{d.id}" + onclick="document.location='#{facesContext.externalContext.requestContextPath}/richfaces/component-sample.jsf?demo=#{d.id}&amp;skin=#{skinBean.skin}'"> + </rich:panelMenuItem> + </c:forEach> + </rich:panelMenuGroup> + </c:forEach> + </rich:panelMenu> </ui:composition> Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml 2011-02-08 16:06:14 UTC (rev 21543) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml 2011-02-08 16:48:22 UTC (rev 21544) @@ -1,21 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - - <ui:composition> - <rich:panel styleClass="skin-chooser .rf-p-c"> - <a4j:repeat var="skin" value="#{skinBean.skins}" iterationStatusVar="iterStatus"> - <h:link value="#{skin}" includeViewParams="true"> - <f:param name="skin" value="#{skin}"/> - <f:attribute name="style" value="#{(skin==skinBean.skin) ? 'color:orange' : ''}"/> - </h:link> - <h:outputText value = " | " rendered="#{not iterStatus.last}" /> - </a4j:repeat> - </rich:panel> - </ui:composition> - + +<ui:composition> + <ul id="skin-menu"> + <a4j:repeat var="skin" value="#{skinBean.skins}" + iterationStatusVar="iterStatus"> + <li class="#{(skin==skinBean.skin) ? 'current-skin' : ''}"><h:link + includeViewParams="true"> + <a4j:outputPanel> + #{skin} + </a4j:outputPanel> + <f:param name="skin" value="#{skin}" /> + </h:link></li> + </a4j:repeat> + <li class="label"><span>Select Skin:</span></li> + </ul> +</ui:composition> + </html> \ No newline at end of file Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-08 16:06:14 UTC (rev 21543) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-08 16:48:22 UTC (rev 21544) @@ -6,9 +6,8 @@ xmlns:a4j="http://richfaces.org/a4j"> <f:view contentType="text/html"> <ui:insert name="demoSampleParameters"/> - <h:head> -<title>Components Gallery</title> +<title>RichFaces Showcase</title> <script type="text/javascript"> var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-7306415-4']); @@ -19,69 +18,38 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -</script> +</script> +<h:outputStylesheet library="css" name="application.css"/> </h:head> <h:body> - <h:outputStylesheet library="org.richfaces.showcase" name="page.ecss" /> - <h:outputStylesheet library="org.richfaces.showcase" name="panel.ecss" /> - <table border="0" cellpadding="0" cellspacing="0" - class="rich-page header_bg #{cc.attrs.pageClass}"> - <tbody> - <tr> - <td> - <div - class="header_content rich-page-header #{cc.attrs.headerClass}"> - <h1>Welcome to RichFaces demo!</h1> - </div> - </td> - <td align="right" class="header_links_container"> - <h:outputLink value="http://jboss.org/richfaces">Project Site</h:outputLink> - <h:outputText value=" | "/> - <h:outputLink value="http://www.jboss.org/community/wiki/richfaceswikihomepage&quo... Wiki</h:outputLink> - <h:outputText value=" | "/> - <h:outputLink value="http://community.jboss.org/community/richfaces">RichF... Community Space</h:outputLink> - <h:outputText value=" | "/> - <h:outputLink value="http://jboss.org/richfaces/download/milestones.html">... - <h:outputText value=" | "/> - <h:outputLink value="http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richf... - </td> - </tr> - <tr> - <td width="100%" height="100%" class="bg_tabbody" colspan="2"> - <table cellpadding="0" cellspacing="0" border="0" width="100%" - height="100%" class="rich-page-content"> - <tbody> - <tr> - <td class="menu_col rich-page-sidebar"> - <div class="menu_width spacer"></div> - <ui:include src="/templates/includes/navigation.xhtml" /></td> - <td class="content_col rich-page-body"> - - <ui:remove> - <fieldset> - <legend>#{demoNavigator.currentComponent}</legend> - </fieldset> - </ui:remove> - <ui:include src="/templates/includes/skin-chooser.xhtml"/> - <ui:insert name="body"> - Body content missed - </ui:insert></td> - </tr> - </tbody> - </table> - </td> - </tr> - <tr> - <td class="footer_bg" colspan="2"> - <div - class="footer_bg_content rich-page-footer"> - #{a4j} - </div> - </td> - </tr> - </tbody> - </table> - + <div id="page"> + <div id="header"> + <a href="#" class="logo"><img src="#{facesContext.externalContext.requestContextPath}/images/rf-logo.png" alt="RF logo"/></a> + <div class="right-controls"> + <ul class="top-links"> + <li><a href="http://jboss.org/richfaces;jsessionid=bJJO_UTMPzC7DsTvo5vjKA&q... target="_blank">Project Site</a></li> + <li><a href="http://www.jboss.org/community/wiki/richfaceswikihomepage;jses... target="_blank">Project Wiki</a></li> + <li><a href="http://community.jboss.org/community/richfaces;jsessionid=bJJO... target="_blank">RichFaces Community Space</a></li> + <li class="download-link"><a href="http://jboss.org/richfaces/download/milestones.html;jsessionid... target="_blank">Download</a></li> + <li class="last"><a href="http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfa... target="_blank">Sources</a></li> + </ul> + <ui:include src="/templates/includes/skin-chooser.xhtml" /> + </div> + </div> + <div id="page-content"> + <div class="left-menu"> + <ui:include src="/templates/includes/navigation.xhtml" /> + </div> + <div class="content-container"> + <ui:insert name="body"> + Body content missed + </ui:insert> + </div> + </div> + <div id="footer"> + #{a4j} + </div> + </div> </h:body> </f:view> </html> \ No newline at end of file