From richfaces-svn-commits at lists.jboss.org Wed Mar 30 08:30:55 2011 Content-Type: multipart/mixed; boundary="===============8924664337094541249==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r22336 - modules/tests/metamer/trunk/application/src/main/webapp/templates. Date: Wed, 30 Mar 2011 08:30:55 -0400 Message-ID: <201103301230.p2UCUtTf018702@svn01.web.mwc.hst.phx2.redhat.com> --===============8924664337094541249== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ppitonak(a)redhat.com Date: 2011-03-30 08:30:54 -0400 (Wed, 30 Mar 2011) New Revision: 22336 Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/templa= te.xhtml Log: a4j:log fixed Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates= /template.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/tests/metamer/trunk/application/src/main/webapp/templates/templ= ate.xhtml 2011-03-30 09:34:57 UTC (rev 22335) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/templ= ate.xhtml 2011-03-30 12:30:54 UTC (rev 22336) @@ -25,75 +25,75 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - = + - = - - = - - <ui:insert name=3D"pageTitle">Metamer</ui:insert> - - - - - - - - = - = - - = - - - + = -
+ + <ui:insert name=3D"pageTitle">Metamer</ui:insert></titl= e> + <meta http-equiv=3D"Content-Type" content=3D"text/xhtml; chars= et=3DUTF-8" /> + <!-- WORKAROUND for RF-9355 ( https://javaserverfaces.dev.java= .net/issues/show_bug.cgi?id=3D1810 ) --> + <h:outputScript name=3D"jsf.js" library=3D"javax.faces" target= =3D"head"/> + <!-- WORKAROUND END --> + <h:outputStylesheet library=3D"css" name=3D"common.ecss" /> + <h:outputScript library=3D"script" name=3D"common.js" /> + <ui:insert name=3D"head"/> = - <div class=3D"content"> - <div class=3D"messages"><h:messages /></div> + </h:head> = - <h:panelGroup id=3D"commonGrid" layout=3D"block" rendered=3D"#= {richBean.reComponent}"> + <h:body> = - <c:set var=3D"nestedPrefix" value=3D"#{templateBean.compon= entPrefix}" /> - <c:set var=3D"nestedComponentId" value=3D"#{templateBean.c= omponentPrefix}#{componentId}" /> + <h:form id=3D"executeCheckerForm"> + <h:selectBooleanCheckbox id=3D"executeChecker" value=3D"#{= richBean.executeChecker}" style=3D"display: none" /> + </h:form> = - <c:choose> - <c:when test=3D"#{dontRenderForm}"> - <div style=3D"margin-bottom: 20px;"><ui:insert nam= e=3D"outOfTemplateBefore" /></div> - <ui:decorate template=3D"/templates/#{templateBean= .firstTemplate}.xhtml" /> - <div style=3D"margin-top: 20px;"><ui:insert name= =3D"outOfTemplateAfter" /></div> - </c:when> + <div class=3D"header"><ui:decorate template=3D"/templates/head= er.xhtml" /></div> = - <c:otherwise> - <h:form id=3D"beforeForm"> + <div class=3D"content"> + <div class=3D"messages"><h:messages /></div> + + <h:panelGroup id=3D"commonGrid" layout=3D"block" rendered= =3D"#{richBean.reComponent}"> + + <c:set var=3D"nestedPrefix" value=3D"#{templateBean.co= mponentPrefix}" /> + <c:set var=3D"nestedComponentId" value=3D"#{templateBe= an.componentPrefix}#{componentId}" /> + + <c:choose> + <c:when test=3D"#{dontRenderForm}"> <div style=3D"margin-bottom: 20px;"><ui:insert= name=3D"outOfTemplateBefore" /></div> - </h:form> - <h:form id=3D"form"> <ui:decorate template=3D"/templates/#{template= Bean.firstTemplate}.xhtml" /> - </h:form> - <h:form id=3D"afterForm"> <div style=3D"margin-top: 20px;"><ui:insert na= me=3D"outOfTemplateAfter" /></div> - </h:form> - </c:otherwise> - </c:choose> - </h:panelGroup> <br /> + </c:when> = - </div> + <c:otherwise> + <h:form id=3D"beforeForm"> + <div style=3D"margin-bottom: 20px;"><ui:in= sert name=3D"outOfTemplateBefore" /></div> + </h:form> + <h:form id=3D"form"> + <ui:decorate template=3D"/templates/#{temp= lateBean.firstTemplate}.xhtml" /> + </h:form> + <h:form id=3D"afterForm"> + <div style=3D"margin-top: 20px;"><ui:inser= t name=3D"outOfTemplateAfter" /></div> + </h:form> + </c:otherwise> + </c:choose> + </h:panelGroup> <br /> = - <ui:insert name=3D"beforeFooter"> - <h:panelGroup id=3D"a4jLogPanel" styleClass=3D"log-panel" lay= out=3D"block"> - <a4j:log id=3D"a4jLog" height=3D"300px" level=3D"debug"/> - </h:panelGroup> - </ui:insert> + </div> = - <div class=3D"footer"> - <ui:insert name=3D"footer"> - <ui:decorate template=3D"/templates/footer.xhtml" /> + <ui:insert name=3D"beforeFooter"> + <h:panelGroup id=3D"a4jLogPanel" styleClass=3D"log-panel"= layout=3D"block"> + <a4j:log id=3D"a4jLog" level=3D"debug"/> + </h:panelGroup> </ui:insert> - </div> = - </h:body> - = + <div class=3D"footer"> + <ui:insert name=3D"footer"> + <ui:decorate template=3D"/templates/footer.xhtml" /> + </ui:insert> + </div> + + </h:body> + </f:view> </html> --===============8924664337094541249==--