From 0038f0e44d4618cc88b86b7465e69d452669b7bc Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Fri, 16 Oct 2009 02:14:55 +0200 Subject: [PATCH] ItEr30S05RFComportamentoGraficoPlanificadorItEr23S12: Added styling to breadcrumbs --- .../tabs/MultipleTabsPlannerController.java | 35 ++++++++++++------- .../main/webapp/common/css/navalpro_v01.css | 5 +-- .../main/webapp/common/css/navalpro_zk.css | 5 +++ .../main/webapp/common/layout/template.zul | 2 +- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java index 5c82b49c4..cf8c542c2 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java @@ -53,6 +53,7 @@ import org.zkoss.ganttz.resourceload.ResourcesLoadPanel.IToolbarCommand; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.util.Composer; import org.zkoss.zkplus.databind.AnnotateDataBinder; +import org.zkoss.zul.Image; import org.zkoss.zul.Label; /** @@ -104,6 +105,10 @@ public class MultipleTabsPlannerController implements Composer { private static final String ORDER_ORDERS_VIEW = _("Order Details"); + private static final String PLANNIFICATION = _("Plannification"); + + private static final String BREADCRUMBS_SEPARATOR = "/common/img/migas_separacion.gif"; + private TabsConfiguration tabsConfiguration; private Mode mode = Mode.initial(); @@ -223,8 +228,9 @@ public class MultipleTabsPlannerController implements Composer { super.afterShowAction(); companyPlanningController.setConfigurationForPlanner(); breadcrumbs.getChildren().clear(); - breadcrumbs.appendChild(new Label( - "Plannification > Company schedulling ")); + breadcrumbs.appendChild(new Label(PLANNIFICATION)); + breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); + breadcrumbs.appendChild(new Label(ENTERPRISE_VIEW)); } }; } @@ -254,12 +260,13 @@ public class MultipleTabsPlannerController implements Composer { if (breadcrumbs.getChildren() != null) { breadcrumbs.getChildren().clear(); } - breadcrumbs.appendChild(new Label( - "Plannification > ORder schedulling ")); + breadcrumbs.appendChild(new Label(PLANNIFICATION)); + breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); + breadcrumbs.appendChild(new Label(ORDER_ENTERPRISE_VIEW)); if (mode.isOf(ModeType.ORDER)) { + breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs -.appendChild(new Label("> " - + mode.getOrder().getName())); + .appendChild(new Label(mode.getOrder().getName())); } } @@ -297,10 +304,10 @@ public class MultipleTabsPlannerController implements Composer { @Override protected void afterShowAction() { breadcrumbs.getChildren().clear(); - breadcrumbs.appendChild(new Label("Planification")); - breadcrumbs.appendChild(new Label(" > ")); - breadcrumbs.appendChild(new Label("Resources Load")); - breadcrumbs.appendChild(new Label(" > ")); + breadcrumbs.appendChild(new Label(PLANNIFICATION)); + breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); + breadcrumbs.appendChild(new Label(ORDER_RESOURCE_LOAD_VIEW)); + breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); if (mode.isOf(ModeType.ORDER) && mode.getOrder() != currentOrder) { currentOrder = mode.getOrder(); @@ -330,8 +337,9 @@ public class MultipleTabsPlannerController implements Composer { if (breadcrumbs.getChildren() != null) { breadcrumbs.getChildren().clear(); } - breadcrumbs.appendChild(new Label( - "Planification > Overall Resources Load")); + breadcrumbs.appendChild(new Label(PLANNIFICATION)); + breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); + breadcrumbs.appendChild(new Label(RESOURCE_LOAD_VIEW)); } }; @@ -396,7 +404,8 @@ public class MultipleTabsPlannerController implements Composer { @Override protected void afterShowAction() { breadcrumbs.getChildren().clear(); - breadcrumbs.appendChild(new Label("order2 > ")); + breadcrumbs.appendChild(new Label(ORDER_ORDERS_VIEW)); + breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); if (mode.isOf(ModeType.ORDER)) { orderCRUDController.goToEditForm(mode.getOrder()); breadcrumbs diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css index 4022964e2..f1f04f039 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css @@ -135,6 +135,7 @@ a.sub_menu:hover { border-top-color: #DCEEF9; border-bottom-color: #DCEEF9; } -.ruta img { - margin-bottom:4px; + +.ruta div { + padding-bottom:3px; } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css index a0d80a67e..4d8f207a0 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css @@ -183,6 +183,11 @@ table { width: 300px; } +.message_ERROR img { + display: none; +} + + .message_INFO { color: #006600; padding: 15px; diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul index 6042bf9e9..c7aafb835 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul @@ -60,7 +60,7 @@ ${i18n:_('START')} - +