From 339f02c931a68378d026a461a6af10e44a5653bf Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Fri, 11 Feb 2011 10:10:14 +0100
Subject: [PATCH] Fixed positioning issues on add assignment button

FEA: ItEr70S04BugFixing
---
 .../src/main/webapp/common/css/navalplan_zk.css               | 4 ++++
 .../taskpanels/_tabPanelNonLimitingResourceAllocation.zul     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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 ab4336b2b..43e5a8255 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -1556,3 +1556,7 @@ input.z-datebox-text-disd {
 .z-calendar .z-calendar-calday td.z-calendar-seld {
     padding: 0;
 }
+
+.add-resources-or-criteria span {
+	white-space: nowrap;
+}
diff --git a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
index b63313209..29b79608e 100644
--- a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
@@ -61,7 +61,7 @@
                     <!-- Multiple allocation selector -->
                     <separator spacing="10px"/>
 
-                    <hbox align="bottom" width="100%">
+                    <hbox align="bottom" sclass="add-resources-or-criteria">
                         <newAllocationSelectorCombo id="newAllocationSelectorCombo" behaviour="NON_LIMITING"/>
                         <button label="${i18n:_('Add')}" onClick="allocationController.onSelectWorkers(newAllocationSelectorCombo)" />
                         <button id="advancedSearchButton" label="${i18n:_('Advanced search')}" onClick="allocationController.goToAdvancedSearch()" />
@@ -82,7 +82,7 @@
                             <auxheader label="${i18n:_('Resources Per Day')}" colspan="@{allocationController.colspanResources}" align="center"/>
                             <auxheader label="${i18n:_('Operations')}" colspan="1" align="center"/>
                         </auxhead>
-                        <columns>
+                        <columns sclass="details">
                             <column width="30px"/>
                             <column />
                             <column label="${i18n:_('Original')}" align="center" visible="@{allocationController.extendedView}" width="80px"/>