diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul index d7fde1e90..2a232f828 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul @@ -4,6 +4,15 @@ planner = self; ]]> + + + + Registered items insertion point + + + +
+ @@ -69,4 +78,6 @@ planner = self;
+
+
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 93aa2d91c..a9de99d1b 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 @@ -203,7 +203,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { } private Hbox getRegisteredItemsInsertionPoint() { - return (Hbox) getFellow("registeredItemsInsertionPoint"); + return (Hbox) getPage().getFellow("registeredItemsInsertionPoint"); } public List getCustomMenuItems() { diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css index 50ea339d8..d03bebcfb 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css @@ -805,3 +805,8 @@ position:relative; */ .z-menu-body-seld .z-menu-inner-r { background-image:none; } + + +.user_row .cerrar_sesion { + display:inline; +} diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul index 62337662f..b625bc178 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul @@ -51,12 +51,7 @@ - - - - - - +