diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java
index af0b8ed4b..ddde898dd 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java
@@ -33,7 +33,9 @@ import org.zkoss.zul.Treeitem;
/**
* macro component for order elements tree and similar pages
+ *
* @author Óscar González Fernández
+ * @author Lorenzo Tilve Álvaro
*/
public abstract class TreeComponent extends HtmlMacroComponent {
@@ -71,6 +73,10 @@ public abstract class TreeComponent extends HtmlMacroComponent {
return tooltip;
}
+ public String getHflex() {
+ return cssClass.equals("name") ? "1" : "min";
+ }
+
public abstract > void doCell(
TreeController.Renderer renderer,
Treeitem item, T currentElement);
@@ -95,8 +101,8 @@ public abstract class TreeComponent extends HtmlMacroComponent {
renderer.addDescriptionCell(currentElement);
}
};
- protected final Column operationsColumn = new Column(_("Operations"),
- "operations") {
+ protected final Column operationsColumn = new Column(_("Op."),
+ "operations", _("Operations")) {
@Override
public > void doCell(
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 ef7ef6fe6..e82d33338 100644
--- a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
+++ b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
@@ -565,8 +565,8 @@ div.z-grid {
.orderTree .z-textbox,.orderTree .z-decimalbox,
.orderTree .z-intbox,.orderTree .z-longbox,
-.orderTree .z-doublebox {
- height: 23px;
+.orderTree .z-doublebox, .orderTree .z-datebox {
+ height: 21px;
width: 100%;
}
@@ -583,19 +583,20 @@ div.z-grid {
height:25px;
}
.orderTree .operations {
- width:80px;
+ width: 50px;
}
.orderTree .name {
- min-width:120px;
+ min-width: 120px;
}
.orderTree .hours {
- width:40px;
+ width: 50px;
}
.orderTree .code {
- min-width:100px;
+ min-width: 100px;
}
+
.orderTree .scheduling_state {
- min-width:160px;
+ min-width:140px;
}
.orderTree .estimated_init,
.orderTree .estimated_end {
@@ -614,6 +615,10 @@ div.z-grid {
border-bottom: 1px dotted #7EAAC6;
}
+.orderTree td td {
+ border-bottom: 0;
+}
+
.orderTree .icono td {
border:none;
}
@@ -823,6 +828,12 @@ div.z-listbox-pgi-b {
float:left;
}
+.orderTree .not-scheduled span.z-button,
+.orderTree .partially-scheduled span.z-button,
+.orderTree .completely-scheduled span.z-button {
+ margin: 4px 1px 0 0;
+}
+
.orderTree .not-scheduled span.scheduling-state,
.orderTree .partially-scheduled span.scheduling-state,
.orderTree .completely-scheduled span.scheduling-state {
@@ -859,7 +870,7 @@ span.completely-scheduled {
span.z-dottree-tee-open,
span.z-dottree-tee-close,
span.z-dottree-line {
- min-height: 28px;
+ min-height: 25px;
}
@@ -1119,10 +1130,15 @@ span.perspective, span.perspective-active {
tr.z-tree-row-seld, tr.z-list-item-seld,
.z-combobox-pp .z-combo-item-seld,
tr.z-treerow-seld {
- background-color: #fdd772;
+ background-color: #fdd772; /* Dark orange */
color: #000000;
}
+tr.z-treerow-seld input {
+ background-color: #fdf3da; /* Soft orange */
+ background-image: none;
+}
+
.timeplot-canvas {
position:relative;
overflow:hidden;
diff --git a/libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul b/libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul
index eb7415888..e9b373831 100644
--- a/libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul
+++ b/libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul
@@ -87,7 +87,7 @@
zclass="z-dottree">
+ forEach="${treeComponent.columns}" hflex="${each.hflex}" />