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 528b7c9c9..2f5b27732 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 @@ -197,8 +197,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { subItem(_("Company view"), "/planner/index.zul;company_scheduling","01-introducion.html"), subItem(_("General resource allocation"),"/planner/index.zul;company_load","01-introducion.html#id1"), subItem(_("Orders list"), "/planner/index.zul;orders_list","01-introducion.html#id2"), - // FIX: Temporary hidden in main menu - // subItem(_("Limiting resources"),"/planner/index.zul;limiting_resources","01-introducion.html"), + subItem(_("Limiting resources"),"/planner/index.zul;limiting_resources","01-introducion.html"), subItem(_("Templates list"), "/templates/templates.zul", ""), subItem(_("Subcontracted tasks list"), "/subcontract/subcontractedTasks.zul", ""), subItem(_("Report advances"), "/subcontract/reportAdvances.zul", "")); diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css index 3dc6efeef..8cabe25b8 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -1054,11 +1054,7 @@ span.z-dottree-line { } .perspective.limiting-resources .z-button-cm, .perspective-active.limiting-resources .z-button-cm { - background-image: url(../img/ico_order-load.png); -} -.perspective.limiting-resources { - /* FIX: Temporary disabled */ - display: none; + background-image: url(../img/ico_limiting-resources.png); } .perspective.order-limiting-resources { display: none; diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_limiting-resources.png b/navalplanner-webapp/src/main/webapp/common/img/ico_limiting-resources.png new file mode 100644 index 000000000..2dce4c9e7 Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_limiting-resources.png differ