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

Improved appearance of tasks filter

Browse source 
FEA: ItEr75S08MigrationZK5
This commit is contained in:
Lorenzo Tilve Álvaro 2011-08-11 18:51:51 +02:00
parent 64db6e3f6c
commit d7a59bd9f1
3 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
View file

@ -1065,6 +1065,12 @@ span.z-dottree-line {
padding-right: 3px;
}
.toolbar-box .z-button-cm {
font-size:11px;
color: #0068B1;
}
/* =================================================== */
.vertical-separator {
@ -1718,3 +1724,10 @@ input.z-datebox-text-disd {
select {
font-size:12px;
}
.z-separator-ver-bar {
height: 22px;
width: 0;
border-right: 1px solid #9ECAD8;
border-left: 1px solid #d9f3ff;
}

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 938 B

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

@ -20,34 +20,31 @@
-->
<hbox align="center" sclass="filtering-area">
<label value="${i18n:_('Filter')}"
<space bar="true" />
<label value="${i18n:_('Task')}"
tooltiptext="${i18n:_('Select required criteria set and press filter button')}"/>
<bandboxMultipleSearch id="bdFiltersOrderElement" widthBandbox="300px" widthListbox="400px"
finder="orderElementsMultipleFiltersFinder"/>
<label value="${i18n:_('name')}"/>
<textbox id="filterNameOrderElement" width="50px"
<textbox id="filterNameOrderElement" width="100px"
onOK="treeController.onApplyFilter()" />
<button id="optionsButton" label="options" style="margin-top: -4px"
<label value="${i18n:_('with')}"/>
<bandboxMultipleSearch id="bdFiltersOrderElement" widthBandbox="260px" widthListbox="550px"
finder="orderElementsMultipleFiltersFinder" />
<button id="optionsButton" label="${i18n:_('options')}" dir="reverse"
image="/common/img/ico_dropdown.png" style="margin-top: -2px"
tooltiptext="${i18n:_('Set Filter Options')}"
onClick='filterOptionsPopup.open(self,"after_end");' />
<button image="/common/img/ico_filter.png" style="margin-top: -4px"
onClick='filterOptionsPopup.open(self,"after_end");' />
<button label="${i18n:_('Filter')}" dir="reverse"
image="/common/img/ico_filter.png" style="margin-top: -2px"
tooltiptext="${i18n:_('Apply filtering to tasks satisfying required criteria')}"
onClick="treeController.onApplyFilter()"/>
<popup id="filterOptionsPopup" width="220px" height="120px" >
<groupbox mold="3d" closable="true" width="200px" height="100px">
<vbox>
<hbox>
<popup id="filterOptionsPopup" sclass="filter-options-popup">
<hbox align="pack">
<label value="${i18n:_('from')}"/>
<datebox id="filterStartDateOrderElement" constraint = "@{treeController.checkConstraintStartDate}"
width="65px" />
<datebox id="filterStartDateOrderElement" constraint = "@{treeController.checkConstraintStartDate}" />
<label value="${i18n:_('to')}"/>
<datebox id="filterFinishDateOrderElement" constraint = "@{treeController.checkConstraintFinishDate}"
width="65px" />
<datebox id="filterFinishDateOrderElement" constraint = "@{treeController.checkConstraintFinishDate}" />
</hbox>
<hbox>
<hbox align="pack">
<checkbox id="labelsWithoutInheritance" checked="false" label="${i18n:_('Labels without inheritance')}"/>
</hbox>
</vbox>
</groupbox>
</popup>
</hbox>