From 6dedc8804fe6ecc2b9fc7ec20fddc371e1e426c2 Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Fri, 14 Aug 2009 11:12:31 +0200 Subject: [PATCH] ItEr21S04ArquitecturaServidorItEr20S04: Remove i3-label.properties entries from .zul and .java files in navalplanner-webapp --- .../web/common/CustomMenuController.java | 36 +++++++------- .../src/main/webapp/advance/advanceTypes.zul | 1 - .../main/webapp/common/layout/_customMenu.zul | 6 +-- .../main/webapp/common/layout/login_v01.zul | 3 +- .../main/webapp/common/layout/template.zul | 48 +++++++++---------- .../webapp/common/layout/template_v01.zul | 1 - .../webapp/common/layout/template_v02.zul | 2 +- .../src/main/webapp/orders/orders.zul | 1 - .../src/main/webapp/planner/main.zul | 14 +++--- .../src/main/webapp/planner/order.zul | 12 ++--- .../src/main/webapp/planner/resources_use.zul | 3 +- .../resources/criterions/criterions.zul | 1 - .../main/webapp/resources/worker/worker.zul | 1 - .../main/webapp/workreports/workReport.zul | 1 - .../webapp/workreports/workReportTypes.zul | 3 +- 15 files changed, 63 insertions(+), 70 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 8e184d195..1768c81a5 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 @@ -6,6 +6,8 @@ import java.util.List; import org.zkoss.zk.ui.Executions; import org.zkoss.zul.Div; +import static org.navalplanner.web.I18nHelper._; + /** * Controller for customMenu
* @author Lorenzo Tilve Álvaro @@ -68,49 +70,49 @@ public class CustomMenuController extends Div { List l = new ArrayList(); CustomMenuItem ci; - ci = new CustomMenuItem("mainmenu.plannification", + ci = new CustomMenuItem(_("Planification"), "/navalplanner-webapp/planner/main.zul"); - ci.appendChildren(new CustomMenuItem("mainmenu.plannification", + ci.appendChildren(new CustomMenuItem(_("Planification"), "/navalplanner-webapp/planner/main.zul")); - ci.appendChildren(new CustomMenuItem("mainmenu.company_overview", + ci.appendChildren(new CustomMenuItem(_("Company overview"), "/navalplanner-webapp/planner/main.zul")); - ci.appendChildren(new CustomMenuItem("mainmenu.plannifications_list", + ci.appendChildren(new CustomMenuItem(_("Planifications list"), "/navalplanner-webapp/planner/main.zul")); l.add(ci); - ci = new CustomMenuItem("mainmenu.resources", + ci = new CustomMenuItem(_("Resources"), "/navalplanner-webapp/resources/worker/worker.zul"); - ci.appendChildren(new CustomMenuItem("mainmenu.list_workers", + ci.appendChildren(new CustomMenuItem(_("Workers list"), "/navalplanner-webapp/resources/worker/worker.zul#list")); - ci.appendChildren(new CustomMenuItem("mainmenu.manage_criterions", + ci.appendChildren(new CustomMenuItem(_("Manage criterions"), "/navalplanner-webapp/resources/criterions/criterions.zul")); l.add(ci); - ci = new CustomMenuItem("mainmenu.orders", + ci = new CustomMenuItem(_("Orders"), "/navalplanner-webapp/orders/orders.zul"); - ci.appendChildren(new CustomMenuItem("mainmenu.list_orders", + ci.appendChildren(new CustomMenuItem(_("Orders list"), "/navalplanner-webapp/orders/orders.zul")); - ci.appendChildren(new CustomMenuItem("mainmenu.activity_work_types", + ci.appendChildren(new CustomMenuItem(_("Work activities types"), "/navalplanner-webapp/orders/orders.zul")); - ci.appendChildren(new CustomMenuItem("mainmenu.models", + ci.appendChildren(new CustomMenuItem(_("Models"), "/navalplanner-webapp/orders/orders.zul")); l.add(ci); - ci = new CustomMenuItem("mainmenu.work_reports", + ci = new CustomMenuItem(_("Work reports"), "/navalplanner-webapp/workreports/workReportTypes.zul"); - ci.appendChildren(new CustomMenuItem("mainmenu.work_report_types", + ci.appendChildren(new CustomMenuItem(_("Work report types"), "navalplanner-webapp/workreports/workReportTypes.zul")); - ci.appendChildren(new CustomMenuItem("mainmenu.work_report_list", + ci.appendChildren(new CustomMenuItem(_("Work report list"), "/navalplanner-webapp/workreports/workReport.zul#list")); l.add(ci); - ci = new CustomMenuItem("mainmenu.quality_management", + ci = new CustomMenuItem(_("Quality management"), "/navalplanner-webapp/"); l.add(ci); - ci = new CustomMenuItem("mainmenu.administration", + ci = new CustomMenuItem(_("Administration"), "/navalplanner-webapp/advance/advanceTypes.zul"); - ci.appendChildren(new CustomMenuItem("mainmenu.manageAdvancesTypes", + ci.appendChildren(new CustomMenuItem(_("Manage advances types"), "/navalplanner-webapp/advance/advanceTypes.zul")); l.add(ci); diff --git a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul index 3a15b10e1..f55b99194 100644 --- a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul +++ b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul @@ -1,6 +1,5 @@ - diff --git a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul index 530144356..1e6fa634a 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul @@ -4,7 +4,7 @@ ${c:l(each.name)} + "menuup${(each.activeParent?'_activa':'')}">${i18n:_(each.name)} @@ -16,7 +16,7 @@ - ${c:l(each.name)} + ${i18n:_(each.name)} @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul b/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul index 7ab30498b..36b79c0e1 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul @@ -1,4 +1,3 @@ -
@@ -63,4 +62,4 @@ -
\ No newline at end of file + diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul index 4f8afaa05..5ca2d4b8b 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul @@ -1,4 +1,4 @@ - +
@@ -7,60 +7,60 @@ - + - - - - + - - - - + - - - + + - + - - + - + - + - + - + - + - + - @@ -72,4 +72,4 @@ -
\ No newline at end of file + diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul b/navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul index 41fca07d8..853373091 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul @@ -1,4 +1,3 @@ - diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul b/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul index 93bbe7892..61683ab48 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul @@ -1,4 +1,4 @@ - + diff --git a/navalplanner-webapp/src/main/webapp/orders/orders.zul b/navalplanner-webapp/src/main/webapp/orders/orders.zul index f39ca2492..af7c10891 100644 --- a/navalplanner-webapp/src/main/webapp/orders/orders.zul +++ b/navalplanner-webapp/src/main/webapp/orders/orders.zul @@ -1,6 +1,5 @@ - diff --git a/navalplanner-webapp/src/main/webapp/planner/main.zul b/navalplanner-webapp/src/main/webapp/planner/main.zul index f7ebc27a5..8ca320a55 100644 --- a/navalplanner-webapp/src/main/webapp/planner/main.zul +++ b/navalplanner-webapp/src/main/webapp/planner/main.zul @@ -1,7 +1,7 @@ - + @@ -24,24 +24,24 @@ - ${c:l('task.name')} + ${i18n:_('Name')} - ${c:l('task.start')} + ${i18n:_('Start')} - ${c:l('task.end')} + ${i18n:_('End')} - ${c:l('task.notes')} + ${i18n:_('Notes')} -