Author: dsvyatobatsko Date: 2008-03-28 12:41:37 -0400 (Fri, 28 Mar 2008) New Revision: 7370 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/examples/manually.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/examples/skinedPanel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml Log: demo site redesign Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -10,9 +10,9 @@ .col2 { vertical-align:top; width:450px; } .wizard { width:400px; } .wform td { vertical-align:top; } - .wfcol1 { width:60px; vertical-align:top; } - .wfcol2 { vertical-align:top; } - .wfcol3 { vertical-align:top; } + .wfcol1 { text-align: right; } + .wfcol2 { } + .wfcol3 { } .s1row td { height:30px; } .rich-message { color:red; } @@ -23,7 +23,11 @@ margin:0; padding:2px; } - + + .navPanel input[type="button"] { + background-color: #{richSkin.additionalBackgroundColor}; + } + </style> <br/> <h:panelGrid width="100%" columns="2" columnClasses="col1,col2"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -6,7 +6,7 @@ xmlns:rich="http://richfaces.org/rich"> <div style="position:relative;height:140px"> - <h:panelGrid rowClasses="s1row" columns="3" columnClasses="wfcol1,wfcol2,wfcol3"> + <h:panelGrid style="padding: 15px" rowClasses="s1row" columns="3" columnClasses="wfcol1,wfcol2,wfcol3"> <h:outputText value="First Name:" /> <h:inputText id="fn" value="#{profile.firstName}" label="First Name" required="true" /> <rich:message for="fn" /> @@ -18,12 +18,9 @@ <h:outputText value="Company:" /> <h:inputText id="comp" value="#{profile.company}" label="Company" required="true" /> <rich:message for="comp"/> - - - </h:panelGrid> - <div class="navPanel"> - <a4j:commandButton value="Next &gt;&gt;" style="float:right" action="next"/> + <div> + <a4j:commandButton style="float:right" action="next" value="Next&#160;&#187;"/> </div> </div> </ui:composition> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -9,8 +9,8 @@ <style type="text/css"> .pcolumn { - padding:10px; - vertical-align:top; + padding: 0px 30px 0px 0px; + vertical-align: top; } </style> @@ -26,8 +26,8 @@ decision what is process on the second (APPLY VALUES) phase. At this moment, the expression for 'disabled' still equals false. Therefore, the processing for button is bypassed. The action does not invoked as a result. - phase - </f:verbatim> + phase<br/><br/> + </f:verbatim> <f:verbatim> This example will work properly. The code is almost the same as for @@ -39,16 +39,14 @@ JSF lifecycle. At the beginning of the next cycle, it updates with the rsBean2 with the stored data. Therefore, the expression for 'disabled' equals true on the second phase. The button is processed and the action is - invoked. + invoked.<br/><br/> </f:verbatim> - - <h:panelGroup> <h:form> <h:inputText size="4" label="First Addent" value="#{rsBean.addent1}"> <a4j:support event="onkeyup" reRender="btn" /> </h:inputText> - <h:outputText value="+"/> + <h:outputText value=" + "/> <h:inputText size="4" label="Second Addent" value="#{rsBean.addent2}"> <a4j:support event="onkeyup" reRender="btn" /> </h:inputText> @@ -65,7 +63,7 @@ <h:inputText size="4" label="First Addent" value="#{rsBean2.addent1}"> <a4j:support event="onkeyup" reRender="btn2" /> </h:inputText> - <h:outputText value="+"/> + <h:outputText value=" + "/> <h:inputText size="4" label="Second Addent" value="#{rsBean2.addent2}"> <a4j:support event="onkeyup" reRender="btn2" /> </h:inputText> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -9,6 +9,8 @@ .col { width:50%; padding:10px; + padding: 0px 30px 0px 0px; + vertical-align: top; } </style> @@ -34,7 +36,7 @@ <a4j:outputPanel layout="block"> <h:form> - <h:outputText value="Enter Text: "/> + <h:outputText style="font-weight: bold;" value="Enter Text: "/> <h:inputText id="text1" label="text1" value="#{rsBean.text1}"> <f:validateLength maximum="10"/> <a4j:support event="onkeyup" reRender="out1" /> @@ -56,7 +58,7 @@ <a4j:outputPanel layout="block"> <h:form> - <h:outputText value="Enter Text: "/> + <h:outputText style="font-weight: bold;" value="Enter Text: "/> <h:inputText id="text2" label="text1" value="#{rsBean.text2}"> <f:validateLength maximum="10"/> <a4j:support event="onkeyup" reRender="out2" /> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -43,7 +43,7 @@ <rich:insert src="/richfaces/page/snippets/page.xhtml" highlight="xhtml"></rich:insert> </rich:panel> <p> - Will be rendered as: + <b>Will be rendered as:</b> </p> <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> <rich:insert src="/richfaces/page/snippets/gen.xhtml" highlight="xhtml"></rich:insert> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/examples/manually.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/examples/manually.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/examples/manually.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -13,12 +13,25 @@ return -1*Math.pow(4,-2*pos) * Math.sin((pos*3-1)*(3*Math.PI)/2) + 1; }; </script> + <style type="text/css"> + .scriptdemobtn { + width: 75px; + } + .scriptdemocolumn-l { + padding: 2px; + text-align: right; + } + .scriptdemocolumn-r { + padding: 2px; + text-align: left; + } + </style> - <h:commandButton onclick="new Effect.BlindUp($('mypanel'), {duration:.3});return false" value="Hide" /> - <h:commandButton onclick="new Effect.BlindDown($('mypanel'),{duration:1.5,transition:Effect.Transitions.Elastic});return false" value="Show" /> + <h:commandButton class="scriptdemobtn" onclick="new Effect.BlindUp($('mypanel'), {duration:.3});return false" value="Hide" style="margin-right: 5px;" /> + <h:commandButton class="scriptdemobtn" onclick="new Effect.BlindDown($('mypanel'),{duration:1.5,transition:Effect.Transitions.Elastic});return false" value="Show" /> <div> - <rich:spacer height="20" /> + <rich:spacer height="10" /> <rich:panel id="mypanel"> <f:facet name="header"> @@ -26,18 +39,21 @@ </f:facet> <h:form> - <h:panelGrid styleClass="rsPanel" width="250" columns="2"> + <h:panelGrid styleClass="rsPanel" width="250" columns="2" columnClasses="scriptdemocolumn-l,scriptdemocolumn-r"> <h:outputText styleClass="rsLabel" value="Name:" /> <h:inputText styleClass="rsInput" value="#{userBean.name}" /> <h:outputText styleClass="rsLabel" value="Job:" /> <h:inputText styleClass="rsInput" value="#{userBean.job}" /> - <h:panelGroup /> - <h:commandButton styleClass="rsButton" value="Submit"> - <a4j:support disableDefault="true" event="onclick" reRender="out" /> - </h:commandButton> - + <h:panelGroup/> + <h:panelGroup> + <rich:spacer height="5"/> + <h:commandButton styleClass="rsButton" value="Submit" style="width: 75px"> + <a4j:support disableDefault="true" event="onclick" reRender="out" /> + </h:commandButton> + </h:panelGroup> + <f:facet name="footer"> </f:facet> @@ -47,6 +63,7 @@ <h:outputText value=""/> <h:outputText value="You have just entered:"/> + <h:outputText value=""/> <h:outputText value="Name: #{userBean.name}" /> <h:outputText value="Job: #{userBean.job}" /> </h:panelGrid> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/usage.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/usage.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -21,9 +21,13 @@ RichFaces resource framework. For example, if your script file is located inside the jar file and has a full path there: /org/mycompany/assets/script/focus.js , you can point to it with: - <pre style="margin:0px"> - <span class="xml_tag_symbols">&lt;</span><span class="xml_tag_name">a4j:loadScript</span><span class="xml_plain"> </span><span class="xml_attribute_name">src</span><span class="xml_tag_symbols">=</span><span class="xml_attribute_value">"resource:///org/mycompany/assets/script/focus.js"</span><span class="xml_plain"> </span><span class="xml_tag_symbols">/&gt;</span><span class="xml_plain"/> - </pre> + + <fieldset class="demo_fieldset"> + <legend class="demo_legend">Code</legend> + <div id="padding" style="padding: 20px"> + <span class="xml_tag_symbols">&lt;</span><span class="xml_tag_name">a4j:loadScript</span><span class="xml_plain"> </span><span class="xml_attribute_name">src</span><span class="xml_tag_symbols">=</span><span class="xml_attribute_value">"resource:///org/mycompany/assets/script/focus.js"</span><span class="xml_plain"> </span><span class="xml_tag_symbols">/&gt;</span><span class="xml_plain"/> + </div> + </fieldset> </p> <p> It is possible to register aliases in the static script files or dynamically Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/examples/skinedPanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/examples/skinedPanel.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/examples/skinedPanel.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -11,6 +11,8 @@ <f:facet name="header"> <h:outputText value="Applying Skin on non-RichFaces Components"/> </f:facet> + + <div id="padding" style="padding: 20px"> <h:commandLink value="DeepMarine"> <a4j:actionparam name="skin" value="deepMarine" assignTo="#{skinBean.skin}"/> </h:commandLink> @@ -23,9 +25,9 @@ <a4j:actionparam name="skin" value="japanCherry" assignTo="#{skinBean.skin}"/> </h:commandLink> - <rich:separator height="2" style="padding:10px 0" /> + <rich:separator height="1" style="padding:10px 0" /> - <h:panelGrid styleClass="rsPanel" width="250" columns="2"> + <h:panelGrid style="padding: 15px" styleClass="rsPanel" width="250" columns="2"> <h:outputText styleClass="rsLabel" value="Name:" /> <h:inputText styleClass="rsInput" value="#{userBean.name}" /> @@ -42,13 +44,14 @@ </h:panelGrid> <h:panelGrid id="out" columns="1"> - + + <rich:spacer height="10"/> + <h:outputText value="You have just entered:"/> <h:outputText value=""/> - <h:outputText value="You have just entered:"/> <h:outputText value="Name: #{userBean.name}" /> <h:outputText value="Job: #{userBean.job}" /> </h:panelGrid> - + </div> </rich:panel> </h:form> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml 2008-03-28 16:39:34 UTC (rev 7369) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml 2008-03-28 16:41:37 UTC (rev 7370) @@ -22,9 +22,12 @@ jar file and has a full path there: /org/mycompany/assets/css/common.css, you can point to it with: </p> -<pre style="margin:0px"> - <span class="xml_tag_symbols">&lt;</span><span class="xml_tag_name">a4j:loadStyle</span><span class="xml_plain"> </span><span class="xml_attribute_name">src</span><span class="xml_tag_symbols">=</span><span class="xml_attribute_value">"resource:///org/mycompany/assets/css/common.css"</span><span class="xml_plain"> </span><span class="xml_tag_symbols">/&gt;</span><span class="xml_plain"/> -</pre> + <fieldset class="demo_fieldset"> + <legend class="demo_legend">Code</legend> + <div id="padding" style="padding: 20px"> + <span class="xml_tag_symbols">&lt;</span><span class="xml_tag_name">a4j:loadStyle</span><span class="xml_plain"> </span><span class="xml_attribute_name">src</span><span class="xml_tag_symbols">=</span><span class="xml_attribute_value">"resource:///org/mycompany/assets/css/common.css"</span><span class="xml_plain"> </span><span class="xml_tag_symbols">/&gt;</span><span class="xml_plain"/> + </div> + </fieldset> <p> Richfaces allows to have a dynamically generated css file based on RichFaces skinnability feature. xcss is an XML formated css with some additional extensions.