Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/user/menu.xhtml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/user/menu.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff ============================================================================== --- openwebbeans/trunk/samples/reservation/src/main/webapp/user/menu.xhtml (original) +++ openwebbeans/trunk/samples/reservation/src/main/webapp/user/menu.xhtml Mon Dec 20 16:02:26 2010 @@ -1,19 +1,21 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the - License. +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:f="http://java.sun.com/jsf/core"; @@ -26,60 +28,60 @@ </head> <body> - - <f:view> - <div id="main"> - - <h:messages globalOnly="false" showSummary="true" infoClass="message infoMessage" errorClass="message errorMessage"></h:messages> - - <div class="logout"> - - <h:outputLink value="#{facesContext.externalContext.requestContextPath}/user/menu.jsf" style="float:left;"> - <h:outputText value="Home Page" /> - </h:outputLink> - - <h:form style="margin-left:10px;float:left;"> - <h:commandLink action="#{logoutBean.logout}" value="Logout"/> - </h:form> - </div> - - - <div class="caption"> - <h:outputText value="Welcome, "/> - <h:outputText value="#{sessionTracker.user.name} #{sessionTracker.user.surname}" style="color:red;font-weight:bold;"/> - - <br/> - - <h:outputText value="Last Login Date : "/> - <h:outputText value="#{sessionTracker.user.lastLoginDate}" style="color:red;font-weight:bold;"/> - - <ul style="display: block;margin-top: 15px;"> - - <h:form style="float:left;"> - <h:commandLink action="#{userUpdateBean.showInfo}" value="Update Personal Information" styleClass="menuItem"> - </h:commandLink> - </h:form> - - <h:form style="float:left;"> - <h:commandLink action="#{listReservationBean.showReservations}" value="Show Reservations" styleClass="menuItem"> - </h:commandLink> - </h:form> - - <h:outputLink value="#{facesContext.externalContext.requestContextPath}/user/addReservation.jsf" styleClass="menuItem"> - <f:param name="cid" value="#{cid}"/> - <h:outputText value="Add Reservations" /> - </h:outputLink> - - - </ul> - - <ui:insert name="caption"></ui:insert> - - </div> - - <ui:insert name="body"></ui:insert> - - </div> - </f:view> + +<f:view> + <div id="main"> + + <h:messages globalOnly="false" showSummary="true" infoClass="message infoMessage" errorClass="message errorMessage"></h:messages> + + <div class="logout"> + + <h:outputLink value="#{facesContext.externalContext.requestContextPath}/user/menu.xhtml" style="float:left;"> + <h:outputText value="Home Page" /> + </h:outputLink> + + <h:form style="margin-left:10px;float:left;"> + <h:commandLink action="#{logoutBean.logout}" value="Logout"/> + </h:form> + </div> + + + <div class="caption"> + <h:outputText value="Welcome, "/> + <h:outputText value="#{sessionTracker.user.name} #{sessionTracker.user.surname}" style="color:red;font-weight:bold;"/> + + <br/> + + <h:outputText value="Last Login Date : "/> + <h:outputText value="#{sessionTracker.user.lastLoginDate}" style="color:red;font-weight:bold;"/> + + <ul style="display: block;margin-top: 15px;"> + + <h:form style="float:left;"> + <h:commandLink action="#{userUpdateBean.showInfo}" value="Update Personal Information" styleClass="menuItem"> + </h:commandLink> + </h:form> + + <h:form style="float:left;"> + <h:commandLink action="#{listReservationBean.showReservations}" value="Show Reservations" styleClass="menuItem"> + </h:commandLink> + </h:form> + + <h:outputLink value="#{facesContext.externalContext.requestContextPath}/user/addReservation.xhtml" styleClass="menuItem"> + <f:param name="cid" value="#{cid}"/> + <h:outputText value="Add Reservations" /> + </h:outputLink> + + + </ul> + + <ui:insert name="caption"></ui:insert> + + </div> + + <ui:insert name="body"></ui:insert> + + </div> +</f:view> </body> </html> \ No newline at end of file
Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/user/updateInfo.xhtml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/user/updateInfo.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff ============================================================================== --- openwebbeans/trunk/samples/reservation/src/main/webapp/user/updateInfo.xhtml (original) +++ openwebbeans/trunk/samples/reservation/src/main/webapp/user/updateInfo.xhtml Mon Dec 20 16:02:26 2010 @@ -1,19 +1,21 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the - License. +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:f="http://java.sun.com/jsf/core"; @@ -26,60 +28,60 @@ </head> <body> - - <ui:composition template="/user/menu.xhtml"> - - <ui:define name="caption"> - <h:outputText value="Update Personal Information" styleClass="captionTitle" /> - </ui:define> - - <ui:define name="body"> - - <h:form id="form"> - - <h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns"> - - <h:outputLabel for="name"> - <h:outputText value="Name" /> - </h:outputLabel> - - <h:inputText value="#{userUpdateBean.name}" id="name" required="true" requiredMessage="Name is required!"/> - - <h:outputLabel for="surname"> - <h:outputText value="Surname" /> - </h:outputLabel> - - <h:inputText value="#{userUpdateBean.surname}" id="surname" required="true" requiredMessage="Surname is required!"/> - - <h:outputLabel for="age"> - <h:outputText value="Age" /> - </h:outputLabel> - - <h:inputText value="#{userUpdateBean.age}" id="age" required="true" requiredMessage="Age is required"> - </h:inputText> - - <h:outputLabel for="userName"> - <h:outputText value="User Name" /> - </h:outputLabel> - - <h:inputText value="#{userUpdateBean.userName}" id="userName" required="true" requiredMessage="User name is required and minumum 8 characters!"> - <f:validateLength minimum="8" maximum="50"/> - </h:inputText> - - <h:outputLabel for="password"> - <h:outputText value="Password" /> - </h:outputLabel> - - <h:inputSecret value="#{userUpdateBean.password}" id="password" required="true" requiredMessage="Password must be minumum 4 and maximum 8 characters!"> - <f:validateLength minimum="4" maximum="20"/> - </h:inputSecret> - - - <h:commandButton action="#{userUpdateBean.update}" value="Update" /> - - </h:panelGrid> - </h:form> - </ui:define> - </ui:composition> + +<ui:composition template="/user/menu.xhtml"> + + <ui:define name="caption"> + <h:outputText value="Update Personal Information" styleClass="captionTitle" /> + </ui:define> + + <ui:define name="body"> + + <h:form id="form"> + + <h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns"> + + <h:outputLabel for="name"> + <h:outputText value="Name" /> + </h:outputLabel> + + <h:inputText value="#{userUpdateBean.name}" id="name" required="true" requiredMessage="Name is required!"/> + + <h:outputLabel for="surname"> + <h:outputText value="Surname" /> + </h:outputLabel> + + <h:inputText value="#{userUpdateBean.surname}" id="surname" required="true" requiredMessage="Surname is required!"/> + + <h:outputLabel for="age"> + <h:outputText value="Age" /> + </h:outputLabel> + + <h:inputText value="#{userUpdateBean.age}" id="age" required="true" requiredMessage="Age is required"> + </h:inputText> + + <h:outputLabel for="userName"> + <h:outputText value="User Name" /> + </h:outputLabel> + + <h:inputText value="#{userUpdateBean.userName}" id="userName" required="true" requiredMessage="User name is required and minumum 8 characters!"> + <f:validateLength minimum="8" maximum="50"/> + </h:inputText> + + <h:outputLabel for="password"> + <h:outputText value="Password" /> + </h:outputLabel> + + <h:inputSecret value="#{userUpdateBean.password}" id="password" required="true" requiredMessage="Password must be minumum 4 and maximum 8 characters!"> + <f:validateLength minimum="4" maximum="20"/> + </h:inputSecret> + + + <h:commandButton action="#{userUpdateBean.update}" value="Update" /> + + </h:panelGrid> + </h:form> + </ui:define> +</ui:composition> </body> </html> \ No newline at end of file
