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

ItEr31S05RFComportamentoGraficoPlanificadorItEr30S05: Fixed problems with mainmenu in machines tab and breadcrumb literals

Browse source
This commit is contained in:
Lorenzo Tilve 2009-10-19 19:51:47 +02:00 • committed by Javier Moran Rua
parent ddc8029476
commit fff0b7175d
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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"),

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

@ -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));
}
};
}

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

@ -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;

2
navalplanner-webapp/src/main/webapp/orders/_edition.zul
View file

@ -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')}" />