From 38acc73985ff5151edeaabd3727fb0bf7ec0ad47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 20 Oct 2011 23:46:27 +0200
Subject: [PATCH] Renamed 'Accept' for 'Apply' commands in advanced allocation

Extra verbosity was added in the tooltip text to explain the actions.

FEA: ItEr75S04BugFixing
---
 .../src/main/webapp/planner/advance_allocation.zul  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
index c2b66b27f..7897f1756 100644
--- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
@@ -36,12 +36,15 @@
 <borderlayout id="normalLayout" width="auto" apply="${advancedAllocationController}" class="advancedallocationlayout">
     <north height="30px" border="0" sclass="toolbar-box">
         <hbox align="center">
-            <button label="${i18n:_('Accept')}" id="acceptButton" image="/common/img/bt_ok.png"
-                if="${advancedAllocationController.advancedAllocationOfSingleTask}" />
+            <button label="${i18n:_('Apply')}" id="acceptButton" image="/common/img/bt_ok.png"
+                if="${advancedAllocationController.advancedAllocationOfSingleTask}"
+                tooltiptext="${i18n:_('Apply changes and go back to scheduling')}" />
             <button label="${i18n:_('Cancel')}" id="cancelButton" image="/common/img/bt_cancel.png"
-                if="${advancedAllocationController.advancedAllocationOfSingleTask}" />
-            <button label="${i18n:_('Accept')}" id="saveButton" image="/common/img/bt_ok.png"
-                if="${!(advancedAllocationController.advancedAllocationOfSingleTask)}" />
+                if="${advancedAllocationController.advancedAllocationOfSingleTask}"
+                tooltiptext="${i18n:_('Cancel changes and back to scheduling')}" />
+            <button label="${i18n:_('Apply')}" id="saveButton" image="/common/img/bt_ok.png"
+                if="${!(advancedAllocationController.advancedAllocationOfSingleTask)}"
+                tooltiptext="${i18n:_('Apply changes and continue edition')}" />
             <separator/>
             <space bar="true" />
             <label>${i18n:_('Zoom level')}:</label>