From df2471eaaa938a56c106b3f8a50f6b8e686737f1 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Thu, 24 Sep 2009 03:21:46 +0200
Subject: [PATCH]  ItEr27S11AltaEtiquetasTipoEtiquetaItEr26S13: Added button
 delete, fix validations constraints when adding new rows

---
 .../web/labels/LabelTypeCRUDController.java          |  3 +--
 .../src/main/webapp/labels/_editLabelType.zul        | 12 ++++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
index 516b62642..d34285925 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
@@ -248,6 +248,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
     }
 
     public void createLabel() {
+        validate();
         labelTypeModel.addLabel();
         Util.reloadBindings(gridLabels);
         // After adding a new row, model might be disordered, so we force it to
@@ -267,11 +268,9 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
         ListModelExt model = (ListModelExt) gridLabels.getModel();
         if ("ascending".equals(column.getSortDirection())) {
             model.sort(column.getSortAscending(), true);
-            return;
         }
         if ("descending".equals(column.getSortDirection())) {
             model.sort(column.getSortDescending(), false);
-            return;
         }
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index 6bf4e4620..2909fe2c7 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -33,7 +33,7 @@
                         <button label="${i18n:_('New label')}"
                             onClick="controller.createLabel()" />
                         <grid id="gridLabels" height="320px"
-                            model="@{controller.labels}">
+                            model="@{controller.labels}" fixedLayout="true">
                             <columns sizable="true">
                                 <column label="${i18n:_('Name')}"
                                     sort="auto(name)" sortDirection="ascending" />
@@ -42,11 +42,15 @@
                             <rows>
                                 <row self="@{each='label'}"
                                     value="@{label}">
-                                    <textbox value="@{label.name}"
+                                    <textbox value="@{label.name}" width="500px"
                                         onChange="controller.onChangeLabelName(event)"
                                         constraint="no empty:${i18n:_('cannot be null or empty')}" />
-                                    <button label="${i18n:_('Delete')}"
-                                        onClick="controller.confirmDeleteLabel(self.parent.value)" />
+
+                                    <button sclass="icono" image="/common/img/ico_borrar1.png"
+                                        hoverImage="/common/img/ico_borrar.png"
+                                        tooltiptext="${i18n:_('Delete')}"
+                                        onClick="controller.confirmDeleteLabel(self.parent.value);">
+                                    </button>
                                 </row>
                             </rows>
                         </grid>