Author: bleny Date: 2014-05-13 17:10:44 +0200 (Tue, 13 May 2014) New Revision: 1936 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1936 Log: refs #4487 put immutable information aside in contact form Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-05-13 15:10:44 UTC (rev 1936) @@ -28,7 +28,7 @@ wao.business.validationState.validated=validate wao.email.addBoatToUserAllegroWallet.contactDone=This demand is for observation expected done between %s and %s wao.email.addBoatToUserAllegroWallet.contactExpected=This demand is for observation expected on %s -wao.email.addBoatToUserAllegroWallet.subject=%s: add boat %d to ALLEGRO wallet for user %s +wao.email.addBoatToUserAllegroWallet.subject=%s\: add boat %d to ALLEGRO wallet for user %s wao.export.ical.desc=wtih %s wao.export.ical.title=ObsDeb Observation wao.import.boat.failure.invalid.locationCode=The code '%s' is not a valid location code Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-05-13 15:10:44 UTC (rev 1936) @@ -27,7 +27,7 @@ wao.business.validationState.validated=Validé wao.email.addBoatToUserAllegroWallet.contactDone=Cette demande émane de l'observation réalisée entre le %s et le %s. wao.email.addBoatToUserAllegroWallet.contactExpected=Cette demande émane de l'observation prévue le %s. -wao.email.addBoatToUserAllegroWallet.subject=%s : ajout navire %d sur portefeuille ALLEGRO de %s +wao.email.addBoatToUserAllegroWallet.subject=%s \: ajout navire %d sur portefeuille ALLEGRO de %s wao.export.ical.desc=avec %s wao.export.ical.title=Observation ObsDeb wao.import.boat.failure.invalid.locationCode=Le code '%s' n'est pas un code de lieu valide Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 15:10:44 UTC (rev 1936) @@ -281,6 +281,7 @@ wao.ui.form.Company.error.nameMustBeUnique=Company name must be unique wao.ui.form.Company.title.creation=Create a new company wao.ui.form.Company.title.edition=Edit company %s +wao.ui.form.Contact.contactCreatedOn=Contact created on %s wao.ui.form.Contact.error.dataInputDateAfterToday= wao.ui.form.Contact.error.dataInputDateBeforeObservationEndDate= wao.ui.form.Contact.error.duplicatedMainObserverInSecondaryObservers= Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 15:10:44 UTC (rev 1936) @@ -281,6 +281,7 @@ wao.ui.form.Company.error.nameMustBeUnique=Le nom de la société doit être unique wao.ui.form.Company.title.creation=Création d'une société wao.ui.form.Company.title.edition=Modification de la société %s +wao.ui.form.Contact.contactCreatedOn=Contact créé le %s wao.ui.form.Contact.error.dataInputDateAfterToday=La date de saisie des données doit être antérieure à la date du jour wao.ui.form.Contact.error.dataInputDateBeforeObservationEndDate=La date de saisie des données doit être postérieure à la date de fin d'observation wao.ui.form.Contact.error.duplicatedMainObserverInSecondaryObservers=L'utilisateur référant ne doit pas se trouver aussi parmi les observateurs secondaires Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-13 15:10:44 UTC (rev 1936) @@ -49,59 +49,106 @@ </s:else> </h1> -<s:form> +<aside class="well"> - <s:hidden name="contactId" value="%{contactId}"/> + <h2><s:text name="wao.ui.misc.information"/></h2> - <fieldset> + <s:text name="wao.ui.form.Contact.contactCreatedOn"> + <s:param value="%{formatDate(updateContactCommand.contact.creationDate)}"/> + </s:text> - <legend><s:text name="wao.ui.misc.information"/></legend> + <h3><s:text name="wao.ui.field.Contact.boat"/></h3> - <s:textfield name="updateContactCommand.contact.boat.name" - label="%{getText('wao.ui.field.Boat.name')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.boat.immatriculation" - value="%{'' + updateContactCommand.contact.boat.immatriculation}" - label="%{getText('wao.ui.field.Boat.immatriculation')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.boat.districtCode" - label="%{getText('wao.ui.field.Boat.districtCode')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.boat.boatLength" - label="%{getText('wao.ui.field.Boat.boatLength')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.boat.buildYear" - value="%{'' + updateContactCommand.contact.boat.buildYear}" - label="%{getText('wao.ui.field.Boat.buildYear')}" - disabled="true"/> + <table class="table"> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.Boat.name"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.name"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.immatriculation"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.immatriculation"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.districtCode"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.districtCode"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.boatLength"/> + </th> + <td> + <s:property value="%{'' + updateContactCommand.contact.boat.boatLength}"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.buildYear"/> + </th> + <td> + <s:property value="%{'' + updateContactCommand.contact.boat.buildYear}"/> + </td> + </tr> + </tbody> + </table> - <hr/> + <h3><s:text name="wao.ui.field.Contact.sampleRow"/></h3> - <s:textfield name="updateContactCommand.contact.sampleRow.professionDescription" - label="%{getText('wao.ui.field.SampleRow.profession')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.sampleRow.programName" - label="%{getText('wao.ui.field.SampleRow.programName')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.sampleRow.periodBegin" - label="%{getText('wao.ui.field.SampleRow.periodBegin')}" - value="%{formatMonth(updateContactCommand.contact.sampleRow.periodBegin)}" - cssClass="input-small" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.sampleRow.periodEnd" - label="%{getText('wao.ui.field.SampleRow.periodEnd')}" - value="%{formatMonth(updateContactCommand.contact.sampleRow.periodEnd)}" - cssClass="input-small" - disabled="true"/> + <table class="table"> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.profession"/> + </th> + <td> + <s:property value="updateContactCommand.contact.sampleRow.professionDescription"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.programName"/> + </th> + <td> + <s:property value="updateContactCommand.contact.sampleRow.programName"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.periodBegin"/> + </th> + <td> + <s:property value="%{formatMonth(updateContactCommand.contact.sampleRow.periodBegin)}"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.periodEnd"/> + </th> + <td> + <s:property value="%{formatMonth(updateContactCommand.contact.sampleRow.periodEnd)}"/> + </td> + </tr> + </tbody> + </table> - <hr/> +</aside> - <s:textfield name="updateContactCommand.contact.creationDate" - label="%{getText('wao.ui.field.Contact.creationDate')}" - disabled="true"/> - <%--value="%{formatDate(updateContactCommand.contact.creationDate)}"--%> - </fieldset> +<s:form> + <s:hidden name="contactId" value="%{contactId}"/> + <fieldset> <legend><s:text name="wao.ui.misc.observers"/></legend> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-13 15:10:44 UTC (rev 1936) @@ -158,6 +158,11 @@ max-width: 100%; } +aside { + float: right; + max-width: 360px; +} + /** * Le Menu */