[richfaces-svn-commits] JBoss Rich Faces SVN: r17825 - in root/tests/metamer/trunk/src/main/webapp: components/a4jMediaOutput and 1 other directories.

Author: lfryc(a)redhat.com Date: 2010-07-10 14:30:45 -0400 (Sat, 10 Jul 2010) New Revision: 17825 Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jLog/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/flash.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/image.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/list.xhtml root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml Log: https://jira.jboss.org/browse/RFPL-466 * refactoring Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jLog/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jLog/simple.xhtml 2010-07-10 18:20:31 UTC (rev 17824) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jLog/simple.xhtml 2010-07-10 18:30:45 UTC (rev 17825) @@ -11,7 +11,6 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jLog.css"/> </ui:define> @@ -27,7 +26,7 @@ <a4j:commandButton id="submitError" value="Error Message" render="out" execute="@form" action="#{a4jLogBean.errorAction}"/> <br/> - + <a4j:outputPanel id="out"> <h:outputText value="Hello #{a4jLogBean.name}!" rendered="#{not empty a4jLogBean.name}"/> </a4j:outputPanel> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/flash.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2010-07-10 18:20:31 UTC (rev 17824) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2010-07-10 18:30:45 UTC (rev 17825) @@ -11,7 +11,6 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jMediaOutput.css"/> </ui:define> @@ -19,10 +18,9 @@ </ui:define> <ui:define name="component"> - <script src="#{facesContext.externalContext.requestContextPath}/script/swfobject.js" type="text/javascript"/> - <p>SWF Movie:</p> - <a4j:outputPanel id="flashPanelDynamic"> + <h:outputScript library="script" name="swfobject.js"/> + <a4j:outputPanel id="flashPanelDynamic"> <a4j:mediaOutput element="a" id="swfLink" style="display: none;" cacheable="false" session="true" createContent="#{a4jMediaOutputBean.paintFlash}" value="#{mediaData}" /> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/image.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/image.xhtml 2010-07-10 18:20:31 UTC (rev 17824) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/image.xhtml 2010-07-10 18:30:45 UTC (rev 17825) @@ -11,7 +11,6 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="a4jMediaOutput.css"/> </ui:define> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/list.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/list.xhtml 2010-07-10 18:20:31 UTC (rev 17824) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/list.xhtml 2010-07-10 18:30:45 UTC (rev 17825) @@ -13,5 +13,7 @@ <h3><h:outputLink value="image.xhtml">Image</h:outputLink></h3> <div>Simple page that contains media output (image) and input boxes for all its attributes.</div> + <h3><h:outputLink value="flash.xhtml">Flash</h:outputLink></h3> + <div>Simple page that contains media output (flash) and input boxes for all its attributes.</div> </h:body> </html> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml 2010-07-10 18:20:31 UTC (rev 17824) +++ root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml 2010-07-10 18:30:45 UTC (rev 17825) @@ -39,11 +39,11 @@ </div> - <h:panelGroup id="a4jLogPanel" layout="block"> + <h:panelGroup id="a4jLogPanel" styleClass="log-panel" layout="block"> <a4j:log id="a4jLog" height="300px" rendered="#{richBean.log}" /> </h:panelGroup> - <div id="footer"><ui:insert name="footer"> + <div class="footer"><ui:insert name="footer"> <hr /> RichFaces #{a4j.version} </ui:insert></div>