From bleny@users.labs.libre-entreprise.org Mon Jun 15 01:51:19 2026 From: bleny@users.labs.libre-entreprise.org To: wao-commits@list.forge.codelutin.com Subject: [Suiviobsmer-commits] r875 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages resources/fr/ifremer/wao/ui/pages webapp webapp/css Date: Fri, 31 Dec 2010 18:15:05 +0100 Message-ID: <20101231171506.21A522F21B@labs.libre-entreprise.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0211473299743963337==" --===============0211473299743963337== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.proper= ties trunk/wao-ui/src/main/webapp/ContactForm.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ *=20 */ @RequiresAuthentication(allowedRoles =3D {UserRole.ADMIN, UserRole.COORDINAT= OR, UserRole.OBSERVER}, readOnlyAllowed =3D false) - at Import(stylesheet =3D "context:css/common.css", library =3D "context:js/= contactForm.js") + at Import(stylesheet =3D {"context:css/common.css", "context:css/contactFor= m.css"}, library =3D "context:js/contactForm.js") public class ContactForm { =20 @Inject Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm= .properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.prope= rties 2010-12-31 15:52:58 UTC (rev 874) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.prope= rties 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ -

+

Modification d'un contact

=20 @@ -14,55 +14,52 @@ =20 =20 -
+
Informations -
-
- - Navire
- ${contact.boat.name} - -
    -
  • Immatriculation : ${contact.boat.immatriculation= }
    • -
  • Quartier : ${contact.boat.districtCode}
    • -
  • Longueur : ${contact.boat.boatLength} m
    • -
  • Ann=C3=A9e de contruction : ${contact.boat.build= Year}
    • -
-
-
- Ligne du plan d'=C3=A9chantillonage -
-
    -
  • Code : ${contact.sampleRow.code}
    • -
  • M=C3=A9tier : ${contact.sampleRow.professionDesc= ription}
    • -
  • Programme : ${contact.sampleRow.programName} (du - - au - ) -
    • -
-
-
- Date de cr=C3=A9ation du contact : -
+
+ + Navire
+ ${contact.boat.name} + +
    +
  • Immatriculation : ${contact.boat.immatriculation} +
  • Quartier : ${contact.boat.districtCode}
    • +
  • Longueur : ${contact.boat.boatLength} m
    • +
  • Ann=C3=A9e de contruction : ${contact.boat.buildYear= }
    • +
+

+ Ligne du plan d'=C3=A9chantillonage +
+

    +
  • Code : ${contact.sampleRow.code}
    • +
  • M=C3=A9tier : ${contact.sampleRow.professionDescript= ion}
    • +
  • Programme : ${contact.sampleRow.programName} (du + + au + ) +
    • +
+

+

+ Date de cr=C3=A9ation du contact : +

+
=20 -
+
Observateurs -
- -
+
=20 -
+
${contact.mainObserver.fullName}
-
+