From 0da01a36003f6490c6cee9c404a6eacbdf0f8a71 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Wed, 6 Oct 2010 19:31:24 +0200
Subject: [PATCH] Minor graphical fixes to criteria tree edition

FEA: ItEr61S05BugFixing
---
 .../webapp/resources/criterions/_criterionsTree.zul  | 12 +++++++-----
 .../main/webapp/resources/criterions/_edition.zul    |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul
index ea979f6d5..a96709796 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul
@@ -18,13 +18,15 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<panel title="${i18n:_('Criteria of selected type ')}" border="normal">
-<panelchildren>
+<groupbox closable="false">
+<caption label="${i18n:_('Criteria of selected type ')}" />
+
 <vbox id="criterionsTree">
     <vbox>
         <hbox align="center">
+            <label value="${i18n:_('New criterion')}" />
             <textbox value="" id="criterionName" width="200px" onOK="criterionTreeController.addCriterion();"/>
-            <button id="add_new_criterion" label="${i18n:_('New criterion')}"
+            <button id="add_new_criterion" label="${i18n:_('Add')}"
                 onClick="criterionTreeController.addCriterion();"/>
         </hbox>
     </vbox>
@@ -44,5 +46,5 @@
     </vbox>
 </vbox>
 <separator bar="false" spacing="40px" orient="vertical"/>
-</panelchildren>
-</panel>
+
+</groupbox>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
index 5510cbb7d..50dd93cf5 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
@@ -22,7 +22,7 @@
 <window id="${arg.top_id}" title="${arg.title}">
     <tabbox>
         <tabs>
-            <tab label="${i18n:_('Edit')}"  width="850"></tab>
+            <tab label="${i18n:_('Edit')}" width="850"></tab>
         </tabs>
         <tabpanels>
             <tabpanel>
@@ -60,7 +60,7 @@
 
                         <row>
                             <label value="${i18n:_('Description')}" />
-                            <textbox value="@{controller.criterionType.description}" rows="3" width="390px"/>
+                            <textbox value="@{controller.criterionType.description}" rows="2" width="390px"/>
                         </row>
                         <row>
                             <label value="${i18n:_('Code')}" />
@@ -75,12 +75,12 @@
                         </row>
                     </rows>
                 </grid>
-                <separator bar="false" spacing="40px" orient="vertical"/>
+                <separator bar="false" height="10px" orient="vertical"/>
                 <criterionsTree/>
             </tabpanel>
         </tabpanels>
     </tabbox>
-     <hbox>
+    <hbox>
         <button id="save" onClick="controller.saveAndClose();"
             label="${i18n:_('Save')}" sclass="save-button global-action" />
         <button id="save_and_continue" onClick="controller.saveAndContinue();"