Skip to content

Antti Väyrynen / Moya

Go to a project
Commit eb860c94 by Antti Tönkyrä
Options

Merge branch 'master' of codecrew.fi:bortal 

Conflicts:
	code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml
2 parents c2c785f2 94afee8d
Inline Side-by-side
Showing with 72 additions and 49 deletions
code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui"> xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:products="http://java.sun.com/jsf/composite/cditools/products"
xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui">
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml"> <ui:composition
template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{foodWaveView.initCreateTemplate()}" /> <f:event type="preRenderView"
listener="#{foodWaveView.initCreateTemplate()}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
...@@ -16,63 +24,78 @@ ...@@ -16,63 +24,78 @@
<ui:define name="content"> <ui:define name="content">
<h:form> <h:form>
<p:wizard> <p:wizard>
<p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}"> <p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}">
<h:panelGrid columns="3"> <h:panelGrid columns="3">
<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" /> <h:outputLabel for="name"
<h:inputText id="name" value="#{foodWaveView.template.name}" /> value="#{i18n['foodwavetemplate.name']}" />
<h:message for="name" /> <h:inputText id="name" required="true"
value="#{foodWaveView.template.name}" />
<h:outputLabel for="description" value="#{i18n['foodwavetemplate.description']}" /> <h:message for="name" />
<h:inputText id="description" value="#{foodWaveView.template.description}" />
<h:message for="description" /> <h:outputLabel for="description"
</h:panelGrid> value="#{i18n['foodwavetemplate.description']}" />
<h:inputText id="description" required="true"
value="#{foodWaveView.template.description}" />
<h:message for="description" />
</h:panelGrid>
</p:tab> </p:tab>
<p:tab id="selectproducts" title="#{i18n['foodwavetemplate.selectproducts']}"> <p:tab id="selectproducts"
title="#{i18n['foodwavetemplate.selectproducts']}">
<h:messages /> <h:messages />
<h:panelGrid columns="4"> <h:panelGrid columns="4">
<h:outputText value="#{i18n['foodwavetemplate.productname']}" /> <h:outputText value="#{i18n['foodwavetemplate.productname']}" />
<h:outputText value="#{i18n['foodwavetemplate.productdescription']}" /> <h:outputText
value="#{i18n['foodwavetemplate.productdescription']}" />
<h:outputText value="#{i18n['foodwavetemplate.price']}" /> <h:outputText value="#{i18n['foodwavetemplate.price']}" />
<h:outputText value="&nbsp;" /> <h:outputText value="&nbsp;" />
<h:inputText id="productname" required="true"
value="#{foodWaveView.currentProduct.name}" />
<h:inputText id="productdescription" required="true"
value="#{foodWaveView.currentProduct.description}" />
<h:inputText id="price" required="true"
value="#{foodWaveView.currentProduct.price}" />
<p:commandButton value="#{i18n['foodwavetemplate.addproduct']}"
actionListener="#{foodWaveView.addProductToTemplate}"
update="productTable" />
<h:inputText id="productname" value="#{foodWaveView.currentProduct.name}" />
<h:inputText id="productdescription" value="#{foodWaveView.currentProduct.description}" />
<h:inputText id="price" value="#{foodWaveView.currentProduct.price}" />
<p:commandButton value="#{i18n['foodwavetemplate.addproduct']}" actionListener="#{foodWaveView.addProductToTemplate}" update="productTable" />
</h:panelGrid> </h:panelGrid>
<p:dataTable name="productTable" id="productTable" value="#{foodWaveView.template.products}" var="product" editable="true"> <p:dataTable name="productTable" id="productTable" value="#{foodWaveView.template.products}" var="product" editable="true">
<p:column headerText="#{i18n['foodwavetemplate.productname']}"> <p:column headerText="#{i18n['foodwavetemplate.productname']}">
<p:cellEditor> <p:cellEditor>
<f:facet name="output"> <f:facet name="output">
<h:outputText value="#{product.name}" /> <h:outputText value="#{product.name}" />
</f:facet> </f:facet>
<f:facet name="input"> <f:facet name="input">
<p:inputText value="#{product.name}" style="width:100%"/> <p:inputText value="#{product.name}" style="width:100%" />
</f:facet> </f:facet>
</p:cellEditor> </p:cellEditor>
</p:column> </p:column>
<p:column headerText="#{i18n['foodwavetemplate.productdescription']}"> <p:column
<p:cellEditor> headerText="#{i18n['foodwavetemplate.productdescription']}">
<f:facet name="output"> <p:cellEditor>
<h:outputText value="#{product.description}" /> <f:facet name="output">
</f:facet> <h:outputText value="#{product.description}" />
<f:facet name="input"> </f:facet>
<p:inputText value="#{product.description}" style="width:100%" /> <f:facet name="input">
</f:facet> <p:inputText value="#{product.description}" style="width:100%" />
</p:cellEditor> </f:facet>
</p:cellEditor>
</p:column> </p:column>
<p:column headerText="#{i18n['foodwavetemplate.price']}"> <p:column headerText="#{i18n['foodwavetemplate.price']}">
<p:cellEditor> <p:cellEditor>
<f:facet name="output"> <f:facet name="output">
<h:outputText value="#{product.price}" /> <h:outputText value="#{product.price}" />
</f:facet> </f:facet>
<f:facet name="input"> <f:facet name="input">
<p:inputText value="#{product.price}" style="width:100%" /> <p:inputText value="#{product.price}" style="width:100%" />
</f:facet> </f:facet>
</p:cellEditor> </p:cellEditor>
</p:column>
<p:column headerText="Options" style="width:50px">
<p:rowEditor />
</p:column> </p:column>
<p:column headerText="#{i18n['foodwavetemplate.actions']}" style="width:20px;"> <p:column headerText="#{i18n['foodwavetemplate.actions']}" style="width:20px;">
<p:rowEditor /> <p:rowEditor />
...@@ -83,7 +106,7 @@ ...@@ -83,7 +106,7 @@
</p:wizard> </p:wizard>
</h:form> </h:form>
</ui:define> </ui:define>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!