From 369bbc0c555d3297d2a45245b122b7f089a01b7f Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Tue, 9 Nov 2010 18:21:56 +0100
Subject: [PATCH] Changed widths and alignments of order columns

FEA: ItEr63S03BugFixing
---
 .../web/orders/OrderCRUDController.java       |  1 -
 .../main/webapp/common/css/navalplan_zk.css   |  6 +++++-
 .../src/main/webapp/orders/_list.zul          | 19 +++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 7614f6d4f..f979ec1e3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -1021,7 +1021,6 @@ public class OrderCRUDController extends GenericForwardComposer {
             appendDate(row, order.getInitDate());
             appendDate(row, order.getDeadline());
             appendCustomer(row, order.getCustomer());
-            appendLabel(row, order.getCustomerReference());
             appendObject(row, order.getTotalBudget());
             appendObject(row, order.getTotalHours());
             appendObject(row, _(order.getState().toString()));
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index 499532960..9694ec8bc 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -1380,7 +1380,11 @@ tr.z-tree-row-seld .z-row-cnt {
 }
 
 .projects-list .date {
-    width:120px;
+    width:100px;
+}
+
+.projects-list .customer {
+    max-width:150px;
 }
 
 .z-band-popup td.z-list-cell {
diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul
index 9a288daa0..c64a6e417 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul
@@ -23,17 +23,16 @@
         pageSize="10" fixedLayout="true"
         rowRenderer= "@{controller.ordersRowRender}"
         onInitRender ="controller.sortOrders();" sclass="clickable-rows projects-list">
-        <columns>
-            <column label="${i18n:_('Name')}" align="center" sort="auto(lower(name))" sclass="name"/>
-            <column label="${i18n:_('Code')}" align="center" sort="auto(lower(code))"/>
+        <columns sizable="true">
+            <column label="${i18n:_('Name')}" sort="auto(lower(name))" sclass="name"/>
+            <column label="${i18n:_('Code')}" sort="auto(lower(code))" align="center" width="130px"/>
             <column id="columnDateStart" label="${i18n:_('Starting date')}" align="center" sort="auto(initDate,deadline)" sortDirection="ascending" sclass="date"/>
-            <column label="${i18n:_('Deadline')}" align="center" sort="auto(deadline,initDate)" sclass="date"/>
-            <column label="${i18n:_('Customer')}" align="center" sort="auto(lower(customer))" sclass="customer" />
-            <column label="${i18n:_('Customer reference')}" align="center"/>
-            <column label="${i18n:_('Total Budget')}" align="center"/>
-            <column label="${i18n:_('Total Hours')}" align="center" sclass="hours" />
-            <column label="${i18n:_('State')}" align="center"/>
-            <column label="${i18n:_('Operations')}" align="center"/>
+            <column label="${i18n:_('Deadline')}" sort="auto(deadline,initDate)" align="center" sclass="date"/>
+            <column label="${i18n:_('Customer')}" sort="auto(customerReference)" width="150px"/>
+            <column label="${i18n:_('Total Budget')}" sort="auto(totalBudget)" align="right" width="100px"/>
+            <column label="${i18n:_('Hours')}" sort="auto(totalHours)" align="right" width="80px"/>
+            <column label="${i18n:_('State')}" sort="auto(totalBudget)" align="center" width="90px"/>
+            <column label="${i18n:_('Operations')}" width="100px"/>
         </columns>
     </grid>