[richfaces-svn-commits] JBoss Rich Faces SVN: r18546 - in modules/tests/metamer/trunk/application/src/main: webapp/templates and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Aug 11 07:28:50 EDT 2010
Author: ppitonak at redhat.com
Date: 2010-08-11 07:28:49 -0400 (Wed, 11 Aug 2010)
New Revision: 18546
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TemplateBean.java
modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml
Log:
* main template changed so that now h:form will can be rendered optionally
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TemplateBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TemplateBean.java 2010-08-10 19:27:47 UTC (rev 18545)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TemplateBean.java 2010-08-11 11:28:49 UTC (rev 18546)
@@ -46,6 +46,7 @@
private List<String> dataTableModel = new ArrayList<String>();
private TemplatesList templates;
private int templateIndex = 0;
+ private boolean renderForm;
@PostConstruct
public void init() {
@@ -54,6 +55,8 @@
dataTableModel.add("row 2");
dataTableModel.add("row 3");
dataTableModel.add("row 4");
+
+ renderForm = true;
}
/**
@@ -99,4 +102,13 @@
public String getNextTemplate() {
return templates.get(++templateIndex).toString();
}
+
+ public boolean isRenderForm() {
+ return renderForm;
+ }
+
+ public void setRenderForm(boolean renderForm) {
+ this.renderForm = renderForm;
+ }
+
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2010-08-10 19:27:47 UTC (rev 18545)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2010-08-11 11:28:49 UTC (rev 18546)
@@ -24,20 +24,29 @@
xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
- <h:panelGrid id="headerTable" columns="7" border="1" styleClass="external-table" columnClasses="header-column, header-column, header-column, header-column, header-column, header-column, header-column">
+ <h:panelGrid id="headerTable" columns="7" border="1" styleClass="external-table"
+ columnClasses="header-column, header-column, header-column, header-column, header-column, header-column, header-column">
- <h:panelGrid columns="3">
- <h:link id="goHomeLink" outcome="/index"><h:graphicImage id="goHomeImage" library="images" name="home.png" title="Go Home" style="width: 36px;"/></h:link>
- <h:link id="goToListLink" outcome="list"><h:graphicImage id="goToListImage" library="images" name="back.png" title="Go to List of Pages" style="width: 36px;"/></h:link>
- <h:graphicImage id="reRenderAllImage" library="images" name="refresh.png" title="Rerender All" style="width: 36px;">
- <a4j:ajax id="reRenderAllAjax" event="click" render="commonGrid"/>
- </h:graphicImage>
- </h:panelGrid>
+ <h:form id="controlsForm">
+ <h:panelGrid columns="3">
+ <h:link id="goHomeLink" outcome="/index">
+ <h:graphicImage id="goHomeImage" library="images" name="home.png" title="Go Home" style="width: 36px;" />
+ </h:link>
+ <h:link id="goToListLink" outcome="list">
+ <h:graphicImage id="goToListImage" library="images" name="back.png" title="Go to List of Pages"
+ style="width: 36px;" />
+ </h:link>
+ <h:graphicImage id="reRenderAllImage" library="images" name="refresh.png" title="Rerender All"
+ style="width: 36px;">
+ <a4j:ajax id="reRenderAllAjax" event="click" render="commonGrid" />
+ </h:graphicImage>
+ </h:panelGrid>
+ </h:form>
<h:panelGrid columns="2" width="230px">
<h:outputText id="a4jLogLabel" value="Display log" />
- <h:selectBooleanCheckbox id="a4jLogCheckbox" value="false" onchange="showOrHideLog()"/>
+ <h:selectBooleanCheckbox id="a4jLogCheckbox" value="false" onchange="showOrHideLog()" />
<h:outputText id="a4jStatusLabel" value="Status" />
<a4j:outputPanel ajaxRendered="true">
@@ -53,48 +62,55 @@
<ui:debug hotkey="L" />
</h:panelGrid>
- <h:panelGrid columns="2">
- <h:outputLabel id="reTestsCheckboxLabel" value="Display tests" for="reTestsCheckbox" />
- <h:selectBooleanCheckbox id="reTestsCheckbox" value="#{richBean.reTests}" onchange="submit();"
- disabled="true" />
+ <h:form id="displayControlsForm">
+ <h:panelGrid columns="2">
+ <h:outputLabel id="reTestsCheckboxLabel" value="Display tests" for="reTestsCheckbox" />
+ <h:selectBooleanCheckbox id="reTestsCheckbox" value="#{richBean.reTests}" onchange="submit();"
+ disabled="true" />
- <h:outputLabel id="reComponentCheckboxLabel" value="Display component" for="reComponentCheckbox" />
- <h:selectBooleanCheckbox id="reComponentCheckbox" value="#{richBean.reComponent}" onchange="submit();" />
- </h:panelGrid>
+ <h:outputLabel id="reComponentCheckboxLabel" value="Display component" for="reComponentCheckbox" />
+ <h:selectBooleanCheckbox id="reComponentCheckbox" value="#{richBean.reComponent}" onchange="submit();" />
+ </h:panelGrid>
+ </h:form>
- <h:panelGrid columns="1">
- <h:outputLabel id="skinSelectLabel" value="Select skin: " for="skinSelect" />
+ <h:form id="skinsForm">
+ <h:panelGrid columns="1">
+ <h:outputLabel id="skinSelectLabel" value="Select skin: " for="skinSelect" />
- <h:selectOneMenu id="skinSelect" value="#{richBean.skin}" style="width: 130px;" onchange="submit();">
- <f:selectItems value="#{richBean.skins}" />
- </h:selectOneMenu>
+ <h:selectOneMenu id="skinSelect" value="#{richBean.skin}" style="width: 130px;" onchange="submit();">
+ <f:selectItems value="#{richBean.skins}" />
+ </h:selectOneMenu>
- <h:selectOneMenu id="skinningSelect" value="#{richBean.skinning}" style="width: 130px;" onchange="submit();" disabled="true">
- <f:selectItems value="#{richBean.skinningList}" />
- </h:selectOneMenu>
- </h:panelGrid>
+ <h:selectOneMenu id="skinningSelect" value="#{richBean.skinning}" style="width: 130px;" onchange="submit();"
+ disabled="true">
+ <f:selectItems value="#{richBean.skinningList}" />
+ </h:selectOneMenu>
+ </h:panelGrid>
+ </h:form>
- <h:panelGrid id="templatesSelector" columns="1">
- <h:outputText id="templateSelectMenuLabel" value="Template:" />
+ <h:form id="templatesForm">
+ <h:panelGrid id="templatesSelector" columns="1">
+ <h:outputText id="templateSelectMenuLabel" value="Template:" />
- <ui:repeat id="templates" var="var" value="#{templateBean.templates}" varStatus="status">
- <h:selectOneMenu value="#{templateBean.templates[status.index]}" id="templateSelect"
- style="width: 150px;">
- <f:selectItems value="#{templateBean.availableTemplates}" />
- <f:converter converterId="templateNameConverter" />
- <a4j:ajax event="change" render="headerTable" />
- </h:selectOneMenu>
- <br />
- </ui:repeat>
+ <ui:repeat id="templates" var="var" value="#{templateBean.templates}" varStatus="status">
+ <h:selectOneMenu value="#{templateBean.templates[status.index]}" id="templateSelect"
+ style="width: 150px;">
+ <f:selectItems value="#{templateBean.availableTemplates}" />
+ <f:converter converterId="templateNameConverter" />
+ <a4j:ajax event="change" render="headerTable" />
+ </h:selectOneMenu>
+ <br />
+ </ui:repeat>
- <h:commandLink id="loadTemplate" value="Load" render="commonGrid" />
+ <h:commandLink id="loadTemplate" value="Load" render="commonGrid" />
- </h:panelGrid>
+ </h:panelGrid>
+ </h:form>
<h:panelGrid columns="1">
<a4j:outputPanel id="phasesPanel" layout="block" ajaxRendered="true">
<h:outputText id="requestTime" value="#{phasesBean.date}">
- <f:convertDateTime pattern="HH:mm:ss.SSS"/>
+ <f:convertDateTime pattern="HH:mm:ss.SSS" />
</h:outputText>
<ul class="phases-list">
<a4j:repeat value="#{phasesBean.phases}" var="phase">
@@ -104,9 +120,13 @@
</a4j:outputPanel>
</h:panelGrid>
- <h:panelGrid columns="1">
- <h:commandButton id="invalidateSessionButton" action="#{richBean.invalidateSession}" value="Invalidate Session" image="#{resource['images:cancel.png']}" title="Invalidate Session" style="width: 36px;"/>
- </h:panelGrid>
+ <h:form id="invalidateSessionForm">
+ <h:panelGrid columns="1">
+ <h:commandButton id="invalidateSessionButton" action="#{richBean.invalidateSession}"
+ value="Invalidate Session" image="#{resource['images:cancel.png']}" title="Invalidate Session"
+ style="width: 36px;" />
+ </h:panelGrid>
+ </h:form>
</h:panelGrid>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2010-08-10 19:27:47 UTC (rev 18545)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2010-08-11 11:28:49 UTC (rev 18546)
@@ -22,7 +22,9 @@
<!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:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j">
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:f="http://java.sun.com/jsf/core">
<h:head>
<title><ui:insert name="pageTitle">Metamer</ui:insert></title>
@@ -33,37 +35,46 @@
</h:head>
<h:body>
- <h:form id="form">
- <div class="header"><ui:include src="/templates/header.xhtml" /></div>
+ <div class="header"><ui:include src="/templates/header.xhtml" /></div>
- <div class="content">
- <div class="messages"><h:messages /></div>
+ <div class="content">
+ <div class="messages"><h:messages /></div>
- <h:panelGroup id="commonGrid" layout="block" rendered="#{richBean.reComponent}">
- <div>
+
+ <h:panelGroup id="commonGrid" layout="block" rendered="#{richBean.reComponent}">
+ <c:choose>
+ <c:when test="#{dontRenderForm}">
<div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div>
<ui:include src="/templates/#{templateBean.firstTemplate}.xhtml" />
<div style="margin-top: 20px;"><ui:insert name="outOfTemplateAfter" /></div>
- </div>
- </h:panelGroup> <br />
+ </c:when>
- </div>
+ <c:otherwise>
+ <h:form id="form">
+ <div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div>
+ <ui:include src="/templates/#{templateBean.firstTemplate}.xhtml" />
+ <div style="margin-top: 20px;"><ui:insert name="outOfTemplateAfter" /></div>
+ </h:form>
+ </c:otherwise>
+ </c:choose>
+ </h:panelGroup> <br />
- <ui:insert name="beforeFooter">
- <h:panelGroup id="a4jLogPanel" styleClass="log-panel" layout="block">
- <a4j:log id="a4jLog" height="300px" level="debug"/>
- </h:panelGroup>
+ </div>
+
+ <ui:insert name="beforeFooter">
+ <h:panelGroup id="a4jLogPanel" styleClass="log-panel" layout="block">
+ <a4j:log id="a4jLog" height="300px" level="debug"/>
+ </h:panelGroup>
+ </ui:insert>
+
+ <div class="footer">
+ <ui:insert name="footer">
+ <hr />
+ #{a4j.version}
+ <br/>
+ #{metamer.fullVersion}
</ui:insert>
+ </div>
- <div class="footer">
- <ui:insert name="footer">
- <hr />
- #{a4j.version}
- <br/>
- #{metamer.fullVersion}
- </ui:insert>
- </div>
-
- </h:form>
</h:body>
</html>
More information about the richfaces-svn-commits
mailing list