[Suiviobsmer-commits] r875 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages resources/fr/ifremer/wao/ui/pages webapp webapp/css - Wao-commits

31 Dec 2010

Author: bleny
Date: 2010-12-31 17:15:04 +0000 (Fri, 31 Dec 2010)
New Revision: 875

Log:
fix CSS for ContactForm


Added:
   trunk/wao-ui/src/main/webapp/css/contactForm.css
Modified:
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java
   trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties
   trunk/wao-ui/src/main/webapp/ContactForm.tml

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java
===================================================================

--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java	2010-12-31 15:52:58 UTC (rev 874)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java	2010-12-31 17:15:04 UTC (rev 875)
@@ -51,7 +51,7 @@
  * 
  */
 @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}, readOnlyAllowed = false)
- at Import(stylesheet = "context:css/common.css", library = "context:js/contactForm.js")
+ at Import(stylesheet = {"context:css/common.css", "context:css/contactForm.css"}, library = "context:js/contactForm.js")
 public class ContactForm {
 
     @Inject

Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties
===================================================================
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties	2010-12-31 15:52:58 UTC (rev 874)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties	2010-12-31 17:15:04 UTC (rev 875)
@@ -1,6 +1,7 @@
 # form labels
 mainObserver-label: Observateur r\u00e9f\u00e9rant
 secondaryObserver-label: Observateur
+nbObservants-label: Nombre d'observateurs
 contactState-label: \u00c9tat du contact
 beginDate-label: D\u00e9but d'observation
 endDate-label: Fin d'observation

Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/ContactForm.tml	2010-12-31 15:52:58 UTC (rev 874)
+++ trunk/wao-ui/src/main/webapp/ContactForm.tml	2010-12-31 17:15:04 UTC (rev 875)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <t:layout t:pageTitle="Modification d'un contact" t:contentId="so-contact-form"
           xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"  xmlns:p="tapestry:parameter">
-    <h1 class="acenter">
+    <h1 class="acenter mtop30">
         Modification d'un contact
     </h1>
 
@@ -14,55 +14,52 @@
 
         <input t:type="hidden" t:id="hiddenSendEmail" t:value="sendEmail" />
 
-        <fieldset class="user-form clearfix">
+        <fieldset>
             <legend>Informations</legend>
-            <div class="t-beaneditor">
-                <div class="fright" style="border-left: solid 1px; padding-left: 10px;">
-                    <strong>
-                        Navire<br />
-                        ${contact.boat.name}
-                    </strong>
-                    <ul style="list-style-type: none;">
-                        <li>Immatriculation : ${contact.boat.immatriculation}</li>
-                        <li>Quartier : ${contact.boat.districtCode}</li>
-                        <li>Longueur : ${contact.boat.boatLength} m</li>
-                        <li>Année de contruction : ${contact.boat.buildYear}</li>
-                    </ul>
-                </div>
-                <div class="t-beaneditor-row">
-                    <strong>Ligne du plan d'échantillonage</strong>
-                    <br />
-                    <ul style="list-style-type: none;">
-                        <li>Code : ${contact.sampleRow.code}</li>
-                        <li>Métier : ${contact.sampleRow.professionDescription}</li>
-                        <li>Programme : ${contact.sampleRow.programName} (du
-                            <t:output value="contact.sampleRow.periodBegin" format="monthYearFormat" />
-                            au
-                            <t:output value="contact.sampleRow.periodEnd" format="monthYearFormat" />)
-                        </li>
-                    </ul>
-                </div>
-                <div class="t-beaneditor-row">
-                    Date de création du contact : <t:output value="contact.topiaCreateDate" format="dateFormat" />
-                </div>
+            <div class="fright" style="border-left: solid 1px; padding-left: 10px;">
+                <strong>
+                    Navire<br />
+                    ${contact.boat.name}
+                </strong>
+                <ul style="list-style-type: none;">
+                    <li>Immatriculation : ${contact.boat.immatriculation}</li>
+                    <li>Quartier : ${contact.boat.districtCode}</li>
+                    <li>Longueur : ${contact.boat.boatLength} m</li>
+                    <li>Année de contruction : ${contact.boat.buildYear}</li>
+                </ul>
             </div>
+            <p>
+                <strong>Ligne du plan d'échantillonage</strong>
+                <br />
+                <ul style="list-style-type: none;">
+                    <li>Code : ${contact.sampleRow.code}</li>
+                    <li>Métier : ${contact.sampleRow.professionDescription}</li>
+                    <li>Programme : ${contact.sampleRow.programName} (du
+                        <t:output value="contact.sampleRow.periodBegin" format="monthYearFormat" />
+                        au
+                        <t:output value="contact.sampleRow.periodEnd" format="monthYearFormat" />)
+                    </li>
+                </ul>
+            </p>
+            <p>
+                Date de création du contact : <t:output value="contact.topiaCreateDate" format="dateFormat" />
+            </p>
+            <div style="clear: right;"></div>
         </fieldset>
 
-        <fieldset class="user-form clearfix">
+        <fieldset>
             <legend>Observateurs</legend>
-            <div class="t-beaneditor">
-                <t:delegate to="viewOrEditObservers" />
-            </div>
+            <t:delegate to="viewOrEditObservers" />
         </fieldset>
 
         <t:block id="viewObservers">
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="mainObserver" />
                 <t:if test="contact.mainObserver">
                     ${contact.mainObserver.fullName}
                 </t:if>
             </div>
-            <div class="t-beaneditor-row" style="position: relative; left: 250px;">
+            <div>
                 <ul>
                     <li t:type="loop" t:source="secondaryObservers" t:value="observer">
                         ${observer.fullName}
@@ -72,19 +69,19 @@
         </t:block>
 
         <t:block id="editObservers">
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="mainObserver" />
                 <input t:type="select" t:id="mainObserver" t:model="observerSelectModel" t:validate="required" t:value="mainObserverId" />
             </div>
             <t:zone t:id="observersFormZone" t:visible="true" t:update="show">
-                <div class="t-beaneditor-row">
+                <div>
                     <t:label t:for="secondaryObserver" />
-                    <input t:type="select" t:id="secondaryObserver" t:model="observerSelectModel" t:value="selectedSecondaryObserverId" t:mixins="ck/onEvent" t:event="change" />
-                    <a t:type="actionlink" t:id="addSecondaryObserver" title="Ajouter un observateur" t:zone="observersFormZone">
-                        <img src="${asset:context:img/add-16px.png}" />
-                    </a> 
-                    <div class="t-beaneditor-row" style="position: relative; left: 250px;">
-                        <ul>
+                    <div>
+                        <input t:type="select" t:id="secondaryObserver" t:model="observerSelectModel" t:value="selectedSecondaryObserverId" t:mixins="ck/onEvent" t:event="change" />
+                        <a t:type="actionlink" t:id="addSecondaryObserver" title="Ajouter un observateur" t:zone="observersFormZone">
+                            <img src="${asset:context:img/add-16px.png}" />
+                        </a> 
+                        <ul style="position: relative; left: 50%; margin-left: 25px;">
                             <li t:type="loop" t:source="secondaryObservers" t:value="observer" t:index="secondaryObserverIndex" t:volatile="true">
                                 ${observer.fullName}
                                 <a t:type="actionlink" t:id="removeSecondaryObserver" t:context="secondaryObserverIndex" title="Supprimer cet observateur" t:zone="observersFormZone">
@@ -97,59 +94,59 @@
             </t:zone>
         </t:block>
 
-        <fieldset class="user-form clearfix">
+        <fieldset>
             <legend>Compte-rendu de l'observation</legend>
-            <div class="t-beaneditor">
-                <t:delegate to="viewOrEditObservationReport" />
-            </div>
+            <t:delegate to="viewOrEditObservationReport" />
         </fieldset>
 
         <t:block id="viewObservationReport">
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="contactState" />
                 ${contact.contactState.label}
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="nbObservants" />
                 ${contact.nbObservants}
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="beginDate" />
                 <t:output value="contact.observationBeginDate" format="dateTimeFormat" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="endDate" />
                 <t:output value="contact.observationEndDate" format="dateTimeFormat" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" /> 
                 <t:label t:for="mammalsObservation" />
                 <t:booleanImage t:value="contact.mammalsObservation" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> 
                 <t:label t:for="mammalsCapture" />
                 <t:booleanImage t:value="contact.mammalsCapture" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="inputDate" />
                 <t:output value="contact.dataInputDate" format="dateFormat" />
             </div>
             <t:if test="showObsVente()">
-                <div class="t-beaneditor-row">
+                <div>
                     <t:label t:for="actualSamplingStrategy" />
                     ${contact.samplingStrategy}
                 </div>
-                <div class="t-beaneditor-row">
+                <div>
                     <t:label t:for="completeSampling" />
                     ${contact.completeSampling}
                 </div>
             </t:if>
 
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="observerComment" />
                 <t:if t:test="contact.comment">
-                    ${contact.comment}
+                    <div class="value"> <!-- make no line return under the label -->
+                        ${contact.comment}
+                    </div>
                     <p:else>
                         <em>aucun commentaire</em>
                     </p:else>
@@ -157,10 +154,12 @@
             </div>
 
             <t:unless test="connectedUser.observer">
-                  <div class="t-beaneditor-row">
+                  <div>
                       <t:label t:for="coordinatorComment" />
                       <t:if t:test="contact.commentCoordinator">
-                          ${contact.commentCoordinator}
+                          <div class="value">
+                              ${contact.commentCoordinator}
+                          </div>
                           <p:else>
                               <em>aucun commentaire</em>
                           </p:else>
@@ -170,53 +169,53 @@
         </t:block>
 
         <t:block id="editObservationReport">
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="contactState" />
                 <input t:type="select" t:id="contactState" t:value="contact.contactState" t:validate="required"/>
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="nbObservants" />
                 <input t:type="textfield" t:id="nbObservants" t:value="contact.nbObservants" t:validate="required" size="2" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="beginDate" />
                 <input t:id="beginDate" value="contact.observationBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="endDate" />
                 <input t:id="endDate" value="contact.observationEndDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" /> 
                 <t:label t:for="mammalsObservation" />
                 <input t:type="checkbox" t:id="mammalsObservation" value="contact.mammalsObservation"/>
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> 
                 <t:label t:for="mammalsCapture" />
                 <input t:type="checkbox" t:id="mammalsCapture" value="contact.mammalsCapture" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="observerComment" />
                 <input t:type="textarea" t:id="observerComment" value="contact.comment" />
             </div>
-            <div class="t-beaneditor-row">
+            <div>
                 <t:label t:for="inputDate" />
                 <input t:type="datefield"  t:id="inputDate" class="date" value="contact.dataInputDate" />
             </div>
             <t:if test="showObsVente()">
-                <div class="t-beaneditor-row">
+                <div>
                     <t:label t:for="actualSamplingStrategy" />
                     <input t:type="select" t:id="actualSamplingStrategy" t:value="contact.samplingStrategy" t:validate="required" />
                 </div>
-                <div class="t-beaneditor-row">
+                <div>
                     <t:label t:for="completeSampling" />
                     <input t:type="checkbox" t:id="completeSampling" value="contact.completeSampling" />
                 </div>
             </t:if>
 
             <t:unless test="connectedUser.observer">
-                <div class="t-beaneditor-row">
+                <div>
                     <t:label t:for="coordinatorComment" />
                     <input t:type="textarea" t:id="coordinatorComment" value="contact.commentCoordinator" />
                 </div>
@@ -224,34 +223,32 @@
         </t:block>
 
         <t:unless test="connectedUser.observer">
-            <fieldset class="user-form clearfix">
+            <fieldset>
                 <legend>Évaluation programme</legend>
-                <div class="t-beaneditor">
-                    <t:if test="showDataReliability()">
-                        <div class="t-beaneditor-row">
-                            <t:label t:for="dataReliability" />
-                            <t:if t:test="canEditDataReliability()">
-                                <input t:type="select" t:id="dataReliability" value="contact.dataReliability" />
-                                <p:else>
-                                    ${contact.dataReliability.label}
-                                </p:else>
-                            </t:if>
-                        </div>
-                    </t:if>
-                    <div class="t-beaneditor-row">
-                        <t:label t:for="adminComment" />
-                        <t:if t:test="connectedUser.admin">
-                            <input t:type="textarea" t:id="adminComment" value="contact.commentAdmin" />
+                <t:if test="showDataReliability()">
+                    <div>
+                        <t:label t:for="dataReliability" />
+                        <t:if t:test="canEditDataReliability()">
+                            <input t:type="select" t:id="dataReliability" value="contact.dataReliability" />
                             <p:else>
-                                <t:if t:test="contact.commentAdmin">
-                                    ${contact.commentAdmin}
-                                    <p:else>
-                                        <em>aucun commentaire</em>
-                                    </p:else>
-                                </t:if>
+                                ${contact.dataReliability.label}
                             </p:else>
                         </t:if>
                     </div>
+                </t:if>
+                <div>
+                    <t:label t:for="adminComment" />
+                    <t:if t:test="connectedUser.admin">
+                        <input t:type="textarea" t:id="adminComment" value="contact.commentAdmin" />
+                        <p:else>
+                            <t:if t:test="contact.commentAdmin">
+                                ${contact.commentAdmin}
+                                <p:else>
+                                    <em>aucun commentaire</em>
+                                </p:else>
+                            </t:if>
+                        </p:else>
+                    </t:if>
                 </div>
             </fieldset>
         </t:unless>

Added: trunk/wao-ui/src/main/webapp/css/contactForm.css
===================================================================
--- trunk/wao-ui/src/main/webapp/css/contactForm.css	                        (rev 0)
+++ trunk/wao-ui/src/main/webapp/css/contactForm.css	2010-12-31 17:15:04 UTC (rev 875)
@@ -0,0 +1,38 @@
+fieldset {
+    border: solid 1px black;
+    padding: 10px;
+    margin: 10px;
+    margin-left: auto;
+    margin-right: auto;
+    width: 80%;
+}
+
+legend {
+    padding: 0px 10px;
+}
+
+label {
+    display: block;
+    float: left;
+    width: inherit;
+    width: 50%;
+    text-align: right;
+    padding-right: 10px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+}
+
+fieldset > div {
+    clear: both;
+    margin-top: 10px;
+}
+
+textarea {
+    width: 25em;
+    height: 7em;
+}
+
+.value { /* make no line return under the label */
+    width: 45%;
+    float: left;
+}
\ No newline at end of file

    

[Suiviobsmer-commits] r875 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages resources/fr/ifremer/wao/ui/pages webapp webapp/css

bleny＠users.labs.libre-entreprise.org

tags

participants (1)