diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java index 0ff32e768..d31aa2134 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java @@ -209,7 +209,7 @@ public class QueueComponent extends XulElement implements final GenericResourceAllocation generic = (GenericResourceAllocation) resourceAllocation; result.append(_("Criteria: {0} ", Criterion.getNames(generic.getCriterions()))); } - result.append(_("Allocation: [{0}%,{1}%]", element.getStartDate() + result.append(_("Allocation: [{0},{1}]", element.getStartDate() .toString(), element.getEndDate())); return result.toString(); diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css index dafd028e0..1a18ac9a3 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -1357,3 +1357,7 @@ tr.z-tree-row-seld .z-row-cnt { margin-top:5px; } +.tooltip-actions { + margin-bottom: 10px; + margin-left: 10px; +} diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index d09a08f00..3396d08e8 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -81,11 +81,11 @@ - -