You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/05/18 05:35:53 UTC
svn commit: r170702 - in /incubator/beehive/trunk/samples/netui-jsf:
WEB-INF/src/jsf/physiciansFlow/messages.properties
jsf/physiciansFlow/confirmMailSent.jsp jsf/physiciansFlow/physicianDetail.jsp
jsf/physiciansFlow/physicianResultsWithDetail.jsp
jsf/physiciansFlow/search.jsp
Author: rich
Date: Tue May 17 20:35:52 2005
New Revision: 170702
URL: http://svn.apache.org/viewcvs?rev=170702&view=rev
Log:
Continuing to replace HTML and JSTL with JSF components throughout the NetUI/JSF sample.
Modified:
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/physiciansFlow/messages.properties
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/physiciansFlow/messages.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/physiciansFlow/messages.properties?rev=170702&r1=170701&r2=170702&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/physiciansFlow/messages.properties (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/jsf/physiciansFlow/messages.properties Tue May 17 20:35:52 2005
@@ -8,7 +8,7 @@
// information messages
searchResultsYes=Physicians matching your search criteria:
searchResultsNo=No physicians matching your search criteria were found. You may want to broaden your criteria.
-mailPrompt=Ask a question or send a comment
+mailPrompt=Ask a question or send a comment:
mailConfirmation=Your message to Dr. {0} {1} has been sent.
detailedResults=Detailed Search Results
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp?rev=170702&r1=170701&r2=170702&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp Tue May 17 20:35:52 2005
@@ -17,51 +17,36 @@
<f:loadBundle var="msgs" basename="jsf.physiciansFlow.messages" />
<h:form>
<!-- navigation links -->
- <table align="center" cellspacing="0" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue" >
- <tr>
- <td align="left" >
- <h:commandLink action="shared.home" value="Home" />
- </td>
- </tr>
- </table>
+ <h:panelGrid cellspacing="0" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue">
+ <f:attribute name="align" value="center"/>
+ <h:commandLink action="shared.home" value="Home" />
+ </h:panelGrid>
<!-- message to user -->
- <table align="center" style="margin-bottom: 15" width="90%" >
- <tr>
- <td align="left">
- <h:outputFormat value="#{msgs.mailConfirmation}">
- <f:param value="#{pageInput.firstName}"/>
- <f:param value="#{pageInput.lastName}"/>
- </h:outputFormat>
- </td>
- </tr>
- <tr>
- <td align="left" >
- <h:commandLink action="returnToPreviousPage" value="Return to Physician Details" />
-
- <h:commandLink action="physicianSearch" value="Return to Search" />
- </td>
- </tr>
- </table>
+ <h:panelGrid style="margin-bottom: 15" width="90%" >
+ <f:attribute name="align" value="center"/>
+
+ <h:panelGrid cellpadding="7">
+ <h:outputFormat value="#{msgs.mailConfirmation}">
+ <f:param value="#{pageInput.firstName}"/>
+ <f:param value="#{pageInput.lastName}"/>
+ </h:outputFormat>
+ </h:panelGrid>
+
+ <h:panelGrid cellpadding="7" columns="2">
+ <h:commandLink action="returnToPreviousPage" value="Return to Physician Details" />
+ <h:commandLink action="physicianSearch" value="Return to Search" />
+ </h:panelGrid>
+
+ </h:panelGrid>
</h:form>
<!-- explanatory comment block -->
- <c:if test="${sharedFlow.shared.commentsPreference}">
- <table align="center" width="90%" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;">
- <tr>
- <td>
- <h:outputText value="#{msgs.commentsHeading}" rendered="#{sharedFlow.shared.commentsPreference}" style="font-weight: bold" />
- </td>
- </tr>
- <tr>
- <td>
- <blockquote>
- <h:outputText value="#{msgs.mailConfirmationPageCommentOne}" rendered="#{sharedFlow.shared.commentsPreference}" />
- </blockquote>
- </td>
- </tr>
- </table>
- </c:if>
+ <h:panelGrid width="90%" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.commentsPreference}">
+ <f:attribute name="align" value="center"/>
+ <h:outputText value="#{msgs.commentsHeading}" style="font-weight: bold"/>
+ <h:outputText value="#{msgs.mailConfirmationPageCommentOne}"/>
+ </h:panelGrid>
</f:view>
</body>
</html>
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp?rev=170702&r1=170701&r2=170702&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianDetail.jsp Tue May 17 20:35:52 2005
@@ -15,105 +15,96 @@
<f:loadBundle var="msgs" basename="jsf.physiciansFlow.messages" />
<h:form>
<!-- navigation links -->
- <table align="center" cellspacing="0" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue" >
- <tr>
- <td align="left" >
- <h:commandLink action="shared.home" value="Home" />
- </td>
- <td align="right" >
- <h:commandLink action="physicianSearch" value="Return to Search" />
- </td>
- </tr>
- </table>
+ <h:panelGrid columns="2" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue" >
+ <f:attribute name="align" value="center"/>
+ <h:panelGrid>
+ <f:attribute name="align" value="left"/>
+ <h:commandLink action="shared.home" value="Home" />
+ </h:panelGrid>
+
+ <h:panelGrid>
+ <f:attribute name="align" value="right"/>
+ <h:commandLink action="physicianSearch" value="Return to Search" />
+ </h:panelGrid>
+ </h:panelGrid>
<!-- physician details -->
- <table align="center" style="background-color: #EEF3FB; border:solid 1px blue; margin-bottom: 30" >
- <tr>
- <td>
- <h:panelGrid columns="2" cellpadding="7" >
- <f:facet name="header" >
- <h:outputText value="Dr. #{pageInput.physicianDetail.firstName} #{pageInput.physicianDetail.lastName}" />
- </f:facet>
- <h:outputText value="#{msgs.specialtyColumnLabel}: " />
- <h:outputText value="#{pageInput.physicianDetail.specialty}" />
- <h:outputText value="#{msgs.genderColumnLabel}: " />
- <h:outputText value="#{pageInput.physicianDetail.gender}" />
- <h:outputText value="#{msgs.cityColumnLabel}: " />
- <h:outputText value="#{pageInput.physicianDetail.city}" />
- <h:outputText value="#{msgs.schoolColumnLabel}: " />
- <h:outputText value="#{pageInput.physicianDetail.school}" />
- <h:outputText value="#{msgs.hospitalsColumnLabel}: " />
- <h:panelGroup>
- <c:forEach items="${pageInput.physicianDetail.hospitalAffiliations}" var="hospital" >
- <f:verbatim>
- <c:out value="${hospital}" />
- <br>
- </f:verbatim>
- </c:forEach>
- </h:panelGroup>
- </h:panelGrid>
- </td>
- <td>
- <h:panelGrid columns="1" cellpadding="7" >
- <f:facet name="header" >
- <h:outputText value="#{msgs.bioHeading}" />
- </f:facet>
- <!-- disabled because this is for output text only -->
- <h:inputTextarea value="#{pageInput.physicianDetail.bio}" cols="40" rows="10" disabled="true" />
- </h:panelGrid>
- </td>
- </tr>
- </table>
+ <h:panelGrid columns="2" style="background-color: #EEF3FB; border:solid 1px blue; margin-bottom: 30" >
+ <f:attribute name="align" value="center"/>
+
+ <h:panelGrid columns="2" cellpadding="7" >
+ <f:facet name="header" >
+ <h:outputText value="Dr. #{pageInput.physician.firstName} #{pageInput.physician.lastName}" />
+ </f:facet>
+ <h:outputText value="#{msgs.specialtyColumnLabel}: " />
+ <h:outputText value="#{pageInput.physician.specialty}" />
+ <h:outputText value="#{msgs.genderColumnLabel}: " />
+ <h:outputText value="#{pageInput.physician.gender}" />
+ <h:outputText value="#{msgs.cityColumnLabel}: " />
+ <h:outputText value="#{pageInput.physician.city}" />
+ <h:outputText value="#{msgs.schoolColumnLabel}: " />
+ <h:outputText value="#{pageInput.physician.school}" />
+ <h:outputText value="#{msgs.hospitalsColumnLabel}: " />
+ <h:panelGroup>
+ <c:forEach items="${pageInput.physician.hospitalAffiliations}" var="hospital" >
+ <f:verbatim>
+ <c:out value="${hospital}" />
+ <br>
+ </f:verbatim>
+ </c:forEach>
+ </h:panelGroup>
+ </h:panelGrid>
+
+ <h:panelGrid columns="1" cellpadding="7" >
+ <f:facet name="header" >
+ <h:outputText value="#{msgs.bioHeading}" />
+ </f:facet>
+ <!-- disabled because this is for output text only -->
+ <h:inputTextarea value="#{pageInput.physician.bio}" cols="40" rows="10" disabled="true" />
+ </h:panelGrid>
+ </h:panelGrid>
<!-- mail form -->
- <table height="130" align = "center" >
- <tr>
- <td colspan = "2" >
- <h:inputTextarea value="#{backing.mailForm.message}" rows="6" cols="80" rendered="true" />
- </td>
- </tr>
- <tr>
- <td align="right" >
- <h:commandButton action="submitMailMessage" value="Send Mail" tabindex="1" >
- <f:attribute name="submitFormBean" value="backing.mailForm" />
- <f:param name="firstName" value="#{pageInput.physicianDetail.firstName}" />
- <f:param name="lastName" value="#{pageInput.physicianDetail.lastName}" />
- </h:commandButton>
- </td>
- </tr>
- </table>
+ <h:panelGrid>
+ <f:attribute name="align" value="center"/>
+
+ <h:outputText value="#{msgs.mailPrompt}" style="font-weight: bold"/>
+
+ <h:inputTextarea value="#{backing.mailForm.message}" rows="6" cols="80" rendered="true" />
+
+ <h:panelGrid>
+ <f:attribute name="align" value="right"/>
+ <h:commandButton action="submitMailMessage" value="Send Mail" tabindex="1" >
+ <f:attribute name="submitFormBean" value="backing.mailForm" />
+ <f:param name="firstName" value="#{pageInput.physician.firstName}" />
+ <f:param name="lastName" value="#{pageInput.physician.lastName}" />
+ </h:commandButton>
+ </h:panelGrid>
+ </h:panelGrid>
</h:form>
<!-- explanatory comment block -->
- <c:if test="${sharedFlow.shared.commentsPreference}">
- <table align="center" width="90%" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" >
- <tr>
- <td>
- <h:outputText value="#{msgs.commentsHeading}" rendered="#{sharedFlow.shared.commentsPreference}" style="font-weight: bold" />
- </td>
- </tr>
- <tr>
- <td>
- <blockquote>
- <h:outputText value="#{msgs.physicianDetailPageCommentOne}" rendered="#{sharedFlow.shared.commentsPreference}" />
- </blockquote>
- <blockquote>
- <h:outputText value="#{msgs.physicianDetailPageCommentTwo}" rendered="#{sharedFlow.shared.commentsPreference}" />
- </blockquote>
- <pre>
- <h:commandLink action="submitMailMessage" value="Send Mail" tabindex="1" />
- <f:attribute name="submitFormBean" value="backing.mailForm" />
- <f:param name="firstName" value="#{pageInput.physicianDetail.firstName}" />
- <f:param name="lastName" value="#{pageInput.physicianDetail.lastName}" />
- </h:commandLink>
- </pre>
- <blockquote>
- <h:outputText value="#{msgs.physicianDetailPageCommentThree}" rendered="#{sharedFlow.shared.commentsPreference}" />
- </blockquote>
- </td>
- </tr>
- </table>
- </c:if>
+ <h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.commentsPreference}">
+ <f:attribute name="align" value="center"/>
+
+ <h:outputText value="#{msgs.commentsHeading}" style="font-weight: bold"/>
+
+ <h:outputText value="#{msgs.physicianDetailPageCommentOne}"/>
+
+ <h:outputText value="#{msgs.physicianDetailPageCommentTwo}"/>
+ <f:verbatim>
+ <pre>
+ <h:commandLink action="submitMailMessage" value="Send Mail" tabindex="1" />
+ <f:attribute name="submitFormBean" value="backing.mailForm" />
+ <f:param name="firstName" value="#{pageInput.physician.firstName}" />
+ <f:param name="lastName" value="#{pageInput.physician.lastName}" />
+ </h:commandLink>
+ </pre>
+ </f:verbatim>
+
+ <h:outputText value="#{msgs.physicianDetailPageCommentThree}"/>
+ </h:panelGrid>
+
</f:view>
</body>
</html>
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp?rev=170702&r1=170701&r2=170702&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/physicianResultsWithDetail.jsp Tue May 17 20:35:52 2005
@@ -13,25 +13,24 @@
<f:loadBundle var="msgs" basename="jsf.physiciansFlow.messages" />
<h:form>
<!-- navigation links -->
- <table align="center" cellspacing="0" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue" >
- <tr>
- <td align="left" >
- <h:commandLink action="shared.home" value="Home" />
- </td>
- <td align="right" >
- <h:commandLink action="physicianSearch" value="Return to Search" />
- </td>
- </tr>
- </table>
+ <h:panelGrid columns="2" cellpadding="0" width="90%" style="margin-bottom: 30; padding-bottom: 5px; border-bottom: 2px solid blue" >
+ <f:attribute name="align" value="center"/>
+ <h:panelGrid>
+ <f:attribute name="align" value="left"/>
+ <h:commandLink action="shared.home" value="Home" />
+ </h:panelGrid>
+
+ <h:panelGrid>
+ <f:attribute name="align" value="right"/>
+ <h:commandLink action="physicianSearch" value="Return to Search" />
+ </h:panelGrid>
+ </h:panelGrid>
<!-- message to user -->
- <table align="center" style="margin-bottom: 15" >
- <tr>
- <td>
- <h:outputText value="#{msgs.detailedResults}" styleClass="infoMessage" />
- </td>
- </tr>
- </table>
+ <h:panelGrid style="margin-bottom: 15" >
+ <f:attribute name="align" value="center"/>
+ <h:outputText value="#{msgs.detailedResults}" styleClass="infoMessage" />
+ </h:panelGrid>
</h:form>
<!-- detailed search results -->
@@ -72,23 +71,11 @@
</h:dataTable>
<!-- explanatory comment block -->
- <c:if test="${sharedFlow.shared.commentsPreference}">
- <table align="center" width="90%" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;">
- <tr>
- <td>
- <h:outputText value="#{msgs.commentsHeading}" rendered="#{sharedFlow.shared.commentsPreference}" style="font-weight: bold" />
- </td>
- </tr>
- <tr>
- <td>
- <blockquote>
- <h:outputText value="#{msgs.detailedResultsPageCommentOne}" rendered="#{sharedFlow.shared.commentsPreference}" />
- </blockquote>
-
- </td>
- </tr>
- </table>
- </c:if>
+ <h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.commentsPreference}">
+ <f:attribute name="align" value="center"/>
+ <h:outputText value="#{msgs.commentsHeading}" style="font-weight: bold" />
+ <h:outputText value="#{msgs.detailedResultsPageCommentOne}" rendered="#{sharedFlow.shared.commentsPreference}" />
+ </h:panelGrid>
</f:view>
</body>
</html>
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp?rev=170702&r1=170701&r2=170702&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp Tue May 17 20:35:52 2005
@@ -45,8 +45,8 @@
<f:selectItems value="#{backing.resultFormatTypes}" id="resultFormatTypes" />
</h:selectOneRadio>
- <!-- here we submit a form to an action handler in the backing file -->
- <h:commandButton action="#{backing.execute}" styleClass="submitButton" id="searchButton" value="Search" />
+ <!-- here we submit a form to an action handler in the backing file -->
+ <h:commandButton action="#{backing.execute}" styleClass="submitButton" id="searchButton" value="Search" />
<f:facet name="td"/>
</h:panelGrid>
@@ -107,9 +107,9 @@
<!-- explanatory comment block -->
<h:panelGrid width="90%" cellpadding="5" style="background-color: #EEF3FB; margin-bottom: 30; border:1px solid blue;" rendered="#{sharedFlow.shared.commentsPreference}">
- <h:outputText value="#{msgs.commentsHeading}" rendered="#{sharedFlow.shared.commentsPreference}" style="font-weight: bold" />
+ <h:outputText value="#{msgs.commentsHeading}" style="font-weight: bold"/>
- <h:outputText value="#{msgs.searchPageCommentOne}" rendered="#{sharedFlow.shared.commentsPreference}" />
+ <h:outputText value="#{msgs.searchPageCommentOne}"/>
<f:verbatim>
<pre>
@Jpf.CommandHandler(
@@ -122,7 +122,7 @@
</f:verbatim>
- <h:outputText value="#{msgs.searchPageCommentTwo}" rendered="#{sharedFlow.shared.commentsPreference}" />
+ <h:outputText value="#{msgs.searchPageCommentTwo}"/>
<f:verbatim>
<pre>
<h:commandLink value="#{msgs.detailLabel}" action="physicianDetail" >
@@ -132,11 +132,11 @@
</f:verbatim>
- <h:outputText value="#{msgs.searchPageCommentThree}" rendered="#{sharedFlow.shared.commentsPreference}" />
+ <h:outputText value="#{msgs.searchPageCommentThree}"/>
- <h:outputText value="#{msgs.searchPageCommentFour}" rendered="#{sharedFlow.shared.commentsPreference}" />
+ <h:outputText value="#{msgs.searchPageCommentFour}"/>
- <h:outputText value="#{msgs.searchPageCommentFive}" rendered="#{sharedFlow.shared.commentsPreference}" />
+ <h:outputText value="#{msgs.searchPageCommentFive}"/>
</h:panelGrid>
</f:view>