r190 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document - Cantharella-commits

27 Mar 2013

Author: echatellier
Date: 2013-03-27 16:21:42 +0100 (Wed, 27 Mar 2013)
New Revision: 190

Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/190

Log:
Ajout de fieldset pour les type de documents et la class quote pour les champs mis ?\195?\160 jour en ajax

Modified:
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.html
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html
===================================================================

--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html	2013-03-27 15:07:49 UTC (rev 189)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html	2013-03-27 15:21:42 UTC (rev 190)
@@ -67,23 +67,27 @@
             <label for="Document.ajoutePar"><wicket:message key="Document.ajoutePar" /></label>
             <input type="text" id="Document.ajoutePar" wicket:id="Document.ajoutePar" />
         </div>
+
+        <fieldset>
+            <legend><wicket:message key="Document.typeDocument" /></legend>
+
+            <div class="property required">
+                <label for="Document.typeDocument"><wicket:message key="TypeDocument.nom" /></label>
+                <select id="Document.typeDocument" wicket:id="TypeDocument.nom" />
+            </div>
+
+            <div class="property">
+                <label for="TypeDocument.domaine"><wicket:message key="TypeDocument.domaine" /></label>
+                <span class="quote" id="TypeDocument.domain" wicket:id="TypeDocument.domaine" />
+            </div>
+
+            <div class="property">
+                <label for="TypeDocument.description"><wicket:message key="TypeDocument.description" /></label>
+                <span class="quote" id="TypeDocument.description" wicket:id="TypeDocument.description" />
+            </div>
+        </fieldset>
         
         <div class="property required">
-            <label for="Document.typeDocument"><wicket:message key="Document.typeDocument" /></label>
-            <select id="Document.typeDocument" wicket:id="Document.typeDocument" />
-        </div>
-        
-        <div class="property">
-            <label for="TypeDocument.domaine"><wicket:message key="TypeDocument.domaine" /></label>
-            <span id="TypeDocument.domain" wicket:id="TypeDocument.domaine" />
-        </div>
-        
-        <div class="property">
-            <label for="TypeDocument.description"><wicket:message key="TypeDocument.description" /></label>
-            <span id="TypeDocument.description" wicket:id="TypeDocument.description" />
-        </div>
-        
-        <div class="property required">
             <label for="Document.file"><wicket:message key="Document.file" />
             <wicket:container wicket:id="Document.file.info"/></label>
             <input type="file" id="Document.file" wicket:id="Document.file" />

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java	2013-03-27 15:07:49 UTC (rev 189)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java	2013-03-27 15:21:42 UTC (rev 190)
@@ -42,6 +42,7 @@
 import nc.ird.cantharella.web.pages.domain.personne.ManagePersonnePage;
 import nc.ird.cantharella.web.utils.CallerPage;
 import nc.ird.cantharella.web.utils.behaviors.JSConfirmationBehavior;
+import nc.ird.cantharella.web.utils.behaviors.ReplaceEmptyLabelBehavior;
 import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString;
 import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString.ComparisonMode;
 import nc.ird.cantharella.web.utils.forms.SubmittableButton;
@@ -242,7 +243,7 @@
 
         // Type de document
         final DropDownChoice<TypeDocument> typeDocumentChoice = new DropDownChoice<TypeDocument>(
-                "Document.typeDocument", new PropertyModel<TypeDocument>(documentModel, "typeDocument"), typeDocuments);
+                "TypeDocument.nom", new PropertyModel<TypeDocument>(documentModel, "typeDocument"), typeDocuments);
         typeDocumentChoice.setOutputMarkupId(true);
         typeDocumentChoice.setNullValid(false);
         formView.add(typeDocumentChoice);

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.html
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.html	2013-03-27 15:07:49 UTC (rev 189)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.html	2013-03-27 15:21:42 UTC (rev 190)
@@ -64,23 +64,27 @@
             <span class="label"><wicket:message key="Document.ajoutePar" /></span>
             <span class="value" wicket:id="Document.ajoutePar" ></span>
         </div>
-        
+
+        <fieldset>
+            <legend><wicket:message key="Document.typeDocument" /></legend>
+
+            <div class="property">
+                <span class="label"><wicket:message key="TypeDocument.nom" /></span>
+                <span class="value" wicket:id="TypeDocument.nom" ></span>
+            </div>
+            
+            <div class="property">
+                <span class="label"><wicket:message key="TypeDocument.domaine" /></span>
+                <span class="value" wicket:id="TypeDocument.domaine" ></span>
+            </div>
+            
+            <div class="property">
+                <span class="label"><wicket:message key="TypeDocument.description" /></span>
+                <span class="value" wicket:id="TypeDocument.description" ></span>
+            </div>
+        </fieldset>
+
         <div class="property">
-            <span class="label"><wicket:message key="Document.typeDocument" /></span>
-            <span class="value" wicket:id="Document.typeDocument" ></span>
-        </div>
-        
-        <div class="property">
-            <span class="label"><wicket:message key="TypeDocument.domaine" /></span>
-            <span class="value" wicket:id="TypeDocument.domaine" ></span>
-        </div>
-        
-        <div class="property">
-            <span class="label"><wicket:message key="TypeDocument.description" /></span>
-            <span class="value" wicket:id="TypeDocument.description" ></span>
-        </div>
-        
-        <div class="property">
             <span class="label"><wicket:message key="Document.file" /></span>
             <span class="value" wicket:id="Document.file"></span>
         </div>

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java	2013-03-27 15:07:49 UTC (rev 189)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java	2013-03-27 15:21:42 UTC (rev 190)
@@ -110,7 +110,7 @@
                 .add(new ReplaceEmptyLabelBehavior()));
         add(new Label("Document.ajoutePar", new PropertyModel<String>(documentModel, "ajoutePar"))
                 .add(new ReplaceEmptyLabelBehavior()));
-        add(new Label("Document.typeDocument", new PropertyModel<String>(documentModel, "typeDocument.nom"))
+        add(new Label("TypeDocument.nom", new PropertyModel<String>(documentModel, "typeDocument.nom"))
                 .add(new ReplaceEmptyLabelBehavior()));
         add(new Label("TypeDocument.domaine", new PropertyModel<String>(documentModel, "typeDocument.domaine"))
                 .add(new ReplaceEmptyLabelBehavior()));

    

r190 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document

echatellier＠users.forge.codelutin.com

tags

participants (1)