From fff0b7175d523c8b2fb7463e7bbc6b2c8269ff9e Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 19 Oct 2009 19:51:47 +0200
Subject: [PATCH]  ItEr31S05RFComportamentoGraficoPlanificadorItEr30S05: Fixed
 problems with mainmenu in machines tab and breadcrumb literals

---
 .../org/navalplanner/web/common/CustomMenuController.java     | 2 +-
 .../org/navalplanner/web/planner/tabs/OrdersTabCreator.java   | 4 +++-
 .../org/navalplanner/web/planner/tabs/PlanningTabCreator.java | 4 ++--
 navalplanner-webapp/src/main/webapp/orders/_edition.zul       | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
index 62b85e3f4..9c24f98b1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
@@ -173,7 +173,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
                 subItem(_("Workers List"),
                     "/resources/worker/worker.zul#list"),
                 subItem(_("Machines List"),
-                    "/resources/machine/machines.zul#list"));
+ "/resources/machine/machines.zul"));
 
         topItem(_("Work reports"), "/workreports/workReportTypes.zul", subItem(
                 _("Work report types"), "/workreports/workReportTypes.zul"),
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
index ebe696087..79752c074 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
@@ -105,7 +105,9 @@ public class OrdersTabCreator {
                 if (breadcrumbs.getChildren() != null) {
                     breadcrumbs.getChildren().clear();
                 }
-                breadcrumbs.appendChild(new Label("Orders > Orders list"));
+                breadcrumbs.appendChild(new Label(PlanningTabCreator.ENTERPRISE_VIEW));
+                breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
+                breadcrumbs.appendChild(new Label(ORDER_ORDERS_VIEW));
             }
         };
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
index 7aa8748db..0a10615b9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
@@ -49,9 +49,9 @@ import org.zkoss.zul.Label;
  */
 public class PlanningTabCreator {
 
-    private static final String ENTERPRISE_VIEW = _("Company Scheduling");
+    public static final String ENTERPRISE_VIEW = _("Company Scheduling");
 
-    private static final String ORDER_ENTERPRISE_VIEW = _("Order Scheduling");
+    public static final String ORDER_ENTERPRISE_VIEW = _("Order Scheduling");
 
     private final Mode mode;
     private final CompanyPlanningController companyPlanningController;
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index 22a1017d5..63f8109e9 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -20,7 +20,7 @@
 
 <?component name="orderElementTree" inline="true" macroURI="_orderElementTree.zul"?>
 <window id="${arg.top_id}" title="${arg.title}">
-<button label="${i18n:_('Up')}" onClick="controller.up();" />
+<button label="${i18n:_('Up')}" onClick="controller.up();" sclass="orders-up-button"/>
     <tabbox>
         <tabs>
             <tab id="tabGeneralData" label="${i18n:_('General data')}" />