diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml
index bc8a9c8e5..ebabd6182 100644
--- a/libreplan-webapp/pom.xml
+++ b/libreplan-webapp/pom.xml
@@ -354,11 +354,6 @@
zk
-
- org.zkoss.common
- zcommon
-
-
org.libreplan
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 35f6acd9b..fe6ea5651 100644
--- a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
+++ b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
@@ -1014,10 +1014,6 @@ span.z-dottree-line {
height: 35px;
}
-.taskdetail-company-view .clickable-rows {
- margin-left: 5px;
-}
-
.z-button.perspective,
.z-button.perspective-active {
padding-top: 60px;
diff --git a/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css b/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css
index 795caa4c9..e0979832e 100644
--- a/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -122,9 +122,13 @@
padding-left: 4px;
}
-.taskdetail-company-view .z-tree-ico {
+.taskdetail-company-view .z-tree-line {
display:none;
+}
+/* Order name will be in single row */
+.taskdetail-company-view .z-label {
+ white-space: nowrap;
}
.order-startdate, .order-enddate {
@@ -157,7 +161,15 @@
.row {
height: 12px;
border-bottom: dotted 1px #CCCCCC;
- margin-bottom: 10px;
+ margin-bottom: 9px;
+ margin-top: 9px;
+ width: 100%;
+}
+
+.parentProjectScheduling .row {
+ height: 12px;
+ border-bottom: dotted 1px #CCCCCC;
+ margin-bottom: 12px;
margin-top: 10px;
width: 100%;
}
@@ -607,7 +619,7 @@ tr.z-vbox-separator {
height: 10px;
border: 1px;
width: 100%;
- margin-bottom: 12px;
+ margin-bottom: 10px;
margin-top: 10px;
border-bottom: 1px dotted #CCCCCC;
}
@@ -778,7 +790,7 @@ tr.z-vbox-separator {
}
.limitingresources-list .row_resourceload {
- height: 24px;
+ height: 25px;
}
.limiting-resources .z-tree-line {
diff --git a/pom.xml b/pom.xml
index fdfc4ffb2..6d229dc2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,12 +166,6 @@
thirdparty
http://nexus.libreplan.org/nexus/content/repositories/thirdparty-libreplan16/
-
-
-
- ZK CE
- http://mavensync.zkoss.org/maven2/
-
@@ -469,19 +463,6 @@
-
- org.zkoss.common
- zcommon
- 8.0.1.1
-
-
- org.slf4j
- slf4j-jdk14
-
-
-
-
-
org.jgrapht
@@ -605,7 +586,7 @@
org.zkoss.zkforge
timeplotz
- 1.1_50
+ 1.1_50_1