Skip to content

Max Mecklin / Moya

Go to a project
Commit 5188f5b1 by Riku Silvola
Options

stylify food

1 parent f3702bb1
Inline Side-by-side
Showing with 254 additions and 147 deletions
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"> 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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave"
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.initFoodwaveManagerList}" /> <f:event type="preRenderView"
listener="#{foodWaveView.initFoodwaveManagerList}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
<h1>fixme</h1> <h1>#{i18n['foodWave.list']}</h1>
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave"> <p:dataTable
<h:column > styleClass="bordertable" value="#{foodWaveView.foodWaves}"
var="foodwave" >
<p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputLabel id="name" value="${i18n['foodWave.name']}" /> <h:outputText value="${i18n['foodWave.time']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.time.time}">
<h:link outcome="/foodmanager/listOrders" value="#{foodwave.name}"> <f:convertDateTime pattern="hh:mm d/M/yy" />
<f:param name="foodwaveid" value="#{foodwave.id}" /> </h:outputText>
</h:link> </p:column>
</h:column> <p:column>
<h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.template.name']}" /> <h:outputText value="${i18n['foodWave.template.name']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" value="#{foodwave.template.name}"> <h:outputText value="#{foodwave.template.name}" />
<f:param name="foodwaveid" value="#{foodwave.id}" /> </p:column>
</h:link> <p:column>
</h:column>
<h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.orders']}" /> <h:outputLabel id="name" value="${i18n['foodWave.name']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" value="#{foodwave.accountEvents.size()}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <h:outputText value="#{foodwave.name}" />
</h:link> </p:column>
</h:column> <p:column styleClass="text-center">
<h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.unconfirmedOrders']}" /> <h:outputText value="${i18n['foodWave.paid']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" value="#{foodwave.billLines.size()}"> <h:outputText value="#{foodwave.accountEvents.size()}" />
<f:param name="foodwaveid" value="#{foodwave.id}" /> </p:column>
</h:link> <p:column styleClass="text-center">
</h:column>
<h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.totalReserved']}" /> <h:outputText value="${i18n['foodWave.unconfirmedOrders']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" value="#{foodwave.reservedCount}"> <h:outputText value="#{foodwave.billLines.size()}" />
<f:param name="foodwaveid" value="#{foodwave.id}" /> </p:column>
</h:link> <p:column>
</h:column>
<h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.time']}" /> <h:outputText value="${i18n['foodWave.totalReserved']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.reservedCount}" /> / <h:outputText
value="#{foodwave.maximumFoods}" />
</p:column>
<p:column>
<h:link outcome="/foodmanager/listOrders" <h:link outcome="/foodmanager/listOrders"
value="#{foodwave.time.time}"> value="#{i18n['foodWave.show']}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</ui:define> </ui:define>
......
code/LanBortalWeb/WebContent/foodmanager/listOrders.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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"> 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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave"
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:viewParam name="foodwaveid" value="#{foodWaveView.foodWaveId}" required="true"/> <f:viewParam name="foodwaveid" value="#{foodWaveView.foodWaveId}"
<f:event type="preRenderView" listener="#{foodWaveView.initFoodWaveOrderList}" /> required="true" />
<!-- <f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveAccountEventList}" /> --> <f:event type="preRenderView"
listener="#{foodWaveView.initFoodWaveOrderList}" />
<!-- <f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveAccountEventList}" /> -->
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
...@@ -16,62 +25,69 @@ ...@@ -16,62 +25,69 @@
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h1><h:outputLabel id="name" value="${i18n['foodWave.billLines']}" /></h1> <h1>
<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.billLines}" var="billLine"> <h:outputLabel id="name" value="${i18n['foodWave.billLines']}" />
<h:column > </h1>
<p:dataTable
styleClass="bordertable" value="#{foodWaveView.foodWaves.billLines}"
var="foodwave" >
<p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputLabel id="name" value="${i18n['billLine.name']}" /> <h:outputLabel id="name" value="${i18n['billLine.name']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" value="#{billLine.name}"> <h:link outcome="/foodmanager/listOrders" value="#{foodwave.billLines.name}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['billLine.quantiny']}" /> <h:outputText value="${i18n['billLine.quantity']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" <h:link outcome="/foodmanager/listOrders"
value="#{foodwave.template.name}"> value="#{foodwave.billLines.rowCount}">
<f:param name="foodwaveid" value="#{foodWaveView.billLines.rowCount}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['billLine.unitprice']}" /> <h:outputText value="${i18n['billLine.unitprice']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" value="#{foodWaveView.currentProduct.price}"> <h:link outcome="/foodmanager/listOrders"
value="#{foodwave.currentProduct.price}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.unconfirmedOrders']}" /> <h:outputText value="${i18n['foodWave.unconfirmedOrders']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" value="#{foodWaveView.billLines.rowCount}"> <h:link outcome="/foodmanager/listOrders"
value="#{foodwave.billLines.rowCount}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</h:column><!-- </p:column>
<h:column> <!--
<p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.totalReserved']}" /> <h:outputText value="${i18n['foodWave.totalReserved']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" value="#{foodWaveView.currentProduct.totalreserved}"> <h:link outcome="/foodmanager/listOrders" value="#{foodWaveView.currentProduct.totalreserved}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</h:column> --> </p:column> -->
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.time']}" /> <h:outputText value="${i18n['foodWave.time']}" />
</f:facet> </f:facet>
<h:link outcome="/foodmanager/listOrders" <h:link outcome="/foodmanager/listOrders"
value="#{foodwave.time.time}"> value="#{foodwave.billLine}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</ui:define> </ui:define>
......
code/LanBortalWeb/WebContent/resources/cditools/user/edit.xhtml
<?xml version='1.0' encoding='UTF-8' ?> <?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "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:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui"> xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:p="http://primefaces.org/ui">
<composite:interface> <composite:interface>
...@@ -10,134 +16,196 @@ ...@@ -10,134 +16,196 @@
<composite:attribute name="creating" required="false" default="false" /> <composite:attribute name="creating" required="false" default="false" />
<composite:attribute name="commitvalue" required="true" /> <composite:attribute name="commitvalue" required="true" />
<composite:attribute name="commitaction" required="true" method-signature="java.lang.String action()" /> <composite:attribute name="commitaction" required="true"
method-signature="java.lang.String action()" />
</composite:interface> </composite:interface>
<composite:implementation> <composite:implementation>
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <h:outputScript library="primefaces" name="jquery/jquery.js"
target="head" />
<!-- <h2> <!-- <h2>
<h:outputText rendered="#{!cc.attrs.creating}" disabled="#{!cc.attrs.creating and !userView.canSave}" id="viewlogin" value="#{userView.selectedUser.login}" /> <h:outputText rendered="#{!cc.attrs.creating}" disabled="#{!cc.attrs.creating and !userView.canSave}" id="viewlogin" value="#{userView.selectedUser.login}" />
</h2> </h2>
--> -->
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:panelGroup> <h:panelGroup>
<h:form id="userform" enctype="multipart/form-data"> <h:form id="userform" enctype="multipart/form-data">
<ui:fragment rendered="#{not empty userView.user.id}"> <ui:fragment rendered="#{not empty userView.user.id}">
<p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade"> <p:overlayPanel id="chartPanel" for="webcamButton"
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> hideEffect="fade">
<p:commandButton type="button" value="Capture" onclick="pc.capture()" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}"
update="@all" />
<p:commandButton type="button" value="Capture"
onclick="pc.capture()" />
</p:overlayPanel> </p:overlayPanel>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" /> <h:outputText rendered="#{empty userView.user.currentImage}"
value="#{i18n['user.noCurrentImage']}" />
<ui:fragment rendered="#{!empty userView.user.currentImage}"> <ui:fragment rendered="#{!empty userView.user.currentImage}">
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" /> <img style="width: 150px;"
src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img"
alt="image" />
</ui:fragment> </ui:fragment>
<br /> <br />
<p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" type="button" /> <p:commandButton id="webcamButton"
value="#{i18n['userimage.webcam']}" type="button" />
<br /> <br />
<br /> <br />
<p:fileUpload id="uploadfile" required="TRUE" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" value="#{userView.image}" mode="simple" /> <p:fileUpload id="uploadfile" required="TRUE"
requiredMessage="Required!"
invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024"
value="#{userView.image}" mode="simple" />
<p:message for="uploadfile" /> <p:message for="uploadfile" />
<p:commandButton action="#{userView.sendImage}" ajax="false" value="#{i18n['user.imagesubmit']}" /> <p:commandButton action="#{userView.sendImage}" ajax="false"
value="#{i18n['user.imagesubmit']}" />
</ui:fragment> </ui:fragment>
</h:form> </h:form>
<ui:fragment rendered="#{cc.attrs.creating}"> <ui:fragment rendered="#{cc.attrs.creating}">
<h:outputLabel value="#{i18n['user.login']}" for="mklogin" /> <h:outputLabel value="#{i18n['user.login']}" for="mklogin" />
<br />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText size="25" id="mklogin" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.login}" />
</p:inplace>
<p:message for="login" />
<br />
</ui:fragment>
<br />
<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}" for="password" />
<br />
<p:inplace rendered="#{cc.attrs.creating}" emptyLabel="#{i18n['user.insert']}">
<p:password validator="#{userValidator.password}" id="password" value="#{userView.password}" />
</p:inplace>
<p:message rendered="#{cc.attrs.creating}" for="password" />
<br /> <br />
<p:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}" for="passwordcheck" /> <p:inplace emptyLabel="#{i18n['user.insert']}">
<br /> <p:inputText size="25" id="mklogin"
<p:inplace rendered="#{cc.attrs.creating}" emptyLabel="#{i18n['user.insert']}"> disabled="#{!cc.attrs.creating and !userView.canSave}"
<p:password validator="#{userValidator.password}" id="passwordcheck" value="#{userView.passwordcheck}" /> value="#{userView.selectedUser.login}" />
</p:inplace> </p:inplace>
<p:message rendered="#{cc.attrs.creating}" for="passwordcheck" /> <p:message for="login" />
<br /> <br />
</h:panelGroup> </ui:fragment>
<br />
<h:form>
<h:outputLabel rendered="#{cc.attrs.creating}"
value="#{i18n['user.password']}" for="password" />
<br />
<p:inplace rendered="#{cc.attrs.creating}"
emptyLabel="#{i18n['user.insert']}">
<p:password validator="#{userValidator.password}" id="password"
value="#{userView.password}" />
</p:inplace>
<p:message rendered="#{cc.attrs.creating}" for="password" />
<br />
<p:outputLabel rendered="#{cc.attrs.creating}"
value="#{i18n['user.passwordcheck']}" for="passwordcheck" />
<br />
<p:inplace rendered="#{cc.attrs.creating}"
emptyLabel="#{i18n['user.insert']}">
<p:password validator="#{userValidator.password}" id="passwordcheck"
value="#{userView.passwordcheck}" />
</p:inplace>
<p:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
<br />
</h:panelGroup>
<h:form>
<h:panelGroup> <h:panelGroup>
<table> <table>
<ui:fragment rendered="#{!cc.attrs.creating}"> <ui:fragment rendered="#{!cc.attrs.creating}">
<tr> <tr>
<td colspan="2"><h:outputLabel for="login" value="#{i18n['user.login']}" /><br /> <td colspan="2"><h:outputLabel for="login"
<h:outputText value="#{userView.selectedUser.login}" id="login" /></td> value="#{i18n['user.login']}" /><br /> <h:outputText
value="#{userView.selectedUser.login}" id="login" /></td>
</tr> </tr>
</ui:fragment> </ui:fragment>
<tr> <tr>
<td colspan="2"><h:outputLabel value="#{i18n['user.nick']}" for="nick" /> <br /> <p:inplace emptyLabel="#{i18n['user.insert']}"> <td colspan="2"><h:outputLabel value="#{i18n['user.nick']}"
<p:inputText size="45" id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.nick}" /> for="nick" /> <br /> <p:inplace
emptyLabel="#{i18n['user.insert']}">
<p:inputText size="45" id="nick"
disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.nick}" />
</p:inplace></td> </p:inplace></td>
</tr> </tr>
<tr> <tr>
<td><h:outputLabel value="#{i18n['user.firstNames']}" for="firstnames" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}"> <td><h:outputLabel value="#{i18n['user.firstNames']}"
<p:inputText size="22" id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.firstnames}" /> for="firstnames" /><br /> <p:inplace
emptyLabel="#{i18n['user.insert']}">
<p:inputText size="22" id="firstnames"
disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.firstnames}" />
</p:inplace></td> </p:inplace></td>
<td><h:outputLabel value="#{i18n['user.lastName']}" for="lastname" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}"> <td><h:outputLabel value="#{i18n['user.lastName']}"
<p:inputText size="30" id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.lastname}" /> for="lastname" /><br /> <p:inplace
emptyLabel="#{i18n['user.insert']}">
<p:inputText size="30" id="lastname"
disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.lastname}" />
</p:inplace></td> </p:inplace></td>
</tr> </tr>
<tr> <tr>
<td><h:outputLabel for="birthday" value="#{i18n['user.birthday']}" /><br /> <p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi" <td><h:outputLabel for="birthday"
value="#{userView.selectedUser.birthday}" pattern="#{sessionHandler.dateFormat}" timeZone="#{sessionHandler.timezone}" /> <h:message for="birthday" /></td> value="#{i18n['user.birthday']}" /><br /> <p:calendar
<td><h:outputLabel value="#{i18n['user.sex']}" for="sex" /> <br /> <p:selectOneMenu disabled="#{!cc.attrs.creating and !userView.canSave}" id="sex" value="#{userView.selectedUser.gender}"> id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi"
<f:selectItem id="undefined" itemLabel="#{i18n['user.sex.UNDEFINED']}" itemValue="UNDEFINED" /> value="#{userView.selectedUser.birthday}"
<f:selectItem id="male" itemLabel="#{i18n['user.sex.MALE']}" itemValue="MALE" /> pattern="#{sessionHandler.dateFormat}"
<f:selectItem id="female" itemLabel="#{i18n['user.sex.FEMALE']}" itemValue="FEMALE" /> timeZone="#{sessionHandler.timezone}" /> <h:message
for="birthday" /></td>
<td><h:outputLabel value="#{i18n['user.sex']}" for="sex" />
<br /> <p:selectOneMenu
disabled="#{!cc.attrs.creating and !userView.canSave}" id="sex"
value="#{userView.selectedUser.gender}">
<f:selectItem id="undefined"
itemLabel="#{i18n['user.sex.UNDEFINED']}" itemValue="UNDEFINED" />
<f:selectItem id="male" itemLabel="#{i18n['user.sex.MALE']}"
itemValue="MALE" />
<f:selectItem id="female" itemLabel="#{i18n['user.sex.FEMALE']}"
itemValue="FEMALE" />
</p:selectOneMenu></td> </p:selectOneMenu></td>
</tr> </tr>
</table> </table>
<table> <table>
<tr> <tr>
<td colspan="2"><p:outputLabel value="#{i18n['user.address']}" for="address" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}"> <td colspan="2"><p:outputLabel
<p:inputText size="45" id="address" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.address}" /> value="#{i18n['user.address']}" for="address" /><br /> <p:inplace
emptyLabel="#{i18n['user.insert']}">
<p:inputText size="45" id="address"
disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.address}" />
</p:inplace></td> </p:inplace></td>
</tr> </tr>
<tr> <tr>
<td><p:outputLabel value="#{i18n['user.zipCode']}" for="zip" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}"> <td><p:outputLabel value="#{i18n['user.zipCode']}" for="zip" /><br />
<p:inputText styleClass="ui-input" size="7" id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.zip}" /> <p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText styleClass="ui-input" size="7" id="zip"
disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.zip}" />
</p:inplace> <p:message for="zip" /></td> </p:inplace> <p:message for="zip" /></td>
<td><p:outputLabel value="#{i18n['user.town']}" for="town" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}"> <td><p:outputLabel value="#{i18n['user.town']}" for="town" /><br />
<p:inputText styleClass="ui-input" size="25" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.town}" /> <p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText styleClass="ui-input" size="25" id="town"
disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.town}" />
</p:inplace> <p:message for="town" /></td> </p:inplace> <p:message for="town" /></td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><h:outputLabel value="#{i18n['user.email']}" for="email" /> <br /> <p:inplace emptyLabel="#{i18n['user.insert']}"> <td colspan="2"><h:outputLabel value="#{i18n['user.email']}"
<p:inputText validator="#{userValidator.validateEmail}" size="45" id="email" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.email}" /> for="email" /> <br /> <p:inplace
emptyLabel="#{i18n['user.insert']}">
<p:inputText validator="#{userValidator.validateEmail}"
size="45" id="email"
disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.email}" />
</p:inplace></td> </p:inplace></td>
</tr> </tr>
</table> </table>
<p:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" ajax="false" value="#{cc.attrs.commitvalue}" /> <p:commandButton rendered="#{cc.attrs.creating or userView.canSave}"
id="commitbtn" action="#{cc.attrs.commitaction}" ajax="false"
value="#{cc.attrs.commitvalue}" />
</h:panelGroup> </h:panelGroup>
</h:form> </h:form>
</h:panelGrid> </h:panelGrid>
</composite:implementation> </composite:implementation>
</html> </html>
code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
...@@ -17,3 +17,6 @@ display: none; ...@@ -17,3 +17,6 @@ display: none;
} }
.text-center {
text-align: center;
}
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -182,10 +182,16 @@ eventorganiser.name = Eventorganiser ...@@ -182,10 +182,16 @@ eventorganiser.name = Eventorganiser
food = Food food = Food
foodWave.description = Description foodWave.description = Description
foodWave.name = Name foodWave.list = FoodWave Listing
foodWave.template.name = Name foodWave.name = Foodwave
foodWave.time = Time foodWave.orders = Amount of Orders
foodWave.paid = Paid
foodWave.show = Show
foodWave.template.name = Template
foodWave.time = Time
foodWave.totalReserved = Total
foodWave.unconfirmedOrders = Unconfirmed
foodshop.buyFromCounter = Pay at info foodshop.buyFromCounter = Pay at info
foodshop.buyFromInternet = Pay at Internet foodshop.buyFromInternet = Pay at Internet
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -180,10 +180,16 @@ eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4 ...@@ -180,10 +180,16 @@ eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4
food = Ruoka food = Ruoka
foodWave.description = Kuvaus foodWave.description = Kuvaus
foodWave.name = Nimi foodWave.list = Ruokatilausten listaus
foodWave.template.name = Nimi foodWave.name = Ruokatilaus
foodWave.time = Aika foodWave.orders = Tilausten M\u00E4\u00E4r\u00E4
foodWave.paid = Maksettuja
foodWave.show = N\u00E4yt\u00E4
foodWave.template.name = Template
foodWave.time = Aika
foodWave.totalReserved = Yhteens\u00E4
foodWave.unconfirmedOrders = Vahvistamattomia
foodshop.buyFromCounter = Maksa infossa foodshop.buyFromCounter = Maksa infossa
foodshop.buyFromInternet = Maksa Internetiss\u00E4 foodshop.buyFromInternet = Maksa Internetiss\u00E4
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java
...@@ -75,7 +75,8 @@ public class FoodWaveView extends GenericCDIView { ...@@ -75,7 +75,8 @@ public class FoodWaveView extends GenericCDIView {
selectedFoodWave.setTime(c); selectedFoodWave.setTime(c);
foodWaveBean.createFoodWave(selectedFoodWave); foodWaveBean.createFoodWave(selectedFoodWave);
// initFoodwaveManagerList(); initFoodwaveManagerList();
return "/foodmanager/listFoodwaves"; return "/foodmanager/listFoodwaves";
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!