diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java index bbd5b3225..acd78ee4d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java @@ -305,11 +305,12 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { "/orders/imports/projectImport.zul", "")); } - if (SecurityUtils.isSuperuserOrUserInRoles(UserRole.ROLE_CRITERIA)) { - planningItems.add(subItem(_("RiskLog"), - "/logs/issue_log.zul", - "02-criterios.html#id1")); - } + planningItems.add(subItem(_("Logs"), new ICapture() { + @Override + public void capture() { + globalView.goToLogs(); + } + }, "01-asd")); if (!planningItems.isEmpty()) { topItem(_("Planning"), "/planner/index.zul", "", planningItems); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java index 154a154e2..7b02534cd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java @@ -47,6 +47,9 @@ public interface IGlobalViewEntryPoints { @EntryPoint("limiting_resources") public void goToLimitingResources(); + @EntryPoint("asd") + public void goToLogs(); + @EntryPoint("orders_list") public void goToOrdersList(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java index de295afd9..0cc284f31 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java @@ -516,6 +516,11 @@ public class getTabsRegistry().show(resourceLoadTab); } + @Override + public void goToLogs() { + getTabsRegistry().show(logsTab); + } + @Override public void goToCompanyLimitingResources() { getTabsRegistry().show(limitingResourcesTab); diff --git a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css index 9fc6d33c7..bc3a42410 100644 --- a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css +++ b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css @@ -159,7 +159,7 @@ body .advancedallocationlayout .icono .z-button-cm { } .global-action.z-button .z-button-cm { - padding: 4px 25px; + padding: 4px 25px !important; background-position: 5px; background-repeat: no-repeat; margin-right: 1px; @@ -172,11 +172,11 @@ body .advancedallocationlayout .icono .z-button-cm { } .save-button.z-button .z-button-cm { - background-image: url(../img/bt_ok.png); + background-image: url(../img/bt_ok.png) !important; } .create-button.z-button .z-button-cm { - background-image: url(../img/bt_create.png); + background-image: url(../img/bt_create.png) !important; } .saveandcontinue-button.z-button .z-button-cm { @@ -184,7 +184,7 @@ body .advancedallocationlayout .icono .z-button-cm { } .cancel-button.z-button .z-button-cm { - background-image: url(../img/bt_cancel.png); + background-image: url(../img/bt_cancel.png) !important; } .back-button.z-button .z-button-cm {