From 94e33544fe6e039e2e9a0cfd124cddc2f00f7551 Mon Sep 17 00:00:00 2001
From: mvanmiddelkoop <mvanmiddelkoop@meddex.nl>
Date: Sat, 28 Feb 2015 11:17:47 +0100
Subject: [PATCH 1/5] Error message java.lang.NoClassDefFoundError:
 org/hibernate/util/DTDEntityResolver

This error message came up when deploying Libreplan 1.4.1 from a new
build. It seems to be related to a version mismatch between hibernate
(4.3.4) and annotations (3.5.6-Final). Hibernate 4.3.4 seems not to
need annotations anymore - I have removed this part from the main
pom.xml file, and the errors have disappeared.
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d06cfb8f..f5a666682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,11 +235,6 @@
                 <artifactId>hibernate-core</artifactId>
                 <version>4.3.4.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-annotations</artifactId>
-                <version>3.5.6-Final</version>
-            </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-ehcache</artifactId>

From 16f3a2ac84631ea2ae836c3967fe15feba3a8384 Mon Sep 17 00:00:00 2001
From: mvanmiddelkoop <mvanmiddelkoop@meddex.nl>
Date: Sat, 28 Feb 2015 11:19:51 +0100
Subject: [PATCH 2/5] Revert "Error message java.lang.NoClassDefFoundError:
 org/hibernate/util/DTDEntityResolver"

This reverts commit 94e33544fe6e039e2e9a0cfd124cddc2f00f7551.
---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index f5a666682..5d06cfb8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,6 +235,11 @@
                 <artifactId>hibernate-core</artifactId>
                 <version>4.3.4.Final</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-annotations</artifactId>
+                <version>3.5.6-Final</version>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-ehcache</artifactId>

From 5a4e5b408a0e52ca06d3fe232aafbffb4b1c3b3e Mon Sep 17 00:00:00 2001
From: mvanmiddelkoop <mvanmiddelkoop@meddex.nl>
Date: Sat, 28 Feb 2015 11:21:16 +0100
Subject: [PATCH 3/5] Revert "Revert "Error message
 java.lang.NoClassDefFoundError: org/hibernate/util/DTDEntityResolver""

This reverts commit 16f3a2ac84631ea2ae836c3967fe15feba3a8384.
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d06cfb8f..f5a666682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,11 +235,6 @@
                 <artifactId>hibernate-core</artifactId>
                 <version>4.3.4.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-annotations</artifactId>
-                <version>3.5.6-Final</version>
-            </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-ehcache</artifactId>

From 452e035a197bc2137fcb7d454f627cdeac7aaea1 Mon Sep 17 00:00:00 2001
From: mvanmiddelkoop <mvanmiddelkoop@meddex.nl>
Date: Sat, 28 Feb 2015 11:22:28 +0100
Subject: [PATCH 4/5] Revert "Revert "Revert "Error message
 java.lang.NoClassDefFoundError: org/hibernate/util/DTDEntityResolver"""

This reverts commit 5a4e5b408a0e52ca06d3fe232aafbffb4b1c3b3e.
---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index f5a666682..5d06cfb8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,6 +235,11 @@
                 <artifactId>hibernate-core</artifactId>
                 <version>4.3.4.Final</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-annotations</artifactId>
+                <version>3.5.6-Final</version>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-ehcache</artifactId>

From 0c481a58f3fa6c0590a3f0c3f85d5bf4e5582624 Mon Sep 17 00:00:00 2001
From: mvanmiddelkoop <mvanmiddelkoop@meddex.nl>
Date: Sat, 28 Feb 2015 15:03:58 +0100
Subject: [PATCH 5/5] Project Name column wider

Since T/M column has been added, the Project Name has much less room.
The T/M column and date columns could be less wide (55-60 in stead of
76 pixels), and the total width of the pane has been increased from
300px to 375 pixels.
---
 ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul | 6 +++---
 ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul
index 506a8bc0c..a77490678 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul
@@ -26,9 +26,9 @@
 <tree id="tasksTree" fixedLayout="true" sclass="taskTreeCols">
     <treecols sizable="false" height="33px">
         <treecol label="${ganttzk_i18n:_('Name')}" sclass="tree-text" />
-        <treecol label="${ganttzk_i18n:_('Start')}" width="76px" />
-        <treecol label="${ganttzk_i18n:_('End')}" width="76px" />
-        <treecol label="${ganttzk_i18n:_('Status T/M')}" width="76px" />
+        <treecol label="${ganttzk_i18n:_('Start')}" width="60px" />
+        <treecol label="${ganttzk_i18n:_('End')}" width="60px" />
+        <treecol label="${ganttzk_i18n:_('T / M')}" width="55px" />
     </treecols>
 </tree>
 </div>
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index f3947a669..ae21cb7ae 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -102,7 +102,7 @@ planner = self;
 
         <center border="0">
             <borderlayout sclass="plannerlayout_center" height="100%">
-                <west flex="false" collapsible="true" splittable="true" width="300px"
+                <west flex="false" collapsible="true" splittable="true" width="375px"
                     id="taskdetailsContainer" sclass="taskdetailsContainer">
                             <div sclass="leftpanelgap" id="insertionPointLeftPanel"></div>
                 </west>