From a36dc067eed795da906bef6139ff0c2d3da31c13 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Wed, 22 Sep 2010 11:28:25 +0200
Subject: [PATCH] Reviewed styles in assignment function configuration.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
---
 .../allocation/AdvancedAllocationController.java |  8 ++++----
 .../main/webapp/planner/stretches_function.zul   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index 0e620325d..22429fca2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -949,20 +949,20 @@ public class AdvancedAllocationController extends GenericForwardComposer {
 
     private List<ColumnOnRow> getColumnsForLeft() {
         List<ColumnOnRow> result = new ArrayList<ColumnOnRow>();
-        result.add(new ColumnOnRow(_("Name")) {
+        result.add(new ColumnOnRow("Name") {
 
             @Override
             public Component cellFor(Row row) {
                 return row.getNameLabel();
             }
         });
-        result.add(new ColumnOnRow(_("Hours")) {
+        result.add(new ColumnOnRow("Hours") {
             @Override
             public Component cellFor(Row row) {
                 return row.getAllHours();
             }
         });
-        result.add(new ColumnOnRow(_("Function")) {
+        result.add(new ColumnOnRow("Function") {
             @Override
             public Component cellFor(Row row) {
                 return row.getFunction();
@@ -1027,7 +1027,7 @@ abstract class ColumnOnRow implements IConvertibleToColumn {
     @Override
     public Column toColumn() {
         Column column = new org.zkoss.zul.Column();
-        column.setLabel(columnName);
+        column.setLabel(_(columnName));
         column.setSclass(((String) columnName).toLowerCase());
         return column;
     }
diff --git a/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul b/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
index 1e9480ce2..09c6145d6 100644
--- a/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
@@ -27,8 +27,8 @@
 ]]>
 </zscript>
 
-<window border="normal" title="${i18n:_('Stretches function configuration')}"
-    apply="${stretchesFunctionController}">
+<window border="false" title="${i18n:_('Stretches function configuration')}"
+    apply="${stretchesFunctionController}" closable="true">
 
 <hbox>
     <vbox>
@@ -45,10 +45,10 @@
             style="margin-bottom: 5px" fixedLayout="true" rows="15"
             width="500px" >
             <listhead>
-                <listheader label="${i18n:_('Date')}" />
-                <listheader label="${i18n:_('Length percentage')}" />
-                <listheader label="${i18n:_('Amount work percentage')}" />
-                <listheader label="${i18n:_('Operations')}" />
+                <listheader label="${i18n:_('Date')}" tooltiptext="${i18n:_('Measurement date')}" />
+                <listheader label="${i18n:_('Length')}" tooltiptext="${i18n:_('Length percentage')}" />
+                <listheader label="${i18n:_('Amount work')}" tooltiptext="${i18n:_('Amount work percentage')}" />
+                <listheader label="${i18n:_('Op.')}" tooltiptext="${i18n:_('Operations')}" width="50px"/>
             </listhead>
         </listbox>
 
@@ -80,9 +80,9 @@
 
 <hbox>
     <button label="${i18n:_('Accept')}"
-        onClick="stretchesFunctionController.confirm()" />
+        onClick="stretchesFunctionController.confirm()" sclass="save-button global-action"/>
     <button label="${i18n:_('Cancel')}"
-        onClick="stretchesFunctionController.cancel()" />
+        onClick="stretchesFunctionController.cancel()" sclass="cancel-button global-action"/>
 </hbox>
 
 </window>