Fixed horizontal scaling and other layout issues in WBS
FEA: ItEr75S04BugFixing
This commit is contained in:
parent
3545aba175
commit
4aaa264b14
3 changed files with 34 additions and 12 deletions
|
|
@ -33,7 +33,9 @@ import org.zkoss.zul.Treeitem;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* macro component for order elements tree and similar pages<br />
|
* macro component for order elements tree and similar pages<br />
|
||||||
|
*
|
||||||
* @author Óscar González Fernández <ogonzalez@igalia.com>
|
* @author Óscar González Fernández <ogonzalez@igalia.com>
|
||||||
|
* @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
|
||||||
*/
|
*/
|
||||||
public abstract class TreeComponent extends HtmlMacroComponent {
|
public abstract class TreeComponent extends HtmlMacroComponent {
|
||||||
|
|
||||||
|
|
@ -71,6 +73,10 @@ public abstract class TreeComponent extends HtmlMacroComponent {
|
||||||
return tooltip;
|
return tooltip;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getHflex() {
|
||||||
|
return cssClass.equals("name") ? "1" : "min";
|
||||||
|
}
|
||||||
|
|
||||||
public abstract <T extends ITreeNode<T>> void doCell(
|
public abstract <T extends ITreeNode<T>> void doCell(
|
||||||
TreeController<T>.Renderer renderer,
|
TreeController<T>.Renderer renderer,
|
||||||
Treeitem item, T currentElement);
|
Treeitem item, T currentElement);
|
||||||
|
|
@ -95,8 +101,8 @@ public abstract class TreeComponent extends HtmlMacroComponent {
|
||||||
renderer.addDescriptionCell(currentElement);
|
renderer.addDescriptionCell(currentElement);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
protected final Column operationsColumn = new Column(_("Operations"),
|
protected final Column operationsColumn = new Column(_("Op."),
|
||||||
"operations") {
|
"operations", _("Operations")) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T extends ITreeNode<T>> void doCell(
|
public <T extends ITreeNode<T>> void doCell(
|
||||||
|
|
|
||||||
|
|
@ -565,8 +565,8 @@ div.z-grid {
|
||||||
|
|
||||||
.orderTree .z-textbox,.orderTree .z-decimalbox,
|
.orderTree .z-textbox,.orderTree .z-decimalbox,
|
||||||
.orderTree .z-intbox,.orderTree .z-longbox,
|
.orderTree .z-intbox,.orderTree .z-longbox,
|
||||||
.orderTree .z-doublebox {
|
.orderTree .z-doublebox, .orderTree .z-datebox {
|
||||||
height: 23px;
|
height: 21px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -583,19 +583,20 @@ div.z-grid {
|
||||||
height:25px;
|
height:25px;
|
||||||
}
|
}
|
||||||
.orderTree .operations {
|
.orderTree .operations {
|
||||||
width:80px;
|
width: 50px;
|
||||||
}
|
}
|
||||||
.orderTree .name {
|
.orderTree .name {
|
||||||
min-width:120px;
|
min-width: 120px;
|
||||||
}
|
}
|
||||||
.orderTree .hours {
|
.orderTree .hours {
|
||||||
width:40px;
|
width: 50px;
|
||||||
}
|
}
|
||||||
.orderTree .code {
|
.orderTree .code {
|
||||||
min-width:100px;
|
min-width: 100px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.orderTree .scheduling_state {
|
.orderTree .scheduling_state {
|
||||||
min-width:160px;
|
min-width:140px;
|
||||||
}
|
}
|
||||||
.orderTree .estimated_init,
|
.orderTree .estimated_init,
|
||||||
.orderTree .estimated_end {
|
.orderTree .estimated_end {
|
||||||
|
|
@ -614,6 +615,10 @@ div.z-grid {
|
||||||
border-bottom: 1px dotted #7EAAC6;
|
border-bottom: 1px dotted #7EAAC6;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.orderTree td td {
|
||||||
|
border-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.orderTree .icono td {
|
.orderTree .icono td {
|
||||||
border:none;
|
border:none;
|
||||||
}
|
}
|
||||||
|
|
@ -823,6 +828,12 @@ div.z-listbox-pgi-b {
|
||||||
float:left;
|
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 .not-scheduled span.scheduling-state,
|
||||||
.orderTree .partially-scheduled span.scheduling-state,
|
.orderTree .partially-scheduled span.scheduling-state,
|
||||||
.orderTree .completely-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-open,
|
||||||
span.z-dottree-tee-close,
|
span.z-dottree-tee-close,
|
||||||
span.z-dottree-line {
|
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,
|
tr.z-tree-row-seld, tr.z-list-item-seld,
|
||||||
.z-combobox-pp .z-combo-item-seld,
|
.z-combobox-pp .z-combo-item-seld,
|
||||||
tr.z-treerow-seld {
|
tr.z-treerow-seld {
|
||||||
background-color: #fdd772;
|
background-color: #fdd772; /* Dark orange */
|
||||||
color: #000000;
|
color: #000000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tr.z-treerow-seld input {
|
||||||
|
background-color: #fdf3da; /* Soft orange */
|
||||||
|
background-image: none;
|
||||||
|
}
|
||||||
|
|
||||||
.timeplot-canvas {
|
.timeplot-canvas {
|
||||||
position:relative;
|
position:relative;
|
||||||
overflow:hidden;
|
overflow:hidden;
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@
|
||||||
zclass="z-dottree">
|
zclass="z-dottree">
|
||||||
<treecols sizable="true">
|
<treecols sizable="true">
|
||||||
<treecol label="${each.label}" class="${each.cssClass}" tooltiptext="${each.tooltip}"
|
<treecol label="${each.label}" class="${each.cssClass}" tooltiptext="${each.tooltip}"
|
||||||
forEach="${treeComponent.columns}"/>
|
forEach="${treeComponent.columns}" hflex="${each.hflex}" />
|
||||||
</treecols>
|
</treecols>
|
||||||
</tree>
|
</tree>
|
||||||
</vbox>
|
</vbox>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue