From bc7376203f4ee43dc862ffac3396fa66467ee9d8 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Wed, 9 Dec 2009 20:42:24 +0100
Subject: [PATCH]  ItEr38S09CUAsignacionMateriaisAPedidoItEr37S13: Revamp
 Materials zul layout

  * Change Unselect link to Button
  * Reload all materials when clicking on Unselect
---
 .../web/materials/MaterialsController.java       |  5 +++++
 .../src/main/webapp/materials/materials.zul      | 16 +++++++++++-----
 .../webapp/orders/_listOrderElementMaterials.zul | 11 +++++++----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
index 48c664d95..6b3976134 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
@@ -405,4 +405,9 @@ public class MaterialsController extends
         Util.reloadBindings(gridMaterials);
     }
 
+    public void clearSelectionCategoriesTree() {
+        categoriesTree.clearSelection();
+        Util.reloadBindings(gridMaterials);
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/materials/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul
index 2c48da932..21b06caae 100644
--- a/navalplanner-webapp/src/main/webapp/materials/materials.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul
@@ -48,11 +48,17 @@
                             <panel title="${i18n:_('Categories')}"
                                 border="normal">
                                 <panelchildren>
-                                    <textbox id="txtCategory" onOK="materialsController.addMaterialCategory()"
-                                        style="margin-bottom: 4px;" />
-                                    <button label="${i18n:_('Add')}"
-                                        onClick="materialsController.addMaterialCategory()" />
-                                    <toolbarbutton style="text-decoration: none" label="${i18n:_('Unselect')}" onClick="categoriesTree.clearSelection()" />
+                                    <hbox>
+                                        <textbox id="txtCategory" onOK="materialsController.addMaterialCategory()"
+                                            style="padding-bottom: 4px" />
+                                        <button label="${i18n:_('Add')}"
+                                            onClick="materialsController.addMaterialCategory()" />
+                                    </hbox>
+                                    <separator spacing="10px" orient="horizontal" />
+
+                                    <button label="${i18n:_('Unselect')}" onClick="materialsController.clearSelectionCategoriesTree()" />
+                                    <separator spacing="5px" orient="horizontal" />
+
                                     <tree id="categoriesTree" zclass="z-dottree"
                                         width="280px" rows="10" vflex="true" multiple="false"
                                         model="@{materialsController.materialCategories}"
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
index 3d24d7ee6..f0c5c8107 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
@@ -40,8 +40,9 @@
                     <vbox>
                         <panel title="${i18n:_('Categories')}" border="normal">
                             <panelchildren>
-                                <toolbarbutton style="text-decoration: none" label="${i18n:_('Unselect')}"
-                                    onClick="assignedMaterialsController.clearSelectionCategoriesTree()" />
+                                <button label="${i18n:_('Unselect')}"
+                                        onClick="assignedMaterialsController.clearSelectionCategoriesTree()" />
+                                <separator spacing="5px" orient="horizontal" />
                                 <tree id="categoriesTree"
                                         fixedLayout="false"
                                         width="280px" rows="10" vflex="true" multiple="false"
@@ -140,13 +141,15 @@
 
                                 <!-- Search textbox -->
                                 <hbox>
-                                    <textbox id="txtSearchMaterial" width="250px" style="margin-top: 5px" />
-                                    <button label="${i18n:_('Search')}" style="margin-bottom: 5px"
+                                    <textbox id="txtSearchMaterial" width="250px" style="margin-top: 2px" />
+                                    <button label="${i18n:_('Search')}"
                                         onClick="assignedMaterialsController.searchMaterials()"/>
                                     <button label="${i18n:_('Assign')}"
                                         onClick="assignedMaterialsController.assignSelectedMaterials()" />
                                 </hbox>
 
+                                <separator spacing="10px" orient="horizontal" />
+
                                 <listbox id="lbFoundMaterials"
                                     multiple="true"
                                     fixedLayout="true"