RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr21S04ArquitecturaServidorItEr20S04: Remove i3-label.properties entries from .zul and .java files in navalplanner-webapp

Browse source
This commit is contained in:
Diego Pino Garcia 2009-08-14 11:12:31 +02:00 • committed by Óscar González Fernández
parent febaf92188
commit 6dedc8804f
15 changed files with 63 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
View file

@ -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 <br />
* @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
@ -68,49 +70,49 @@ public class CustomMenuController extends Div {
List<CustomMenuItem> l = new ArrayList<CustomMenuItem>();
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);

1
navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
View file

@ -1,6 +1,5 @@
<?page title="Navalpro: AdvanceTypes"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?page id="List"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>

6
navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
View file

@ -4,7 +4,7 @@
<n:tr>
<n:td forEach="${menuContainer.customMenuItems}">
<n:a href="${each.url}" class=
"menuup${(each.activeParent?'_activa':'')}">${c:l(each.name)}</n:a>
"menuup${(each.activeParent?'_activa':'')}">${i18n:_(each.name)}</n:a>
</n:td>
</n:tr>
</n:table>
@ -16,7 +16,7 @@
<n:tr>
<n:td width="10" />
<n:td forEach="${menuContainer.customMenuSecondaryItems}">
<n:a href="${each.url}" class="sub_menu">${c:l(each.name)}</n:a>
<n:a href="${each.url}" class="sub_menu">${i18n:_(each.name)}</n:a>
<n:td width="14"
background="/navalplanner-webapp/common/img/sub_separacion.gif" />
</n:td>
@ -26,4 +26,4 @@
</n:td>
</n:tr>
</n:table>
</div>
</div>

3
navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul
View file

@ -1,4 +1,3 @@
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?link rel="stylesheet" type="text/css" href="/common/css/login_v01.css"?>
<div xmlns:n="http://www.zkoss.org/2005/zk/native">
@ -63,4 +62,4 @@
<n:td><n:div align="center"><n:img src="/navalplanner-webapp/common/img/logos_login.gif" width="500" height="91" /></n:div></n:td>
</n:tr>
</n:table>
</div>
</div>

48
navalplanner-webapp/src/main/webapp/common/layout/template.zul
View file

@ -1,4 +1,4 @@
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
<div xmlns:n="http://www.zkoss.org/2005/zk/native">
<n:div class="headings">
<n:div class="logo"></n:div>
@ -7,60 +7,60 @@
<menubar id="menubar" width="65%" top="0px" left="320px"
ctrlKeys="^k#f2" onCtrlKey="doCtrlKey()" sclass="mainmenu">
<menu label="${c:l('mainmenu.plannification')}">
<menu label="${i18n:_('Planification')}">
<menupopup>
<menuitem label="${c:l('mainmenu.plannification')}"
<menuitem label="${i18n:_('Planification')}"
href='/planner/main.zul' />
<menuitem label="${c:l('mainmenu.company_overview')}"
<menuitem label="${i18n:_('Company overview')}"
onClick="alert(self.label)" />
<menuitem label="${c:l('mainmenu.plannifications_list')}"
<menuitem label="${i18n:_('Planifications list')}"
onClick="alert(self.label)" />
</menupopup>
</menu>
<menu label="${c:l('mainmenu.resources')}">
<menu label="${i18n:_('Resources')}">
<menupopup>
<menuitem label="${c:l('mainmenu.list_workers')}"
<menuitem label="${i18n:_('Workers list')}"
href='/resources/worker/worker.zul#list' />
<menuitem label="${c:l('mainmenu.manage_criterions')}"
<menuitem label="${i18n:_('Manage criterions')}"
href='/resources/criterions/criterions.zul' />
<menuitem label="${c:l('mainmenu.manage_machines')}"
<menuitem label="${i18n:_('Manage machines')}"
onClick="alert(self.label)" />
</menupopup>
</menu>
<menu label="${c:l('mainmenu.orders')}">
<menu label="${i18n:_('Orders')}">
<menupopup>
<menuitem label="${c:l('mainmenu.list_orders')}"
<menuitem label="${i18n:_('Orders list')}"
href='/orders/orders.zul' />
<menuitem label="${c:l('mainmenu.activity_work_types')}" />
<menuitem label="${c:l('mainmenu.models')}" />
<menuitem label="${i18n:_('Work activities types')}" />
<menuitem label="${i18n:_('Models')}" />
</menupopup>
</menu>
<menu label="${c:l('mainmenu.work_reports')}">
<menu label="${i18n:_('Work reports')}">
<menupopup>
<menuitem label="${c:l('mainmenu.work_report_list')}" />
<menuitem label="${c:l('mainmenu.work_report_types')}"
<menuitem label="${i18n:_('Work report list')}" />
<menuitem label="${i18n:_('Work report types')}"
href="/workreports/workRerpotTypes.zul" />
<menuitem label="${c:l('mainmenu.work_report_import')}" />
<menuitem label="${i18n:_('Import work report')}" />
</menupopup>
</menu>
<menu label="${c:l('mainmenu.administration')}">
<menu label="${i18n:_('Administration')}">
<menupopup>
<menuitem label="${c:l('mainmenu.manage_users')}" />
<menuitem label="${i18n:_('Manage users')}" />
</menupopup>
</menu>
<menu label="${c:l('mainmenu.quality_management')}">
<menu label="${i18n:_('Quality management')}">
</menu>
<menu label="${c:l('mainmenu.help')}">
<menu label="${i18n:_('Help')}">
<menupopup>
<menu label="${c:l('mainmenu.about')}">
<menu label="${i18n:_('About')}">
<menupopup>
<menuitem label="${c:l('mainmenu.aclunaga')}"
<menuitem label="${i18n:_('Aclunaga')}"
href='/common/aclunaga.zul' />
</menupopup>
</menu>
@ -72,4 +72,4 @@
<div class="footer">© Fundación para o Fomento da Calidade Industrial e
Desenvolvemento Tecnolóxico de Galicia. Xunta de Galicia</div>
</div>
</div>

1
navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul
View file

@ -1,4 +1,3 @@
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
<n:div xmlns:n="http://www.zkoss.org/2005/zk/native">

2
navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul
View file

@ -1,4 +1,4 @@
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
<?component name="customMenu" inline="true" macroURI="_customMenu.zul"?>

1
navalplanner-webapp/src/main/webapp/orders/orders.zul
View file

@ -1,6 +1,5 @@
<?page title="Navalpro: Orders"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?page id="List"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>

14
navalplanner-webapp/src/main/webapp/planner/main.zul
View file

@ -1,7 +1,7 @@
<?page title="Navalpro: Scheduling"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
<?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
@ -24,24 +24,24 @@
<grid>
<rows>
<row>
${c:l('task.name')}
${i18n:_('Name')}
<textbox id="name" />
</row>
<row>
${c:l('task.start')}
${i18n:_('Start')}
<datebox id="startDateBox" compact="true" />
</row>
<row>
${c:l('task.end')}
${i18n:_('End')}
<datebox id="endDateBox" compact="true" />
</row>
<row>
${c:l('task.notes')}
${i18n:_('Notes')}
<textbox id="notes" />
</row>
</rows>
</grid>
<button id="ok" label=" ${c:l('task.ok')}" />
<button id="ok" label=" ${i18n:_('Accept')}" />
</popup>
</zk>
</zk>

12
navalplanner-webapp/src/main/webapp/planner/order.zul
View file

@ -2,7 +2,7 @@
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
<?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
@ -23,19 +23,19 @@
<grid>
<rows>
<row>
${c:l('task.name')}
${i18n:_('Name')}
<textbox id="name" />
</row>
<row>
${c:l('task.start')}
${i18n:_('Start')}
<datebox id="startDateBox" compact="true" />
</row>
<row>
${c:l('task.end')}
${i18n:_('End')}
<datebox id="endDateBox" compact="true" />
</row>
<row>
${c:l('task.notes')}
${i18n:_('Notes')}
<textbox id="notes" />
</row>
<row>
@ -52,7 +52,7 @@
</row>
</rows>
</grid>
<button id="ok" label=" ${c:l('task.ok')}" />
<button id="ok" label=" ${i18n:_('Accept')}" />
</popup>
<window id="resourceAllocationWindow" visible="false" apply="${allocationController}">

3
navalplanner-webapp/src/main/webapp/planner/resources_use.zul
View file

@ -1,7 +1,6 @@
<?page title="Navalpro: Scheduling"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
@ -12,4 +11,4 @@
<div id="idContextMenuTaskAssigment"></div>
</resourcesLoadPanel>
</zk>
</zk>

1
navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
View file

@ -1,5 +1,4 @@
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?page id="criterions_admin"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>

1
navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
View file

@ -1,6 +1,5 @@
<?page title="Navalpro: Resources"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?page id="Create"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>

1
navalplanner-webapp/src/main/webapp/workreports/workReport.zul
View file

@ -1,5 +1,4 @@
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?page id="work_report_admin"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>

3
navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
View file

@ -1,5 +1,4 @@
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?page id="List"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
@ -33,4 +32,4 @@
</vbox>
</window>
</window>
</zk>
</zk>