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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #591] Making coherent all menu entries and window titles.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-08-13 10:16:17 +02:00
parent 888ef09ba6
commit d02a6570d8
66 changed files with 207 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -221,54 +221,54 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
public void initializeMenu() {
topItem(_("Scenarios"), "/scenarios/scenarios.zul", "",
subItem(_("Scenarios management"), "/scenarios/scenarios.zul",""),
subItem(_("Transfer orders between scenarios"), "/scenarios/transferOrders.zul", ""));
subItem(_("Scenarios Management"), "/scenarios/scenarios.zul",""),
subItem(_("Transfer Projects Between Scenarios"), "/scenarios/transferOrders.zul", ""));
topItem(_("Scheduling"), "/planner/index.zul", "",
subItem(_("Projects planning"), "/planner/index.zul;company_scheduling","01-introducion.html"),
subItem(_("Resource usage"),"/planner/index.zul;company_load","01-introducion.html#id1"),
subItem(_("Projects Planning"), "/planner/index.zul;company_scheduling","01-introducion.html"),
subItem(_("Resource Usage"),"/planner/index.zul;company_load","01-introducion.html#id1"),
subItem(_("Projects"), "/planner/index.zul;orders_list","01-introducion.html#id2"),
subItem(_("Limiting resources planning"),"/planner/index.zul;limiting_resources","01-introducion.html"),
subItem(_("Project templates"), "/templates/templates.zul", ""));
subItem(_("Limiting Resources Planning"),"/planner/index.zul;limiting_resources","01-introducion.html"),
subItem(_("Project Templates"), "/templates/templates.zul", ""));
topItem(_("Resources"), "/resources/worker/worker.zul", "",
subItem(_("Workers"), "/resources/worker/worker.zul","05-recursos.html#xesti-n-de-traballadores"),
subItem(_("Machines"), "/resources/machine/machines.zul","05-recursos.html#xesti-n-de-m-quinas"),
subItem(_("Virtual workers groups"),"/resources/worker/virtualWorkers.zul","05-recursos.html#xesti-n-de-traballadores"),
subItem(_("Work reports"), "/workreports/workReport.zul", "09-partes.html#id3"),
subItem(_("Virtual Workers Groups"),"/resources/worker/virtualWorkers.zul","05-recursos.html#xesti-n-de-traballadores"),
subItem(_("Work Reports"), "/workreports/workReport.zul", "09-partes.html#id3"),
subItem(_("Companies"), "/externalcompanies/externalcompanies.zul",""),
subItem(_("Subcontracting"), "/subcontract/subcontractedTasks.zul", "",
subItem(_("Subcontracted tasks"), "/subcontract/subcontractedTasks.zul", ""),
subItem(_("Advance report"), "/subcontract/reportAdvances.zul", "")));
subItem(_("Subcontracted Tasks"), "/subcontract/subcontractedTasks.zul", ""),
subItem(_("Advance Report"), "/subcontract/reportAdvances.zul", "")));
if (SecurityUtils.isUserInRole(UserRole.ROLE_ADMINISTRATION)) {
topItem(_("Administration / Management"), "/advance/advanceTypes.zul", "",
subItem(_("NavalPlan configuration"), "/common/configuration.zul","03-calendarios.html#calendario-por-defecto"),
subItem(_("NavalPlan Configuration"), "/common/configuration.zul","03-calendarios.html#calendario-por-defecto"),
subItem(_("Users"), "/users/users.zul","13-usuarios.html#administraci-n-de-usuarios",
subItem(_("Accounts"), "/users/users.zul","13-usuarios.html#administraci-n-de-usuarios"),
subItem(_("Profiles"), "/users/profiles.zul","13-usuarios.html#administraci-n-de-perfiles")),
subItem(_("Calendars"),"/calendars/calendars.zul", "03-calendarios.html"),
subItem(_("Materials"), "/materials/materials.zul", "11-materiales.html#administraci-n-de-materiais"),
subItem(_("Quality forms"),"/qualityforms/qualityForms.zul","12-formularios-calidad.html#administraci-n-de-formularios-de-calidade"),
subItem(_("Cost categories"),"/costcategories/costCategory.zul","14-custos.html#categor-as-de-custo"),
subItem(_("Data types"),"/advance/advanceTypes.zul", "04-avances.html#id1",
subItem(_("Quality Forms"),"/qualityforms/qualityForms.zul","12-formularios-calidad.html#administraci-n-de-formularios-de-calidade"),
subItem(_("Cost Categories"),"/costcategories/costCategory.zul","14-custos.html#categor-as-de-custo"),
subItem(_("Data Types"),"/advance/advanceTypes.zul", "04-avances.html#id1",
subItem(_("Advances"),"/advance/advanceTypes.zul", "04-avances.html#id1"),
subItem(_("Criteria"),"/resources/criterions/criterions-V2.zul","02-criterios.html#id1"),
subItem(_("Labels"), "/labels/labelTypes.zul","10-etiquetas.html"),
subItem(_("Units"), "/materials/unitTypes.zul", "11-materiales.html#administraci-n-de-materiais"),
subItem(_("Work hours"),"/costcategories/typeOfWorkHours.zul","14-custos.html#administraci-n-de-horas-traballadas"),
subItem(_("Work reports"),"/workreports/workReportTypes.zul","09-partes.html#id2")));
subItem(_("Work Hours"),"/costcategories/typeOfWorkHours.zul","14-custos.html#administraci-n-de-horas-traballadas"),
subItem(_("Work Reports"),"/workreports/workReportTypes.zul","09-partes.html#id2")));
}
topItem(_("Reports"), "/reports/hoursWorkedPerWorkerReport.zul", "",
subItem(_("Work reports"), "/workreports/workReportQuery.zul", "09-partes.html#id4"),
subItem(_("Hours worked per resource"),"/reports/hoursWorkedPerWorkerReport.zul","15-informes.html"),
subItem(_("Work and progress per project"),"/reports/schedulingProgressPerOrderReport.zul", "15-informes.html"),
subItem(_("Work and progress per task"),"/reports/workingProgressPerTaskReport.zul", "15-informes.html"),
subItem(_("Estimated/planned hours per task"),"/reports/completedEstimatedHoursPerTask.zul", "15-informes.html"),
subItem(_("Project costs per resource"),"/reports/orderCostsPerResource.zul", "15-informes.html"),
subItem(_("Task scheduling status in project"),"/reports/workingArrangementsPerOrderReport.zul","15-informes.html"),
subItem(_("Materials needs at date"),"/reports/timeLineMaterialReport.zul","15-informes.html"));
subItem(_("Work Reports"), "/workreports/workReportQuery.zul", "09-partes.html#id4"),
subItem(_("Hours Worked Per Resource"),"/reports/hoursWorkedPerWorkerReport.zul","15-informes.html"),
subItem(_("Work And Progress Per Project"),"/reports/schedulingProgressPerOrderReport.zul", "15-informes.html"),
subItem(_("Work And Progress Per Task"),"/reports/workingProgressPerTaskReport.zul", "15-informes.html"),
subItem(_("Estimated/Planned Hours Per Task"),"/reports/completedEstimatedHoursPerTask.zul", "15-informes.html"),
subItem(_("Project Costs Per Resource"),"/reports/orderCostsPerResource.zul", "15-informes.html"),
subItem(_("Task Scheduling Status In Project"),"/reports/workingArrangementsPerOrderReport.zul","15-informes.html"),
subItem(_("Materials Needs At Date"),"/reports/timeLineMaterialReport.zul","15-informes.html"));
}
private Vbox getRegisteredItemsInsertionPoint() {

5
navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
View file

@ -29,7 +29,6 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.logging.LogFactory;
import org.hibernate.validator.InvalidValue;
import org.joda.time.LocalDate;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException;
@ -53,10 +52,10 @@ import org.zkoss.zul.Button;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Decimalbox;
import org.zkoss.zul.Grid;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Row;
import org.zkoss.zul.RowRenderer;
import org.zkoss.zul.Grid;
import org.zkoss.zul.Rows;
import org.zkoss.zul.api.Hbox;
import org.zkoss.zul.api.Window;
@ -124,6 +123,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
@Override
public void goToCreateForm() {
costCategoryModel.initCreate();
createWindow.setTitle(_("Create Cost Category"));
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
}
@ -131,6 +131,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
@Override
public void goToEditForm(CostCategory costCategory) {
costCategoryModel.initEdit(costCategory);
createWindow.setTitle(_("Edit Cost Category"));
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java
View file

@ -71,6 +71,7 @@ public class TypeOfWorkHoursCRUDController extends GenericForwardComposer implem
@Override
public void goToCreateForm() {
typeOfWorkHoursModel.initCreate();
createWindow.setTitle(_("Create Work Hours Type"));
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
}
@ -78,6 +79,7 @@ public class TypeOfWorkHoursCRUDController extends GenericForwardComposer implem
@Override
public void goToEditForm(TypeOfWorkHours typeOfWorkHours) {
typeOfWorkHoursModel.initEdit(typeOfWorkHours);
createWindow.setTitle(_("Edit Work Hours Type"));
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
View file

@ -81,6 +81,7 @@ public class ExternalCompanyCRUDController extends GenericForwardComposer
@Override
public void goToCreateForm() {
externalCompanyModel.initCreate();
createWindow.setTitle(_("Create Company"));
getVisibility().showOnly(createWindow);
setInteractionFieldsActivation(getCompany().getInteractsWithApplications());
clearAutocompleteUser();
@ -97,6 +98,7 @@ public class ExternalCompanyCRUDController extends GenericForwardComposer
@Override
public void goToEditForm(ExternalCompany company) {
externalCompanyModel.initEdit(company);
createWindow.setTitle(_("Edit Company"));
getVisibility().showOnly(createWindow);
setInteractionFieldsActivation(company.getInteractsWithApplications());
clearAutocompleteUser();

4
navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
View file

@ -134,7 +134,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
*/
public void goToCreateForm() {
labelTypeModel.initCreate();
editWindow.setTitle(_("Create label type"));
editWindow.setTitle(_("Create Label Type"));
showEditWindow();
Util.reloadBindings(editWindow);
}
@ -150,7 +150,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
*/
public void goToEditForm(LabelType labelType) {
labelTypeModel.initEdit(labelType);
editWindow.setTitle(_("Edit label type"));
editWindow.setTitle(_("Edit Label Type"));
showEditWindow();
Util.reloadBindings(editWindow);
}

6
navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
View file

@ -32,7 +32,6 @@ import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.MessagesForUser;
import org.navalplanner.web.common.OnlyOneVisible;
import org.navalplanner.web.common.Util;
import org.zkoss.util.logging.Log;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.CheckEvent;
@ -46,6 +45,7 @@ import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Row;
import org.zkoss.zul.RowRenderer;
import org.zkoss.zul.Textbox;
import org.zkoss.zul.api.Window;
import org.zkoss.zul.impl.InputElement;
/**
@ -65,7 +65,7 @@ public class UnitTypeController extends GenericForwardComposer {
private OnlyOneVisible visibility;
private Component listWindow;
private Component editWindow;
private Window editWindow;
private IUnitTypeModel unitTypeModel;
@ -155,12 +155,14 @@ public class UnitTypeController extends GenericForwardComposer {
public void goToEditFormInCreationMode() {
unitTypeModel.initCreate();
editWindow.setTitle(_("Create Unit Type"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
}
private void goToEditFormInEditionMode(UnitType unitType) {
unitTypeModel.initEdit(unitType);
editWindow.setTitle(_("Edit Unit Type"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
}

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java
View file

@ -134,7 +134,7 @@ public class LimitingResourcesTabCreator {
}
};
return new CreatedOnDemandTab(_("Limiting resources"),
return new CreatedOnDemandTab(_("Limiting Resources Planning"),
"limiting-resources",
componentCreator) {
@Override
@ -147,7 +147,8 @@ public class LimitingResourcesTabCreator {
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Limiting resources")));
breadcrumbs.appendChild(new Label(
_("Limiting Resources Planning")));
}
};
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
View file

@ -98,7 +98,7 @@ public class OrdersTabCreator {
}
private ITab createGlobalOrdersTab() {
return new CreatedOnDemandTab(_("Orders List"), "orders", ordersTabCreator) {
return new CreatedOnDemandTab(_("Projects"), "orders", ordersTabCreator) {
@Override
protected void afterShowAction() {
orderCRUDController.goToList();
@ -106,9 +106,9 @@ public class OrdersTabCreator {
breadcrumbs.getChildren().clear();
}
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Company Scheduling")));
breadcrumbs.appendChild(new Label(_("Scheduling")));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Order List")));
breadcrumbs.appendChild(new Label(_("Projects")));
}
};
}
@ -125,7 +125,7 @@ public class OrdersTabCreator {
}
private ITab createOrderOrdersTab() {
return new CreatedOnDemandTab(_("Order Details"), "order-data",
return new CreatedOnDemandTab(_("Project Details"), "order-data",
ordersTabCreator) {
@Override
protected void afterShowAction() {

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
View file

@ -150,7 +150,8 @@ public class PlanningTabCreator {
}
};
return new CreatedOnDemandTab(_("Company Scheduling"), "company-scheduling",
return new CreatedOnDemandTab(_("Projects Planning"),
"company-scheduling",
componentCreator) {
@Override
protected void afterShowAction() {
@ -159,7 +160,7 @@ public class PlanningTabCreator {
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Company Scheduling")));
breadcrumbs.appendChild(new Label(_("Projects Planning")));
}
};
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
View file

@ -137,7 +137,7 @@ public class ResourcesLoadTabCreator {
}
};
return new CreatedOnDemandTab(_("Overall Resources Load"), "company-load",
return new CreatedOnDemandTab(_("Resource Usage"), "company-load",
componentCreator) {
@Override
protected void afterShowAction() {
@ -151,7 +151,7 @@ public class ResourcesLoadTabCreator {
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Overall Resources Load")));
breadcrumbs.appendChild(new Label(_("Resource Usage")));
}
};
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
View file

@ -145,7 +145,7 @@ public class QualityFormCRUDController extends GenericForwardComposer {
*/
public void goToCreateForm() {
qualityFormModel.initCreate();
editWindow.setTitle(_("Create quality form"));
editWindow.setTitle(_("Create Quality Form"));
showEditWindow();
Util.reloadBindings(editWindow);
}
@ -160,7 +160,7 @@ public class QualityFormCRUDController extends GenericForwardComposer {
*/
public void goToEditForm(QualityForm qualityForm) {
qualityFormModel.initEdit(qualityForm);
editWindow.setTitle(_("Edit quality form"));
editWindow.setTitle(_("Edit Quality Form"));
showEditWindow();
Util.reloadBindings(editWindow);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
View file

@ -191,7 +191,7 @@ public class MachineCRUDController extends GenericForwardComposer {
configurationController.initConfigurationController(machineModel);
resourcesCostCategoryAssignmentController.setResource(machineModel.getMachine());
selectMachineDataTab();
showEditWindow(_("Create machine"));
showEditWindow(_("Create Machine"));
resourceCalendarModel.cancel();
}
@ -216,7 +216,7 @@ public class MachineCRUDController extends GenericForwardComposer {
prepareCriterionsForEdit();
prepareCalendarForEdit();
selectMachineDataTab();
showEditWindow(_("Edit machine"));
showEditWindow(_("Edit Machine"));
configurationController.initConfigurationController(machineModel);
resourcesCostCategoryAssignmentController.setResource(machineModel.getMachine());
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
View file

@ -249,7 +249,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
editCalendar();
}
editAsignedCriterions();
editWindow.setTitle(_("Edit virtual worker groups"));
editWindow.setTitle(_("Edit Virtual Workers Group"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
}
@ -500,7 +500,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
createAsignedCriterions();
resourcesCostCategoryAssignmentController.setResource(workerModel
.getWorker());
editWindow.setTitle(_("Create virtual resource"));
editWindow.setTitle(_("Create Virtual Workers Group"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
resourceCalendarModel.cancel();

2
navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java
View file

@ -91,6 +91,7 @@ public class ProfileCRUDController extends GenericForwardComposer implements
@Override
public void goToCreateForm() {
profileModel.initCreate();
createWindow.setTitle(_("Create Profile"));
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
}
@ -98,6 +99,7 @@ public class ProfileCRUDController extends GenericForwardComposer implements
@Override
public void goToEditForm(Profile profile) {
profileModel.initEdit(profile);
createWindow.setTitle(_("Edit Profile"));
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java
View file

@ -113,6 +113,7 @@ public class UserCRUDController extends GenericForwardComposer implements
//password is compulsory when creating
passwordBox.setConstraint("no empty:" +
_("The password for a new user cannot be empty"));
createWindow.setTitle(_("Create User"));
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
//clean the password boxes, they are not cleared automatically
@ -127,6 +128,7 @@ public class UserCRUDController extends GenericForwardComposer implements
//password is not compulsory when editing, so we remove
//the constraint
passwordBox.setConstraint((Constraint)null);
createWindow.setTitle(_("Edit User"));
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
//cleans the box and forces the check of the new Constraint (null)

2
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
View file

@ -581,6 +581,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
cameBackList = false;
workReportModel.initCreate(workReportType);
prepareWorkReportList();
createWindow.setTitle(_("Create Work Report"));
getVisibility().showOnly(createWindow);
loadComponents(createWindow);
Util.reloadBindings(createWindow);
@ -593,6 +594,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
public void goToEditForm(WorkReport workReport) {
workReportModel.initEdit(workReport);
createWindow.setTitle(_("Edit Work Report"));
loadComponents(createWindow);
prepareWorkReportList();
getVisibility().showOnly(createWindow);

2
navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Advance type list')}">
<window id="${arg.top_id}" title="${i18n:_('Advance Types List')}">
<newdatasortablegrid id="listing" model="@{controller.advanceTypes}" mold="paging"
pageSize="10" fixedLayout="true"
rowRenderer="@{controller.advanceTypeRenderer}" >

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

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: AdvanceTypes')}"?>
<?page title="${i18n:_('NavalPlan: Advances')}"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page id="List"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -33,10 +33,10 @@
apply="org.navalplanner.web.advance.AdvanceTypeCRUDController">
<vbox id="messagesContainer"></vbox>
<list top_id="listWindow" />
<edition top_id="createWindow" title="${i18n:_('Create new advance type')}"
<edition top_id="createWindow" title="${i18n:_('Create Advance Type')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}"
save_and_continue_button_label="${i18n:_('Save &amp; Continue')}" />
<edition top_id="editWindow" title="${i18n:_('Edit advance type data')}"
<edition top_id="editWindow" title="${i18n:_('Edit Advance Type')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}"
save_and_continue_button_label="${i18n:_('Save &amp; Continue')}" />
</window>

2
navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
View file

@ -20,7 +20,7 @@
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
<window id="${arg.top_id}" title="${i18n:_('Edit cost category')}">
<window id="${arg.top_id}">
<tabbox>
<tabs>
<tab label="${i18n:_('Category data')}"></tab>

2
navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
View file

@ -20,7 +20,7 @@
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
<window id="${arg.top_id}" title="${i18n:_('Edit type of work hour')}">
<window id="${arg.top_id}">
<tabbox>
<tabs>
<tab label="${i18n:_('Type data')}"></tab>

2
navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Cost categories listing')}">
<window id="${arg.top_id}" title="${i18n:_('Cost Categories List')}">
<newdatasortablegrid id="listing" model="@{controller.costCategories}" mold="paging"
pageSize="10">
<columns sizable="true">

2
navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Type of work hours listing')}">
<window id="${arg.top_id}" title="${i18n:_('Work Hours Types List')}">
<newdatasortablegrid id="listing" model="@{controller.typesOfWorkHours}" mold="paging"
pageSize="10" fixedLayout="true">
<columns sizable="true">

2
navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul
View file

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page title="${i18n:_('NavalPlan: Cost categories')}" id="work_report_admin"?>
<?page title="${i18n:_('NavalPlan: Cost Categories')}" id="work_report_admin"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>

2
navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul
View file

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page title="${i18n:_('NavalPlan: Type of work hours')}" id="work_report_admin"?>
<?page title="${i18n:_('NavalPlan: Work Hours')}" id="work_report_admin"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>

2
navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul
View file

@ -20,7 +20,7 @@
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
<window id="${arg.top_id}" title="${i18n:_('Edit external company')}">
<window id="${arg.top_id}">
<tabbox>
<tabs>

2
navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('External companies listing')}">
<window id="${arg.top_id}" title="${i18n:_('Companies List')}">
<newdatasortablegrid id="listing" model="@{controller.companies}" mold="paging"
pageSize="10">
<columns sizable="true">

2
navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul
View file

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page title="${i18n:_('NavalPlan: External companies')}" id="work_report_admin"?>
<?page title="${i18n:_('NavalPlan: Companies')}" id="work_report_admin"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>

2
navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.id}" title="${arg.title}" visible="false">
<window id="${arg.id}" visible="false">
<!-- Messages for user -->
<vbox id="messagesContainer"/>

2
navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.id}" title="${i18n:_('List label types')}">
<window id="${arg.id}" title="${i18n:_('Label Types List')}">
<newdatasortablegrid id="labelTypes" model="@{controller.labelTypes}"
mold="paging" pageSize="10" fixedLayout="true">
<columns>

2
navalplanner-webapp/src/main/webapp/labels/labelTypes.zul
View file

@ -17,7 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Label types')}" id="labelTypesList"?>
<?page title="${i18n:_('NavalPlan: Labels')}" id="labelTypesList"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>

2
navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul
View file

@ -17,7 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
-->
<window id="${arg.top_id}" title="${arg.title}">
<window id="${arg.top_id}">
<tabbox>
<tabs>
<tab label="${i18n:_('Edit')}"></tab>

2
navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Unit type list')}">
<window id="${arg.top_id}" title="${i18n:_('Unit Types List')}">
<newdatasortablegrid id="listing" model="@{controller.unitTypes}" mold="paging"
pageSize="10" fixedLayout="true"
rowRenderer="@{controller.unitTypeRenderer}" >

159
navalplanner-webapp/src/main/webapp/materials/materials.zul
View file

@ -29,94 +29,87 @@
<zk>
<window self="@{define(content)}"
apply="org.navalplanner.web.materials.MaterialsController">
apply="org.navalplanner.web.materials.MaterialsController"
title="${i18n:_('Materials')}">
<vbox id="messagesContainer" />
<tabbox>
<tabs>
<tab label="${i18n:_('Materials')}"></tab>
</tabs>
<tabpanels>
<tabpanel>
<!-- Categories -->
<hbox>
<panel title="${i18n:_('Categories')}"
border="normal">
<panelchildren>
<hbox>
<textbox id="txtCategory" onOK="materialsController.addMaterialCategory()"
style="padding-bottom: 4px" />
<button label="${i18n:_('Add')}"
onClick="materialsController.addMaterialCategory()" />
<separator spacing="20px" orient="vertical" />
<button label="${i18n:_('Unselect')}" onClick="materialsController.clearSelectionCategoriesTree()" />
</hbox>
<separator spacing="5px" orient="horizontal" />
<!-- Categories -->
<hbox>
<panel title="${i18n:_('Categories')}"
border="normal">
<panelchildren>
<hbox>
<textbox id="txtCategory" onOK="materialsController.addMaterialCategory()"
style="padding-bottom: 4px" />
<button label="${i18n:_('Add')}"
onClick="materialsController.addMaterialCategory()" />
<separator spacing="20px" orient="vertical" />
<button label="${i18n:_('Unselect')}" onClick="materialsController.clearSelectionCategoriesTree()" />
</hbox>
<tree id="categoriesTree" zclass="z-dottree"
rows="5" vflex="true" multiple="false"
model="@{materialsController.materialCategories}"
treeitemRenderer="@{materialsController.materialCategoryRenderer}"
onSelect="materialsController.refreshMaterials()">
<treecols>
<treecol label="${i18n:_('Name')}" />
<treecol label="${i18n:_('Code')}" />
<treecol label="${i18n:_('Generate code')}" width="100px" />
<treecol label="${i18n:_('Operations')}" width="80px" />
</treecols>
</tree>
</panelchildren>
</panel>
</hbox>
<separator spacing="5px" orient="horizontal" />
<!-- Materials -->
<hbox>
<panel title="${i18n:_('List of materials for all categories (select one to filter)')}"
id="materialsPanel" border="normal">
<panelchildren>
<button id="btnAddMaterial"
label="${i18n:_('Add')}"
onClick="materialsController.addMaterialToMaterialCategory(categoriesTree.selectedItem)" />
<separator spacing="15px" orient="horizontal" />
<newdatasortablegrid id="gridMaterials"
fixedLayout="true" mold="paging" pageSize="5"
model="@{materialsController.materials}">
<columns>
<newdatasortablecolumn label="${i18n:_('Code')}" />
<newdatasortablecolumn label="${i18n:_('Description')}" />
<newdatasortablecolumn label="${i18n:_('Unit price')}" />
<newdatasortablecolumn label="${i18n:_('Unit type')}" />
<newdatasortablecolumn label="${i18n:_('Category')}" />
<newdatasortablecolumn label="${i18n:_('Disabled')}" width="80px" />
<newdatasortablecolumn label="${i18n:_('Operations')}" width="80px" />
</columns>
<rows>
<row self="@{each='material'}" value="@{material}" >
<textbox id="code" value="@{material.code}" width="95%"
constraint="no empty:${i18n:_('cannot be null or empty')}" />
<textbox value="@{material.description}" width="95%" />
<doublebox value="@{material.defaultUnitPrice}" />
<listbox mold="select" model="@{materialsController.unitTypes}"
onSelect = "materialsController.selectUnitType(self)"
itemRenderer="@{materialsController.renderer}"/>
<label value="@{material.category.name}" />
<checkbox checked="@{material.disabled}" />
<button sclass="icono"
image="/common/img/ico_borrar1.png"
hoverImage="/common/img/ico_borrar.png"
tooltiptext="${i18n:_('Delete')}"
onClick="materialsController.remove(self.parent.value)">
</button>
</row>
</rows>
</newdatasortablegrid>
<tree id="categoriesTree" zclass="z-dottree"
rows="5" vflex="true" multiple="false"
model="@{materialsController.materialCategories}"
treeitemRenderer="@{materialsController.materialCategoryRenderer}"
onSelect="materialsController.refreshMaterials()">
<treecols>
<treecol label="${i18n:_('Name')}" />
<treecol label="${i18n:_('Code')}" />
<treecol label="${i18n:_('Generate code')}" width="100px" />
<treecol label="${i18n:_('Operations')}" width="80px" />
</treecols>
</tree>
</panelchildren>
</panel>
</hbox>
</panelchildren>
</panel>
</hbox>
</tabpanel>
</tabpanels>
</tabbox>
<!-- Materials -->
<hbox>
<panel title="${i18n:_('List of materials for all categories (select one to filter)')}"
id="materialsPanel" border="normal">
<panelchildren>
<button id="btnAddMaterial"
label="${i18n:_('Add')}"
onClick="materialsController.addMaterialToMaterialCategory(categoriesTree.selectedItem)" />
<separator spacing="15px" orient="horizontal" />
<newdatasortablegrid id="gridMaterials"
fixedLayout="true" mold="paging" pageSize="5"
model="@{materialsController.materials}">
<columns>
<newdatasortablecolumn label="${i18n:_('Code')}" />
<newdatasortablecolumn label="${i18n:_('Description')}" />
<newdatasortablecolumn label="${i18n:_('Unit price')}" />
<newdatasortablecolumn label="${i18n:_('Unit type')}" />
<newdatasortablecolumn label="${i18n:_('Category')}" />
<newdatasortablecolumn label="${i18n:_('Disabled')}" width="80px" />
<newdatasortablecolumn label="${i18n:_('Operations')}" width="80px" />
</columns>
<rows>
<row self="@{each='material'}" value="@{material}" >
<textbox id="code" value="@{material.code}" width="95%"
constraint="no empty:${i18n:_('cannot be null or empty')}" />
<textbox value="@{material.description}" width="95%" />
<doublebox value="@{material.defaultUnitPrice}" />
<listbox mold="select" model="@{materialsController.unitTypes}"
onSelect = "materialsController.selectUnitType(self)"
itemRenderer="@{materialsController.renderer}"/>
<label value="@{material.category.name}" />
<checkbox checked="@{material.disabled}" />
<button sclass="icono"
image="/common/img/ico_borrar1.png"
hoverImage="/common/img/ico_borrar.png"
tooltiptext="${i18n:_('Delete')}"
onClick="materialsController.remove(self.parent.value)">
</button>
</row>
</rows>
</newdatasortablegrid>
</panelchildren>
</panel>
</hbox>
<!-- Save button -->
<button onClick="materialsController.saveAndContinue()"

3
navalplanner-webapp/src/main/webapp/materials/unitTypes.zul
View file

@ -17,7 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Unit types')}" id="unitTypes"?>
<?page title="${i18n:_('NavalPlan: Units')}" id="unitTypes"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -35,7 +35,6 @@
<vbox id="messagesContainer"/>
<list top_id="listWindow"/>
<edition top_id="editWindow"
title="${i18n:_('Edit unit type data')}"
save_button_label="${i18n:_('Save')}"
save_and_continue_button_label="${i18n:_('Save &amp; Continue')}"
cancel_button_label="${i18n:_('Cancel')}"

2
navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.id}" title="${arg.title}" visible="false">
<window id="${arg.id}" visible="false">
<!-- Messages for user -->
<vbox id="messagesContainer"/>

2
navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.id}" title="${i18n:_('List quality forms')}">
<window id="${arg.id}" title="${i18n:_('Quality Forms List')}">
<separator bar="false" spacing="20px" orient="vertical"/>
<div align="right">
<hbox align="end">

2
navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page id="qualityFormsList" title="${i18n:_('NavalPlan: QualityForms')}"?>
<?page id="qualityFormsList" title="${i18n:_('NavalPlan: Quality Forms')}"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>

4
navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page id="reports"?>
<?page id="reports" title="${i18n:_('NavalPlan: Estimated/Planned Hours Per Task')}" ?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -38,7 +38,7 @@
<window self="@{define(content)}"
apply="org.navalplanner.web.reports.CompletedEstimatedHoursPerTaskController"
title="${i18n:_('Completed estimated hours per task')}"
title="${i18n:_('Estimated/Planned Hours Per Task')}"
border="normal" >
<!-- Select deadline date -->

4
navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Hours worked report')}" id="reports"?>
<?page title="${i18n:_('NavalPlan: Hours Worked Per Resource')}" id="reports"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -46,7 +46,7 @@
<window self="@{define(content)}"
apply="org.navalplanner.web.reports.HoursWorkedPerWorkerController"
title="${i18n:_('Hours worked per worker')}"
title="${i18n:_('Hours Worked Per Resource')}"
border="normal" >
<!-- Select dates -->

4
navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page id="reports"?>
<?page id="reports" title="${i18n:_('NavalPlan: Project Costs Per Resource')}" ?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -38,7 +38,7 @@
<window self="@{define(content)}"
apply="org.navalplanner.web.reports.OrderCostsPerResourceController"
title="${i18n:_('Order costs per resource')}">
title="${i18n:_('Project Costs Per Resource')}">
<tabbox>
<tabs>

4
navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Scheduling progress report')}" id="reports"?>
<?page title="${i18n:_('NavalPlan: Work And Progress Per Project')}" id="reports"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -38,7 +38,7 @@
<window self="@{define(content)}"
apply="org.navalplanner.web.reports.SchedulingProgressPerOrderController"
title="${i18n:_('Scheduling progress per order')}"
title="${i18n:_('Work And Progress Per Project')}"
border="normal" >
<!-- Select dates -->

4
navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Timeline material report')}" id="reports"?>
<?page title="${i18n:_('NavalPlan: Materials Needs At Date')}" id="reports"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -38,7 +38,7 @@
<window self="@{define(content)}"
apply="org.navalplanner.web.reports.TimeLineRequiredMaterialController"
title="${i18n:_('Materials needs at date')}"
title="${i18n:_('Materials Needs At Date')}"
border="normal" >
<hbox>

4
navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Task scheduling status report')}" id="reports"?>
<?page title="${i18n:_('NavalPlan: Task Scheduling Status In Project')}" id="reports"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -38,7 +38,7 @@
<window self="@{define(content)}"
apply="org.navalplanner.web.reports.WorkingArrangementsPerOrderController"
title="${i18n:_('Task scheduling status for an order')}"
title="${i18n:_('Task Scheduling Status In Project')}"
border="normal" >
<!-- Select orders -->

4
navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Working progress report')}" id="reports"?>
<?page title="${i18n:_('NavalPlan: Work And Progress Per Task')}" id="reports"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -38,7 +38,7 @@
<window self="@{define(content)}"
apply="org.navalplanner.web.reports.WorkingProgressPerTaskController"
title="${i18n:_('Working progress per task')}"
title="${i18n:_('Work And Progress Per Task')}"
border="normal" >
<!-- Select deadline date -->

2
navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="listing" title="${i18n:_('Criterion type list')}">
<window id="listing" title="${i18n:_('Criterion Type List')}">
<newdatasortablegrid model="@{controller.criterionTypes}" fixedLayout="true">
<columns>
<newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(name)"/>

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

@ -32,9 +32,9 @@
apply="org.navalplanner.web.resources.criterion.CriterionAdminController_V2">
<vbox id="messagesContainer"></vbox>
<list top_id="listWindow" />
<edition top_id="createComponent" title="${i18n:_('Create')}"
<edition top_id="createComponent" title="${i18n:_('Create Criterion Type')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
<edition top_id="editComponent" title="${i18n:_('Edit')}"
<edition top_id="editComponent" title="${i18n:_('Edit Criterion Type')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
<window visible="@{controller.confirmingRemove}"
id="confirmRemove" title="${i18n:_('Confirm')}" sizable="true"

2
navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?component name="filter" inline="true" macroURI="../search/_resourceFilter.zul"?>
<window id="listWindow" title="${i18n:_('Machines list')}">
<window id="listWindow" title="${i18n:_('Machines List')}">
<separator bar="false" spacing="5px" orient="horizontal"/>
<div align="right">

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

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?component name="filter" inline="true" macroURI="../search/_resourceFilter.zul"?>
<window id="${arg.top_id}" title="${i18n:_('Workers list')}">
<window id="${arg.top_id}" title="${i18n:_('Workers List')}">
<separator bar="false" spacing="5px" orient="horizontal"/>
<div align="right">

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

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?component name="filter" inline="true" macroURI="../search/_resourceFilter.zul"?>
<window id="${arg.top_id}" title="${i18n:_('Virtual workers list')}">
<window id="${arg.top_id}" title="${i18n:_('Virtual Workers Groups List')}">
<separator bar="false" spacing="5px" orient="horizontal"/>
<div align="right">

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

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Virtual workers')}"?>
<?page title="${i18n:_('NavalPlan: Virtual Workers Groups')}"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page id="Create"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -35,7 +35,7 @@
<list top_id="listWindow" />
<edition top_id="editWindow" title="${i18n:_('Edit virtual resource')}"
<edition top_id="editWindow"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
</window>

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

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Resources')}"?>
<?page title="${i18n:_('NavalPlan: Workers')}"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page id="Create"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -36,7 +36,7 @@
<list top_id="listWindow" />
<edition top_id="editWindow" title="${i18n:_('Edit worker')}"
<edition top_id="editWindow" title="${i18n:_('Edit Worker')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
</window>

2
navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul
View file

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page id="work_report_admin"?>
<?page id="work_report_admin" title="${i18n:_('NavalPlan: Scenarios Management')}" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>

4
navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul
View file

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page id="work_report_admin"?>
<?page id="work_report_admin" title="${i18n:_('NavalPlan: Transfer Projects Between Scenarios')}" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@ -28,7 +28,7 @@
<zk>
<window self="@{define(content)}" id="transferOrdersWindow"
title="${i18n:_('Transfer orders between scenarios')}"
title="${i18n:_('Transfer Projects Between Scenarios')}"
apply="org.navalplanner.web.scenarios.TransferOrdersController">
<vbox id="messagesContainer"></vbox>

4
navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Subcontracted tasks')}"?>
<?page title="${i18n:_('NavalPlan: Advance Report')}"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@ -30,7 +30,7 @@
<div self="@{define(content)}">
<window apply="${reportAdvancesController}"
title="${i18n:_('Report advances')}">
title="${i18n:_('Advance Report')}">
<vbox id="messagesContainer" />

4
navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Subcontracted tasks')}"?>
<?page title="${i18n:_('NavalPlan: Subcontracted Tasks')}"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@ -30,7 +30,7 @@
<div self="@{define(content)}">
<window apply="${subcontractedTasksController}"
title="${i18n:_('Subcontracted tasks list')}">
title="${i18n:_('Subcontracted Tasks List')}">
<vbox id="messagesContainer" />

2
navalplanner-webapp/src/main/webapp/templates/_list.zul
View file

@ -17,7 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Templates list')}">
<window id="${arg.top_id}" title="${i18n:_('Templates List')}">
<grid id="listing" model="@{templatesForOrdersController.templates}" mold="paging"
pageSize="10" fixedLayout="true">
<columns>

4
navalplanner-webapp/src/main/webapp/templates/templates.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('NavalPlan: Templates')}"?>
<?page title="${i18n:_('NavalPlan: Scheduling')}"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@ -50,7 +50,7 @@
<div self="@{define(content)}" apply="${templatesForOrdersController}">
<vbox id="messagesContainer" />
<list top_id="listWindow" />
<window id="editWindow" title="${i18n:_('Edit template')}">
<window id="editWindow" title="${i18n:_('Edit Template')}">
<editTemplateWindow />
<tabbox>
<tabs>

2
navalplanner-webapp/src/main/webapp/users/_editProfile.zul
View file

@ -20,7 +20,7 @@
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
<window id="${arg.top_id}" title="${i18n:_('Edit profile')}">
<window id="${arg.top_id}">
<tabbox>
<tabs>
<tab label="${i18n:_('Profile data')}"></tab>

2
navalplanner-webapp/src/main/webapp/users/_editUser.zul
View file

@ -20,7 +20,7 @@
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
<window id="${arg.top_id}" title="${i18n:_('Edit User')}">
<window id="${arg.top_id}">
<tabbox>
<tabs>
<tab label="${i18n:_('User data')}"></tab>

2
navalplanner-webapp/src/main/webapp/users/_listProfiles.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Profiles listing')}">
<window id="${arg.top_id}" title="${i18n:_('Profiles List')}">
<newdatasortablegrid id="listing" model="@{controller.profiles}" mold="paging"
pageSize="10">
<columns sizable="true">

2
navalplanner-webapp/src/main/webapp/users/_listUsers.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Users listing')}">
<window id="${arg.top_id}" title="${i18n:_('Users List')}">
<newdatasortablegrid id="listing" model="@{controller.users}" mold="paging"
pageSize="10">
<columns sizable="true">

2
navalplanner-webapp/src/main/webapp/users/users.zul
View file

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page title="${i18n:_('NavalPlan: User accounts')}" id="work_report_admin"?>
<?page title="${i18n:_('NavalPlan: Accounts')}" id="work_report_admin"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>

2
navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Work Report types')}">
<window id="${arg.top_id}" title="${i18n:_('Work Report Types')}">
<grid id="listing" mold="paging" pageSize="10"
model="@{controller.workReportTypes}"
onInitRender ="controller.sortWorkReportTypes();">

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

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page title="${i18n:_('NavalPlan: Work report')}" id="work_report_admin"?>
<?page title="${i18n:_('NavalPlan: Work Reports')}" id="work_report_admin"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@ -32,7 +32,7 @@
apply="org.navalplanner.web.workreports.WorkReportCRUDController">
<vbox id="messagesContainer"></vbox>
<window id="listWindow" title="${i18n:_('Work report listing')}">
<window id="listWindow" title="${i18n:_('Work Reports List')}">
<div align="right">
<hbox id="hboxFilter" align="center">
<!-- Filter by type, start date and finish date -->
@ -104,7 +104,7 @@
</div>
</window>
<window id="createWindow" title="${i18n:_('Edit work report')}">
<window id="createWindow">
<tabbox>
<tabs>
<tab label="${i18n:_('Report data')}"></tab>

4
navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
View file

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page title="${i18n:_('NavalPlan: Work report admin query')}" id="work_report_admin_query"?>
<?page title="${i18n:_('NavalPlan: Work Reports')}" id="work_report_admin_query"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@ -30,7 +30,7 @@
apply="org.navalplanner.web.workreports.WorkReportCRUDController">
<vbox id="messagesContainer"></vbox>
<window id="listQueryWindow" title="${i18n:_('Work report lines listing')}">
<window id="listQueryWindow" title="${i18n:_('Work Report Lines List')}">
<panel title="${i18n:_('Filter work report by :')}" border="normal"
style="overflow:auto">
<panelchildren>

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

@ -19,7 +19,7 @@
-->
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page title="${i18n:_('NavalPlan: Work report types')}" id="List"?>
<?page title="${i18n:_('NavalPlan: Work Reports')}" id="List"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
<?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@ -32,11 +32,11 @@
apply="org.navalplanner.web.workreports.WorkReportTypeCRUDController">
<vbox id="messagesContainer"></vbox>
<list top_id="listWindow" />
<edition top_id="createWindow" title="${i18n:_('Create new Work Report Type')}"
<edition top_id="createWindow" title="${i18n:_('Create Work Report Type')}"
save_button_label="${i18n:_('Save')}"
saveAndContinue_button_label="${i18n:_('Save &amp; Continue')}"
cancel_button_label="${i18n:_('Cancel')}" />
<edition top_id="editWindow" title="${i18n:_('Edit')}"
<edition top_id="editWindow" title="${i18n:_('Edit Work Report Type')}"
save_button_label="${i18n:_('Save')}"
saveAndContinue_button_label="${i18n:_('Save &amp; Continue')}"
cancel_button_label="${i18n:_('Cancel')}" />