Author: ppitonak(a)redhat.com Date: 2011-02-09 10:20:41 -0500 (Wed, 09 Feb 2011) New Revision: 21569 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml Log: * added id for statusChecker * removed id from component controls Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-02-09 15:03:33 UTC (rev 21568) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-02-09 15:20:41 UTC (rev 21569) @@ -97,27 +97,27 @@ <legend>JavaScript API of rich:accordion</legend> <h:commandButton id="switchButton1" value="switch to item1"> - <rich:componentControl id="componentControl1" event="click" operation="switchToItem" target="accordion" > + <rich:componentControl event="click" operation="switchToItem" target="accordion" > <f:param value="item1" /> </rich:componentControl> </h:commandButton> <h:commandButton id="switchButton2" value="switch to item2"> - <rich:componentControl id="componentControl2" event="click" operation="switchToItem" target="accordion" > + <rich:componentControl event="click" operation="switchToItem" target="accordion" > <f:param value="item2" /> </rich:componentControl> </h:commandButton> <h:commandButton id="switchButton3" value="switch to item3"> - <rich:componentControl id="componentControl1" event="click" operation="switchToItem" target="accordion" > + <rich:componentControl event="click" operation="switchToItem" target="accordion" > <f:param value="item3" /> </rich:componentControl> </h:commandButton> <h:commandButton id="switchButton4" value="switch to item4"> - <rich:componentControl id="componentControl1" event="click" operation="switchToItem" target="accordion" > + <rich:componentControl event="click" operation="switchToItem" target="accordion" > <f:param value="item4" /> </rich:componentControl> </h:commandButton> <h:commandButton id="switchButtonCustom" value="switch to item with custom name (#{richAccordionItemBean.attributes['name'].value})"> - <rich:componentControl id="componentControlCustom" event="click" operation="switchToItem" target="accordion" > + <rich:componentControl event="click" operation="switchToItem" target="accordion" > <f:param value="#{richAccordionItemBean.attributes['name'].value}" /> </rich:componentControl> </h:commandButton> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2011-02-09 15:03:33 UTC (rev 21568) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2011-02-09 15:20:41 UTC (rev 21569) @@ -40,8 +40,8 @@ style="width: 36px;" alt="Go to List of Pages"/> </h:link> <h:commandLink> - <h:graphicImage id="fullPageRefreshImage" library="images" name="recycle.png" title="Full Page Refresh" - style="width: 36px;" alt="Full Page Refresh" /> + <h:graphicImage id="fullPageRefreshImage" library="images" name="recycle.png" title="Full Page Refresh" + style="width: 36px;" alt="Full Page Refresh" /> </h:commandLink> <h:graphicImage id="reRenderAllImage" library="images" name="refresh.png" title="Rerender All" style="width: 36px;" alt="Rerender All"> @@ -63,40 +63,40 @@ </f:facet> </a4j:status> </a4j:outputPanel> - - <h:outputLabel value="Locale" /> - <h:outputText id="locale" value="#{facesContext.viewRoot.locale}" /> - + + <h:outputLabel value="Locale" /> + <h:outputText id="locale" value="#{facesContext.viewRoot.locale}" /> + <h:outputText id="showUiDebugLabel" value="Show ui:debug" /> <h:outputText id="showUiDebug" value="Ctrl+Shift+L" /> - + <h:outputLabel value="Render Checker" /> <a4j:outputPanel id="renderChecker"> - <h:outputText value="#{phasesBean.date}"> - <f:convertDateTime pattern="HH:MM:ss.SSS" /> - </h:outputText> + <h:outputText value="#{phasesBean.date}"> + <f:convertDateTime pattern="HH:MM:ss.SSS" /> + </h:outputText> </a4j:outputPanel> - + <h:outputLabel value="Status Checker" /> <a4j:outputPanel id="statusCheckerPanel"> - <a4j:status name="statusChecker" onstop="updateStatusChecker()" /> + <a4j:status id="statusChecker" name="statusChecker" onstop="updateStatusChecker()" /> <h:outputText id="statusCheckerOutput" value="" /> - - <h:outputScript target="head" library="script" name="date-format.js" /> - <h:outputScript target="head" library="script" name="clientTime-refresh.js" /> - <script> - function updateStatusChecker() { - Metamer.ClientTime.refresh(#{rich:element('statusCheckerOutput')}); - } - updateStatusChecker(); + + <h:outputScript target="head" library="script" name="date-format.js" /> + <h:outputScript target="head" library="script" name="clientTime-refresh.js" /> + <script type="text/javascript"> + function updateStatusChecker() { + Metamer.ClientTime.refresh(#{rich:element('statusCheckerOutput')}); + } + updateStatusChecker(); </script> </a4j:outputPanel> - + <ui:debug hotkey="L" /> </h:panelGrid> - - + + <h:form id="displayControlsForm"> <h:panelGrid columns="2"> <h:outputLabel id="reTestsCheckboxLabel" value="Display tests" for="reTestsCheckbox" /> @@ -165,9 +165,9 @@ </h:panelGrid> - - + + </ui:composition> </html> \ No newline at end of file