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

All works fine, except of item in planning tab

Browse source
This commit is contained in:
Misha 2015-12-11 17:38:50 +02:00
parent df55e1bd19
commit 26f31afaf8
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
View file

@ -305,11 +305,12 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
"/orders/imports/projectImport.zul", "")); "/orders/imports/projectImport.zul", ""));
} }
if (SecurityUtils.isSuperuserOrUserInRoles(UserRole.ROLE_CRITERIA)) { planningItems.add(subItem(_("Logs"), new ICapture() {
planningItems.add(subItem(_("RiskLog"), @Override
"/logs/issue_log.zul", public void capture() {
"02-criterios.html#id1")); globalView.goToLogs();
} }
}, "01-asd"));
if (!planningItems.isEmpty()) { if (!planningItems.isEmpty()) {
topItem(_("Planning"), "/planner/index.zul", "", planningItems); topItem(_("Planning"), "/planner/index.zul", "", planningItems);

3
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java
View file

@ -47,6 +47,9 @@ public interface IGlobalViewEntryPoints {
@EntryPoint("limiting_resources") @EntryPoint("limiting_resources")
public void goToLimitingResources(); public void goToLimitingResources();
@EntryPoint("asd")
public void goToLogs();
@EntryPoint("orders_list") @EntryPoint("orders_list")
public void goToOrdersList(); public void goToOrdersList();

5
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
View file

@ -516,6 +516,11 @@ public class
getTabsRegistry().show(resourceLoadTab); getTabsRegistry().show(resourceLoadTab);
} }
@Override
public void goToLogs() {
getTabsRegistry().show(logsTab);
}
@Override @Override
public void goToCompanyLimitingResources() { public void goToCompanyLimitingResources() {
getTabsRegistry().show(limitingResourcesTab); getTabsRegistry().show(limitingResourcesTab);

8
libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
View file

@ -159,7 +159,7 @@ body .advancedallocationlayout .icono .z-button-cm {
} }
.global-action.z-button .z-button-cm { .global-action.z-button .z-button-cm {
padding: 4px 25px; padding: 4px 25px !important;
background-position: 5px; background-position: 5px;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-right: 1px; margin-right: 1px;
@ -172,11 +172,11 @@ body .advancedallocationlayout .icono .z-button-cm {
} }
.save-button.z-button .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 { .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 { .saveandcontinue-button.z-button .z-button-cm {
@ -184,7 +184,7 @@ body .advancedallocationlayout .icono .z-button-cm {
} }
.cancel-button.z-button .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 { .back-button.z-button .z-button-cm {