From c285da76c97685c60fce583b96c61ce8a63ead2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Fri, 7 Oct 2011 12:56:45 +0200
Subject: [PATCH] Applied interface conventions to workreport query

FEA: ItEr75S04BugFixing
---
 .../webapp/workreports/workReportQuery.zul    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
index 5438d2bac..b32abef16 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
@@ -63,29 +63,30 @@
             <separator bar="false" spacing="20px" orient="horizontal"/>
             <grid id="gridListQuery"  mold="paging" pageSize="10"
                 model="@{controller.queryWorkReportLines}"
-                onInitRender ="controller.sortQueryWorkReportLines();">
+                onInitRender ="controller.sortQueryWorkReportLines();"
+                sizedByContent="true" span="true">
                 <columns sizable="true">
-                <column id="date" label="${i18n:_('Date')}" width="60px" align="center"
+                <column id="date" label="${i18n:_('Date')}" align="center"
                     sort="auto(date)" sortDirection="ascending"/>
                 <column id="resource" label="${i18n:_('Resource')}" align="center"
                     sort="auto(resource.shortDescription)" sortDirection="ascending"/>
-                <column id="projectCode" label="${i18n:_('Project Code')}" width="130px" align="center"
+                <column id="projectCode" label="${i18n:_('Project Code')}" align="center"
                     sort="auto(orderElement.order.code)" sortDirection="ascending"/>
-                <column id="projectName" label="${i18n:_('Project Name')}" width="150px" align="center"
+                <column id="projectName" label="${i18n:_('Project Name')}" align="center"
                     sort="auto(orderElement.order.name)" sortDirection="ascending"/>
-                <column id="taskCode" label="${i18n:_('Task Code')}" width="130px" align="center"
+                <column id="taskCode" label="${i18n:_('Task Code')}" align="center"
                     sort="auto(orderElement.code)" sortDirection="ascending"/>
-                <column id="taskName" label="${i18n:_('Task name')}" width="150px" align="center"
+                <column id="taskName" label="${i18n:_('Task name')}" align="center"
                     sort="auto(orderElement.name)" sortDirection="ascending"/>
-                <column id="startHour" label="${i18n:_('Start hour')}" width="80px" align="center"
+                <column id="startHour" label="${i18n:_('Start hour')}" align="center"
                     sort="auto(clockStart)" sortDirection="ascending"/>
-                <column id="finishHour" label="${i18n:_('Finish hour')}" width="80px" align="center"
+                <column id="finishHour" label="${i18n:_('Finish hour')}" align="center"
                     sort="auto(clockFinish)" sortDirection="ascending"/>
-                <column id="hours" label="${i18n:_('Hours')}" width="50px" align="center"
+                <column id="hours" label="${i18n:_('Hours')}" align="center"
                     sort="auto(effort)" sortDirection="ascending"/>
-                <column id="hourType" label="${i18n:_('Hours type')}" width="90px" align="center"
+                <column id="hourType" label="${i18n:_('Hours type')}" align="center"
                     sort="auto(typeOfWorkHours.name)" sortDirection="ascending"/>
-                <column label="${i18n:_('Work Report')}" width="80px" align="center"/>
+                <column label="${i18n:_('Work Report')}" align="center"/>
                 </columns>
                 <rows>
                 <row self="@{each='queryWorkReportLine'}" value="@{queryWorkReportLine}">
@@ -128,18 +129,18 @@
                             </columns>
                             <rows>
                                 <row visible = "@{controller.workReport.workReportType.dateIsSharedByLines}">
-                                        <label value="${i18n:_('Date')}:" />
+                                        <label value="${i18n:_('Date')}" />
                                         <datebox id="date" value="@{controller.workReport.date}" />
                                 </row>
                                 <row visible = "@{controller.workReport.workReportType.resourceIsSharedInLines}">
-                                        <label value="${i18n:_('Resource')}:" />
+                                        <label value="${i18n:_('Resource')}" />
                                         <autocomplete id="autocompleteResource" buttonVisible="true"
                                             onChange ="controller.changeResource(self.selectedItem);"
                                             finder="ResourceFinder"
                                             selectedItem="@{controller.workReport.resource}"/>
                                 </row>
                                 <row visible = "@{controller.workReport.workReportType.orderElementIsSharedInLines}">
-                                    <label value="${i18n:_('Task Code')}:" />
+                                    <label value="${i18n:_('Task Code')}" />
                                     <bandboxSearch id="bandboxSelectOrderElementInHead"
                                         finder="OrderElementBandboxFinder"
                                         model="@{controller.orderElements}"