Přepracovány styly pro celkový vzhled okna, nastavení rolování gridu.

BigDecimalConverter přesunut do báze...
Odstraněna stará cesta k původním požadavkům.
Nové požadavky připraveny do tabů.
This commit is contained in:
2014-07-25 16:43:11 +02:00
parent 1829a5c0db
commit 0287c65d9c
32 changed files with 913 additions and 105 deletions
+22 -5
View File
@@ -1,24 +1,41 @@
<?page title="${labels.MUnitsFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk>
<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsForm')">
<caption src="/img/munits.png" zclass="form-caption" label="${labels.MUnitsFormTitle}" />
<window
id="editWin"
closable="true"
border="normal"
position="center"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsForm')">
<caption
src="/img/tape-measure-032.png"
zclass="form-caption"
label="${labels.MUnitsFormTitle}" />
<vlayout>
<grid hflex="min">
<columns>
<column align="right" hflex="min" />
<column
align="right"
hflex="min" />
<column />
</columns>
<rows>
<row>
<cell sclass="row-title">${labels.MUnitsFormName} :</cell>
<cell>
<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" />
<textbox
id="name"
width="200px"
value="@bind(vm.dataBean.name)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.MUnitsFormDescription} :</cell>
<cell>
<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
<textbox
id="description"
width="300px"
value="@bind(vm.dataBean.description)" />
</cell>
</row>
</rows>
+34 -12
View File
@@ -1,21 +1,41 @@
<?page title="${labels.AgendaMUnits}" contentType="text/html;charset=UTF-8"?>
<zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsList')">
<caption zclass="form-caption" label="${labels.AgendaMUnits}" />
<window
vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsList')">
<caption
src="/img/tape-measure-032.png"
zclass="form-caption"
label="${labels.AgendaMUnits}" />
<include src="/app/toolbar.zul" />
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
<listbox
vflex="1"
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)">
<listhead menupopup="auto">
<listheader label="${labels.MUnitsGridColumnName}" sort="czech(name)" width="30%" />
<listheader label="${labels.MUnitsGridColumnDescription}" sort="czech(description)" width="70%" />
<listheader
label="${labels.MUnitsGridColumnName}"
sort="czech(name)"
width="30%" />
<listheader
label="${labels.MUnitsGridColumnDescription}"
sort="czech(description)"
width="70%" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">
<auxhead
sclass="category-center"
visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.name)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.name)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -25,7 +45,11 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.description)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -33,7 +57,6 @@
</div>
</auxheader>
</auxhead>
<template name="model">
<listitem>
<listcell label="@load(each.name)" />
@@ -41,6 +64,5 @@
</listitem>
</template>
</listbox>
</window>
</zk>