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 a9de99d1b..31674191b 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
@@ -37,7 +37,7 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Button;
import org.zkoss.zul.Div;
-import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Vbox;
/**
* Controller for customMenu
@@ -202,8 +202,8 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
topItem(_("Quality management"), "/", true);
}
- private Hbox getRegisteredItemsInsertionPoint() {
- return (Hbox) getPage().getFellow("registeredItemsInsertionPoint");
+ private Vbox getRegisteredItemsInsertionPoint() {
+ return (Vbox) getPage().getFellow("registeredItemsInsertionPoint");
}
public List getCustomMenuItems() {
@@ -224,7 +224,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
@Override
public Object addMenuItem(String name,
org.zkoss.zk.ui.event.EventListener eventListener) {
- Hbox insertionPoint = getRegisteredItemsInsertionPoint();
+ Vbox insertionPoint = getRegisteredItemsInsertionPoint();
Button button = new Button();
button.setLabel(_(name));
setDeselectedClass(button);
@@ -254,11 +254,11 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
}
private void setSelectClass(final Button button) {
- button.setSclass("perspective sub_menu_active");
+ button.setSclass("perspective-active");
}
private void setDeselectedClass(Button button) {
- button.setSclass("perspective sub_menu");
+ button.setSclass("perspective");
}
private EventListener doNotCallTwice(final Button button,
@@ -278,7 +278,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
private Component separator() {
Div div = new Div();
- div.setSclass("vertical_separator");
+ div.setSclass("vertical-separator");
return div;
}
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 504a42b0e..dfdfbed67 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -363,6 +363,8 @@ div.z-errbox {
margin: 10px;
}
+
+
/* Hide inner second level embed window titles */
.z-window-embedded
.z-window-embedded
@@ -814,5 +816,47 @@ span.z-dottree-ico, span.z-dottree-line {
}
.migas_linea {
- border-top: 0px;
-}
\ No newline at end of file
+ border: 0px;
+}
+
+.perspective, .perspective-active {
+ width:84px;
+ height:84px;
+ margin: 0 0 4px 4px;
+ font-weight:normal;
+}
+
+.perspective .z-button-cm {
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ background-image: none;
+ background-color: #d4e1ef;
+ color: #005782;
+}
+
+.perspective-active .z-button-cm {
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ background-image: none;
+ background-color: #2a83b4;
+ color: #FFFFFF;
+}
+
+.z-button.perspective .z-button-cm,
+.z-button.perspective-active .z-button-cm {
+ white-space:normal;
+}
+
+.vertical-separator {
+ display:none;
+}
+
+
+.main-area .z-center-body {
+ height: auto !important;
+ width: auto !important;
+}
+
+.main-area {
+ overflow: auto;
+}
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 86a5e7742..40477f42e 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -57,13 +57,13 @@
-
+
-
+
-
+