RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr48S04ValidacionEProbasFuncionaisItEr47S04: Improved toolbar-box appearance and minor graphical fixes

Browse source
This commit is contained in:
Lorenzo Tilve 2010-02-22 11:54:49 +01:00 • committed by Javier Moran Rua
parent 8e6ca35718
commit 6a5c9f4f12
8 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
View file

@ -5,8 +5,8 @@ planner = self;
</zscript>
<borderlayout sclass="plannerlayout" width="auto">
<north height="30px" border="0">
<hbox align="center" id="toolbar" sclass="toolbar-box">
<north height="30px" border="0" sclass="toolbar-box">
<hbox align="center" id="toolbar">
<separator/>
<!-- Commands -->
<button onClick="planner.invalidate()"

23
navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
View file

@ -218,7 +218,7 @@ button.z-button {
.planner-command.clicked .z-button-cm {
background-color: #A1D586; /* green2 (active background)*/
border-right: 1px solid #439e32;
border-right: 0px;
border-bottom: 1px solid #439e32;
border-top: 2px solid #3f5917;
border-left: 2px solid #3f5917;
@ -1180,4 +1180,23 @@ tr.z-tree-row-seld, tr.z-list-item-seld,
.help-tooltip {
cursor: help;
}
}
.toolbar-box .z-button-cm {
background-color: transparent;
border-color:transparent;
}
.toolbar-box .z-button-cm:hover {
background-color: #E6F2F9;
border-color:#006699 #DFF5FE #DFF5FE #006699;
}
.toolbar-box {
background:transparent url(/navalplanner-webapp/zkau/web/zkex/zul/img/layout/borderlayout-hm.png) repeat-x scroll 0 0;
border-bottom:1px solid #9ECAD8;
font-size:11px;
}

BIN
navalplanner-webapp/src/main/webapp/common/img/ico_filter.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 820 B

2
navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
View file

@ -12,7 +12,7 @@
<label value="${i18n:_('name')}"/>
<textbox id="filterNameOrderElement" width="50px"
onOK="treeController.onApplyFilter()" />
<button label="${i18n:_('Filter')}" style="margin-top: -4px"
<button image="/common/img/ico_filter.png" style="margin-top: -4px"
tooltiptext="${i18n:_('Apply filtering to order elements satisfying required critera')}"
onClick="treeController.onApplyFilter()"/>
</hbox>

6
navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
View file

@ -7,10 +7,10 @@
<datebox id="filterStartDate" constraint = "@{orderFilterController.checkConstraintStartDate}"/>
<label value="${i18n:_('to')}"/>
<datebox id="filterFinishDate" constraint = "@{orderFilterController.checkConstraintFinishDate}"/>
<label value="${i18n:_('include order elements')}"/>
<label value="${i18n:_('sub elements')}"/>
<checkbox id="checkIncludeOrderElements"
tooltiptext="${i18n:_('Apply filtering to order elements satisfying required criteria')}" />
<button label="${i18n:_('Filter')}" style="margin-top: -4px"
<button image="/common/img/ico_filter.png" style="margin-top: -4px"
tooltiptext="${i18n:_('Apply filtering to order elements satisfying required criteria')}"
onClick="orderFilterController.onApplyFilter()"/>
</hbox>
</hbox>

4
navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
View file

@ -25,8 +25,8 @@
]]>
</zscript>
<borderlayout sclass="orderslayout" width="auto" apply="${orderController}">
<north height="30px" border="0">
<hbox align="center" id="toolbar" sclass="toolbar-box">
<north height="30px" border="0" sclass="toolbar-box">
<hbox align="center" id="toolbar">
<templateFinderPopup id="templateFinderPopup" acceptButtonLabel="${i18n:_('Create Order')}" caption="${i18n:_('Choosing Template')}" />
<button id="createOrderButton" image="/common/img/ico_add.png" sclass="planner-icon"

4
navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
View file

@ -32,8 +32,8 @@
</div>
<borderlayout id="normalLayout" width="auto" apply="${advancedAllocationController}" class="advancedallocationlayout">
<north height="30px" border="0">
<hbox align="center" sclass="toolbar-box">
<north height="30px" border="0" sclass="toolbar-box">
<hbox align="center">
<button label="${i18n:_('Accept')}" id="acceptButton" class="save-button global-action"
if="${advancedAllocationController.advancedAllocationOfSingleTask}" />
<button label="${i18n:_('Cancel')}" id="cancelButton" class="cancel-button global-action"

4
navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
View file

@ -463,6 +463,10 @@ tr.z-vbox-sep {
background-color: #ff5a11;
}
.NO_LOAD {
border-left: 0;
}
.row_resourceload {
height: 10px;
border: 1px;