Skip to content

Codecrew / Moya

Go to a project
Commit 9051a1f2 by Antti Jaakkola
Options

fixed user edit width

1 parent e2a9504d
Inline Side-by-side
Showing with 12 additions and 11 deletions
code/MoyaWeb/WebContent/resources/cditools/user/edit.xhtml
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<composite:implementation> <composite:implementation>
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<p:panelGrid columns="3" cellpadding="20" columnClasses="topalign,topalign,topalign" styleClass="noBorders"> <p:panelGrid columns="3" cellpadding="1" columnClasses="topalign,topalign,topalign" styleClass="noBorders">
<h:form id="userform" enctype="multipart/form-data"> <h:form id="userform" enctype="multipart/form-data">
<p:fieldset legend="#{i18n['user.image']}"> <p:fieldset legend="#{i18n['user.image']}">
<p:panelGrid columns="1"> <p:panelGrid columns="1" cellpadding="1">
<ui:fragment rendered="#{not empty userView.selectedUser.id}"> <ui:fragment rendered="#{not empty userView.selectedUser.id}">
<p:dialog id="chartPanel" for="webcamButton" modal="true" dynamic="true" widgetVar="webcamDialog"> <p:dialog id="chartPanel" for="webcamButton" modal="true" dynamic="true" widgetVar="webcamDialog">
...@@ -82,19 +82,19 @@ ...@@ -82,19 +82,19 @@
<p:fieldset legend="#{i18n['user.edit']}"> <p:fieldset legend="#{i18n['user.edit']}">
<p:panelGrid columns="3" styleClass="noBorders"> <p:panelGrid columns="3" styleClass="noBorders">
<p:outputLabel value="#{i18n['user.login']}" /> <p:outputLabel value="#{i18n['user.login']}" />
<h:outputText size="30" value="#{userView.selectedUser.login}" id="login" /> <h:outputText size="25" value="#{userView.selectedUser.login}" id="login" />
<h:message for="login" /> <h:message for="login" />
<p:outputLabel value="#{i18n['user.nick']}" /> <p:outputLabel value="#{i18n['user.nick']}" />
<p:inputText size="30" id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.nick}" /> <p:inputText size="25" id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.nick}" />
<h:message for="nick" /> <h:message for="nick" />
<p:outputLabel value="#{i18n['user.firstNames']}" /> <p:outputLabel value="#{i18n['user.firstNames']}" />
<p:inputText size="30" id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.firstnames}" /> <p:inputText size="25" id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.firstnames}" />
<h:message for="firstnames" /> <h:message for="firstnames" />
<p:outputLabel value="#{i18n['user.lastName']}" /> <p:outputLabel value="#{i18n['user.lastName']}" />
<p:inputText size="30" id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.lastname}" /> <p:inputText size="25" id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.lastname}" />
<h:message for="lastname" /> <h:message for="lastname" />
<p:outputLabel value="#{i18n['user.sex']}" for="sex" /> <p:outputLabel value="#{i18n['user.sex']}" for="sex" />
...@@ -112,23 +112,23 @@ ...@@ -112,23 +112,23 @@
<h:message for="birthday" /> <h:message for="birthday" />
<p:outputLabel value="#{i18n['user.address']}" /> <p:outputLabel value="#{i18n['user.address']}" />
<p:inputText size="30" id="address" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.address}" /> <p:inputText size="25" id="address" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.address}" />
<p:message for="address" /> <p:message for="address" />
<p:outputLabel value="#{i18n['user.zipCode']}" for="zip" /> <p:outputLabel value="#{i18n['user.zipCode']}" for="zip" />
<p:inputText styleClass="ui-input" size="7" id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.zip}" /> <p:inputText styleClass="ui-input" size="5" id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.zip}" />
<p:message for="zip" /> <p:message for="zip" />
<p:outputLabel value="#{i18n['user.town']}" for="town" /> <p:outputLabel value="#{i18n['user.town']}" for="town" />
<p:inputText styleClass="ui-input" size="30" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.town}" /> <p:inputText styleClass="ui-input" size="25" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.town}" />
<p:message for="town" /> <p:message for="town" />
<p:outputLabel value="#{i18n['user.email']}" for="email" /> <p:outputLabel value="#{i18n['user.email']}" for="email" />
<p:inputText validator="#{userValidator.validateEmail}" size="30" id="email" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.email}" /> <p:inputText validator="#{userValidator.validateEmail}" size="25" id="email" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.email}" />
<p:message for="email" /> <p:message for="email" />
<p:outputLabel value="#{i18n['user.phone']}" for="phone" /> <p:outputLabel value="#{i18n['user.phone']}" for="phone" />
<p:inputText styleClass="ui-input" size="30" id="phone" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.phone}" /> <p:inputText styleClass="ui-input" size="25" id="phone" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.phone}" />
<p:message for="phone" /> <p:message for="phone" />
<p:outputLabel value="#{i18n['user.shirtSize']}" for="shirtSize" rendered="#{userView.shirtEnabled}" /> <p:outputLabel value="#{i18n['user.shirtSize']}" for="shirtSize" rendered="#{userView.shirtEnabled}" />
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1259,6 +1259,7 @@ user.imageUpload.imageNotFound = Valitse ensin kuva jonka haluat l\u00E4hett\u00 ...@@ -1259,6 +1259,7 @@ user.imageUpload.imageNotFound = Valitse ensin kuva jonka haluat l\u00E4hett\u00
user.imageUploaded = Kuva l\u00E4hetetty. user.imageUploaded = Kuva l\u00E4hetetty.
user.imagelist = Tallennetut kuvat user.imagelist = Tallennetut kuvat
user.imagesubmit = L\u00E4het\u00E4 kuva user.imagesubmit = L\u00E4het\u00E4 kuva
user.image = Kuva
user.insert = Sy\u00F6t\u00E4 arvo user.insert = Sy\u00F6t\u00E4 arvo
user.invalidLoginCredentials = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin. user.invalidLoginCredentials = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin.
user.invite = Kutsu user.invite = Kutsu
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!