IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stylování vzhledu.

Browse Source
This commit is contained in:
František Přibyl
2014-07-25 20:15:34 +02:00
parent 0287c65d9c
commit 65e42f6d43
24 changed files with 395 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/locales/zk-label.properties
+3
View File
@@ -218,7 +218,10 @@ Permissions=Práva
NumberSeries=Číselné řady NumberSeries=Číselné řady
User=Uživatel User=Uživatel
ChangePassword=Změnit heslo ChangePassword=Změnit heslo
Login=Přihlásit
Loggingin=Přihlášení
Logout=Odhlásit Logout=Odhlásit
WrongNameOrPassword=Špatné jméno nebo heslo
DateFormat=dd. MM. yyyy DateFormat=dd. MM. yyyy
src/main/webapp/admin/index.zhtml
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Objednávky</title>
</head>
<body>
administrace
</body>
</html>
src/main/webapp/app/info.zul
+62 -44
View File
@@ -1,47 +1,65 @@
<?page title="Informace" contentType="text/html;charset=UTF-8"?> <?page title="Informace" contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<window border="normal" apply="org.zkoss.bind.BindComposer" <window
viewModel="@id('vm') @init('info.bukova.isspst.ui.dashboard.DashBoardVM')"> vflex="1"
<caption zclass="form-caption" label="${labels.Information}" /> border="normal"
<vbox> apply="org.zkoss.bind.BindComposer"
<hbox> viewModel="@id('vm') @init('info.bukova.isspst.ui.dashboard.DashBoardVM')">
<label value="${labels.LogedInUser}"/> <image src="/img/user-small.png"/> <label value="@load(vm.user)"/> <caption
</hbox> zclass="form-caption"
<groupbox mold="3d"> label="${labels.Information}" />
<caption image="/img/commission-small.png" label="${labels.CentresForRequirements}"/> <vbox vflex="1">
<hbox children="@load(vm.centres)"> <hbox>
<template name="children"> <label value="${labels.LogedInUser}" />
<listbox model="@load(vm.groupRoles[each])"> <image src="/img/user-small.png" />
<listhead> <label value="@load(vm.user)" />
<listheader label="@load(each.fullName)"/> </hbox>
</listhead> <groupbox
<template name="model" var="role"> vflex="1"
<listitem> mold="3d">
<listcell label="@load(role.description)"/> <caption
</listitem> image="/img/commission-small.png"
</template> label="${labels.CentresForRequirements}" />
</listbox> <hbox children="@load(vm.centres)">
</template> <template name="children">
</hbox> <listbox model="@load(vm.groupRoles[each])">
</groupbox> <listhead>
<groupbox mold="3d"> <listheader label="@load(each.fullName)" />
<caption image="/img/commission-small.png" label="${labels.WorkgroupMembership}"/> </listhead>
<hbox children="@load(vm.workgroups)"> <template
<template name="children"> name="model"
<listbox model="@load(vm.groupRoles[each])"> var="role">
<listhead> <listitem>
<listheader label="@load(each.fullName)"/> <listcell label="@load(role.description)" />
</listhead> </listitem>
<template name="model" var="role"> </template>
<listitem> </listbox>
<listcell label="@load(role.description)"/> </template>
</listitem> </hbox>
</template> </groupbox>
</listbox> <groupbox
</template> vflex="1"
</hbox> mold="3d">
</groupbox> <caption
</vbox> image="/img/commission-small.png"
label="${labels.WorkgroupMembership}" />
</window> <hbox children="@load(vm.workgroups)">
<template name="children">
<listbox model="@load(vm.groupRoles[each])">
<listhead>
<listheader label="@load(each.fullName)" />
</listhead>
<template
name="model"
var="role">
<listitem>
<listcell label="@load(role.description)" />
</listitem>
</template>
</listbox>
</template>
</hbox>
</groupbox>
</vbox>
</window>
</zk> </zk>
src/main/webapp/app/mainMenu.zul
+5
View File
@@ -29,6 +29,7 @@
label="${labels.CurrentRequirements}" label="${labels.CurrentRequirements}"
href="/trips/requirement" /> href="/trips/requirement" />
<menuitem <menuitem
image="/img/pickup-024.png"
label="${labels.TravelOrders}" label="${labels.TravelOrders}"
href="" /> href="" />
</menupopup> </menupopup>
@@ -37,10 +38,12 @@
<menu label="${labels.Lists}"> <menu label="${labels.Lists}">
<menupopup> <menupopup>
<menuitem <menuitem
image="/img/palet-024.png"
label="${labels.AgendaMaterial}" label="${labels.AgendaMaterial}"
href="/lists/material" href="/lists/material"
disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}" /> disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}" />
<menuitem <menuitem
image="/img/painting-016.png"
label="${labels.AgendaServices}" label="${labels.AgendaServices}"
href="/lists/service" href="/lists/service"
disabled="${not sec:isAllGranted('PERM_READ_SERVICES')}" /> disabled="${not sec:isAllGranted('PERM_READ_SERVICES')}" />
@@ -49,6 +52,7 @@
href="/lists/addressbook" href="/lists/addressbook"
disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}" /> disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}" />
<menuitem <menuitem
image="/img/house-016.png"
label="${labels.AgendaBuildings}" label="${labels.AgendaBuildings}"
href="/lists/buildings" href="/lists/buildings"
disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" /> disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
@@ -97,6 +101,7 @@
label="${labels.ChangePassword}…" label="${labels.ChangePassword}…"
onClick="@command('passwd')" /> onClick="@command('passwd')" />
<menuitem <menuitem
image="/img/unlock-016.png"
label="${labels.Logout}" label="${labels.Logout}"
href="/j_spring_security_logout" /> href="/j_spring_security_logout" />
</menupopup> </menupopup>
src/main/webapp/img/house-016.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 585 B

src/main/webapp/img/house-032.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

src/main/webapp/img/lock-032.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

src/main/webapp/img/material.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

src/main/webapp/img/painting-016.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 816 B

src/main/webapp/img/painting-032.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

src/main/webapp/img/palet-024.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

src/main/webapp/img/palet-032.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

src/main/webapp/img/pickup-024.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

src/main/webapp/img/pickup-032.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

src/main/webapp/img/unlock-016.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 893 B

src/main/webapp/lists/buildings/building.zul
+58 -26
View File
@@ -1,23 +1,47 @@
<?page title="${labels.AgendaBuildings}" contentType="text/html;charset=UTF-8"?> <?page title="${labels.AgendaBuildings}" contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?> <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.buildings.BuildingList')"> <window
<caption zclass="form-caption" label="${labels.AgendaBuildings}" /> vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.buildings.BuildingList')">
<caption
image="/img/house-032.png"
zclass="form-caption"
label="${labels.AgendaBuildings}" />
<include src="/app/toolbar.zul" /> <include src="/app/toolbar.zul" />
<hbox width="100%"> <hbox width="100%">
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" hflex="4"> <listbox
vflex="1"
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)"
hflex="4">
<listhead menupopup="auto"> <listhead menupopup="auto">
<listheader label="${labels.BuildingsGridColumnCode}" sort="czech(code)" width="10%" /> <listheader
<listheader label="${labels.BuildingsGridColumnName}" sort="czech(name)" width="30%" /> label="${labels.BuildingsGridColumnCode}"
<listheader label="${labels.BuildingsGridColumnDescription}" sort="czech(description)" width="60%" /> sort="czech(code)"
width="10%" />
<listheader
label="${labels.BuildingsGridColumnName}"
sort="czech(name)"
width="30%" />
<listheader
label="${labels.BuildingsGridColumnDescription}"
sort="czech(description)"
width="60%" />
</listhead> </listhead>
<auxhead
<auxhead sclass="category-center" visible="@load(vm.filter)"> sclass="category-center"
visible="@load(vm.filter)">
<auxheader> <auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.code)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox
value="@bind(vm.filterTemplate.code)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div> </div>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -27,7 +51,11 @@
<auxheader> <auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <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>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -37,7 +65,11 @@
<auxheader> <auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <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>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -45,7 +77,6 @@
</div> </div>
</auxheader> </auxheader>
</auxhead> </auxhead>
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell label="@load(each.code)" /> <listcell label="@load(each.code)" />
@@ -55,29 +86,30 @@
</template> </template>
</listbox> </listbox>
<vbox> <vbox>
<label value="${labels.BuildingsGridRooms}"/> <label value="${labels.BuildingsGridRooms}" />
<grid model="@load(vm.dataBean.rooms)" hflex="6"> <grid
model="@load(vm.dataBean.rooms)"
hflex="6">
<columns menupopup="auto"> <columns menupopup="auto">
<column label="${labels.code}"/> <column label="${labels.code}" />
<column label="${labels.name}"/> <column label="${labels.name}" />
<column label="${labels.shortcut}"/> <column label="${labels.shortcut}" />
<column label="${labels.number}"/> <column label="${labels.number}" />
<column label="${labels.floor}"/> <column label="${labels.floor}" />
</columns> </columns>
<rows> <rows>
<template name="model"> <template name="model">
<row> <row>
<label value="@bind(each.code)"/> <label value="@bind(each.code)" />
<label value="@bind(each.name)"/> <label value="@bind(each.name)" />
<label value="@bind(each.shortcut)"/> <label value="@bind(each.shortcut)" />
<label value="@bind(each.number)"/> <label value="@bind(each.number)" />
<label value="@bind(each.floor)"/> <label value="@bind(each.floor)" />
</row> </row>
</template> </template>
</rows> </rows>
</grid> </grid>
</vbox> </vbox>
</hbox> </hbox>
</window> </window>
</zk> </zk>
src/main/webapp/lists/buildings/buildingForm.zul
+69 -20
View File
@@ -1,53 +1,102 @@
<?page title="${labels.BuildingsFormTitle}" contentType="text/html;charset=UTF-8"?> <?page title="${labels.BuildingsFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" <window
viewModel="@id('vm') @init('info.bukova.isspst.ui.buildings.BuildingForm')" width="750px"> id="editWin"
<caption src="/img/building.png" zclass="form-caption" label="${labels.BuildingsFormTitle}" /> closable="true"
border="normal"
position="center"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.buildings.BuildingForm')"
width="750px">
<caption
image="/img/house-032.png"
zclass="form-caption"
label="${labels.BuildingsFormTitle}" />
<vlayout> <vlayout>
<grid hflex="min"> <grid hflex="min">
<columns> <columns>
<column align="right" hflex="min" /> <column
align="right"
hflex="min" />
<column /> <column />
</columns> </columns>
<rows> <rows>
<row> <row>
<cell sclass="row-title">${labels.BuildingsFormCode} :</cell> <cell sclass="row-title">${labels.BuildingsFormCode} :</cell>
<cell> <cell>
<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.code)" /> <textbox
id="code"
constraint="@load(vm.constriant)"
width="200px"
value="@bind(vm.dataBean.code)" />
</cell> </cell>
</row> </row>
<row> <row>
<cell sclass="row-title">${labels.BuildingsFormName} :</cell> <cell sclass="row-title">${labels.BuildingsFormName} :</cell>
<cell> <cell>
<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" /> <textbox
id="name"
width="200px"
value="@bind(vm.dataBean.name)" />
</cell> </cell>
</row> </row>
<row> <row>
<cell sclass="row-title">${labels.BuildingsFormDescription} :</cell> <cell sclass="row-title">${labels.BuildingsFormDescription} :</cell>
<cell> <cell>
<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" /> <textbox
id="description"
width="300px"
value="@bind(vm.dataBean.description)" />
</cell> </cell>
</row> </row>
</rows> </rows>
</grid> </grid>
<button image="/img/item-add.png" label="${labels.BuildingsFormAddRoom}" onClick="@command('addRoom')"/> <button
image="/img/item-add.png"
label="${labels.BuildingsFormAddRoom}"
onClick="@command('addRoom')" />
<listbox model="@load(vm.dataBean.rooms)"> <listbox model="@load(vm.dataBean.rooms)">
<listhead> <listhead>
<listheader label="${labels.code}"/> <listheader label="${labels.code}" />
<listheader label="${labels.name}"/> <listheader label="${labels.name}" />
<listheader label="${labels.shortcut}"/> <listheader label="${labels.shortcut}" />
<listheader label="${labels.number}"/> <listheader label="${labels.number}" />
<listheader label="${labels.floor}"/> <listheader label="${labels.floor}" />
<listheader/> <listheader />
</listhead> </listhead>
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell><textbox inplace="true" value="@bind(each.code)"/></listcell> <listcell>
<listcell><textbox inplace="true" value="@bind(each.name)"/></listcell> <textbox
<listcell><textbox inplace="true" value="@bind(each.shortcut)"/></listcell> inplace="true"
<listcell><textbox inplace="true" value="@bind(each.number)"/></listcell> value="@bind(each.code)" />
<listcell><textbox inplace="true" value="@bind(each.floor)"/></listcell> </listcell>
<listcell><button image="/img/item-remove.png" label="${labels.BuildingsFormRemove}" onClick="@command('removeRoom', room=each)"/></listcell> <listcell>
<textbox
inplace="true"
value="@bind(each.name)" />
</listcell>
<listcell>
<textbox
inplace="true"
value="@bind(each.shortcut)" />
</listcell>
<listcell>
<textbox
inplace="true"
value="@bind(each.number)" />
</listcell>
<listcell>
<textbox
inplace="true"
value="@bind(each.floor)" />
</listcell>
<listcell>
<button
image="/img/item-remove.png"
label="${labels.BuildingsFormRemove}"
onClick="@command('removeRoom', room=each)" />
</listcell>
</listitem> </listitem>
</template> </template>
</listbox> </listbox>
src/main/webapp/lists/material/material.zul
+49 -17
View File
@@ -1,23 +1,49 @@
<?page title="${labels.AgendaMaterial}" contentType="text/html;charset=UTF-8"?> <?page title="${labels.AgendaMaterial}" contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?> <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.MaterialList')"> <window
<caption zclass="form-caption" label="${labels.AgendaMaterial}" /> vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.MaterialList')">
<caption
image="/img/palet-032.png"
zclass="form-caption"
label="${labels.AgendaMaterial}" />
<include src="/app/toolbar.zul" /> <include src="/app/toolbar.zul" />
<listbox
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" height="500px"> vflex="1"
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)"
height="500px">
<listhead menupopup="auto"> <listhead menupopup="auto">
<listheader label="${labels.code}" sort="czech(code)" width="10%" /> <listheader
<listheader label="${labels.name}" sort="czech(name)" width="25%" /> label="${labels.code}"
<listheader label="${labels.munit}" width="15%"/> sort="czech(code)"
<listheader label="${labels.description}" sort="czech(description)" width="50%" /> width="10%" />
<listheader
label="${labels.name}"
sort="czech(name)"
width="25%" />
<listheader
label="${labels.munit}"
width="15%" />
<listheader
label="${labels.description}"
sort="czech(description)"
width="50%" />
</listhead> </listhead>
<auxhead
<auxhead sclass="category-center" visible="@load(vm.filter)"> sclass="category-center"
<auxheader> visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.code)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox
value="@bind(vm.filterTemplate.code)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div> </div>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -27,7 +53,11 @@
<auxheader> <auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <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>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -56,7 +86,11 @@
<auxheader> <auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <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>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -64,16 +98,14 @@
</div> </div>
</auxheader> </auxheader>
</auxhead> </auxhead>
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell label="@load(each.code)" /> <listcell label="@load(each.code)" />
<listcell label="@load(each.name)" /> <listcell label="@load(each.name)" />
<listcell label="@load(each.munit.name)"/> <listcell label="@load(each.munit.name)" />
<listcell label="@load(each.description)" /> <listcell label="@load(each.description)" />
</listitem> </listitem>
</template> </template>
</listbox> </listbox>
</window> </window>
</zk> </zk>
src/main/webapp/lists/material/materialForm.zul
+31 -8
View File
@@ -1,33 +1,53 @@
<?page title="${labels.MaterialFormTitle}" contentType="text/html;charset=UTF-8"?> <?page title="${labels.MaterialFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" <window
id="editWin"
closable="true"
border="normal"
position="center"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.MaterialForm')"> viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.MaterialForm')">
<caption src="/img/material.png" zclass="form-caption" label="${labels.MaterialFormTitle}" /> <caption
image="/img/palet-032.png"
zclass="form-caption"
label="${labels.MaterialFormTitle}" />
<vlayout> <vlayout>
<grid hflex="min"> <grid hflex="min">
<columns> <columns>
<column align="right" hflex="min" /> <column
align="right"
hflex="min" />
<column /> <column />
</columns> </columns>
<rows> <rows>
<row> <row>
<cell sclass="row-title">${labels.code} :</cell> <cell sclass="row-title">${labels.code} :</cell>
<cell> <cell>
<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.code)" /> <textbox
id="code"
constraint="@load(vm.constriant)"
width="200px"
value="@bind(vm.dataBean.code)" />
</cell> </cell>
</row> </row>
<row> <row>
<cell sclass="row-title">${labels.name} :</cell> <cell sclass="row-title">${labels.name} :</cell>
<cell> <cell>
<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" /> <textbox
id="name"
width="200px"
value="@bind(vm.dataBean.name)" />
</cell> </cell>
</row> </row>
<row> <row>
<cell sclass="row-title">${labels.munit} :</cell> <cell sclass="row-title">${labels.munit} :</cell>
<cell> <cell>
<combobox model="@load(vm.munits)" selectedItem="@bind(vm.dataBean.munit)" readonly="true"> <combobox
model="@load(vm.munits)"
selectedItem="@bind(vm.dataBean.munit)"
readonly="true">
<template name="model"> <template name="model">
<comboitem label="@load(each.name)"/> <comboitem label="@load(each.name)" />
</template> </template>
</combobox> </combobox>
</cell> </cell>
@@ -35,7 +55,10 @@
<row> <row>
<cell sclass="row-title">${labels.description} :</cell> <cell sclass="row-title">${labels.description} :</cell>
<cell> <cell>
<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" /> <textbox
id="description"
width="300px"
value="@bind(vm.dataBean.description)" />
</cell> </cell>
</row> </row>
</rows> </rows>
src/main/webapp/lists/service/service.zul
+45 -15
View File
@@ -1,22 +1,46 @@
<?page title="${labels.AgendaServices}" contentType="text/html;charset=UTF-8"?> <?page title="${labels.AgendaServices}" contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?> <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.ServiceItemList')"> <window
<caption zclass="form-caption" label="${labels.AgendaServices}" /> vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.ServiceItemList')">
<caption
image="/img/painting-032.png"
zclass="form-caption"
label="${labels.AgendaServices}" />
<include src="/app/toolbar.zul" /> <include src="/app/toolbar.zul" />
<listbox
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" height="500px"> vflex="1"
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)"
height="500px">
<listhead menupopup="auto"> <listhead menupopup="auto">
<listheader label="${labels.code}" sort="czech(code)" width="10%" /> <listheader
<listheader label="${labels.name}" sort="czech(name)" width="30%" /> label="${labels.code}"
<listheader label="${labels.description}" sort="czech(description)" width="60%" /> sort="czech(code)"
width="10%" />
<listheader
label="${labels.name}"
sort="czech(name)"
width="30%" />
<listheader
label="${labels.description}"
sort="czech(description)"
width="60%" />
</listhead> </listhead>
<auxhead
<auxhead sclass="category-center" visible="@load(vm.filter)"> sclass="category-center"
<auxheader> visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.code)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox
value="@bind(vm.filterTemplate.code)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div> </div>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -26,7 +50,11 @@
<auxheader> <auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <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>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -36,7 +64,11 @@
<auxheader> <auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox"> <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>
<div sclass="find-grid-img"> <div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
@@ -44,7 +76,6 @@
</div> </div>
</auxheader> </auxheader>
</auxhead> </auxhead>
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell label="@load(each.code)" /> <listcell label="@load(each.code)" />
@@ -53,6 +84,5 @@
</listitem> </listitem>
</template> </template>
</listbox> </listbox>
</window> </window>
</zk> </zk>
src/main/webapp/lists/service/serviceForm.zul
+26 -6
View File
@@ -1,31 +1,51 @@
<?page title="${labels.ServiceFormTitle}" contentType="text/html;charset=UTF-8"?> <?page title="${labels.ServiceFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" <window
id="editWin"
closable="true"
border="normal"
position="center"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.ServiceItemForm')"> viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.ServiceItemForm')">
<caption src="/img/service.png" zclass="form-caption" label="${labels.ServiceFormTitle}" /> <caption
image="/img/painting-032.png"
zclass="form-caption"
label="${labels.ServiceFormTitle}" />
<vlayout> <vlayout>
<grid hflex="min"> <grid hflex="min">
<columns> <columns>
<column align="right" hflex="min" /> <column
align="right"
hflex="min" />
<column /> <column />
</columns> </columns>
<rows> <rows>
<row> <row>
<cell sclass="row-title">${labels.code} :</cell> <cell sclass="row-title">${labels.code} :</cell>
<cell> <cell>
<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.code)" /> <textbox
id="code"
constraint="@load(vm.constriant)"
width="200px"
value="@bind(vm.dataBean.code)" />
</cell> </cell>
</row> </row>
<row> <row>
<cell sclass="row-title">${labels.name} :</cell> <cell sclass="row-title">${labels.name} :</cell>
<cell> <cell>
<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" /> <textbox
id="name"
width="200px"
value="@bind(vm.dataBean.name)" />
</cell> </cell>
</row> </row>
<row> <row>
<cell sclass="row-title">${labels.description} :</cell> <cell sclass="row-title">${labels.description} :</cell>
<cell> <cell>
<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" /> <textbox
id="description"
width="300px"
value="@bind(vm.dataBean.description)" />
</cell> </cell>
</row> </row>
</rows> </rows>
src/main/webapp/login.zhtml
+13 -14
View File
@@ -1,15 +1,14 @@
<html xmlns="native" xmlns:u="zul" xmlns:zk="zk"> <html
<head> xmlns="native"
<title>Objednávky</title> xmlns:u="zul"
</head> xmlns:zk="zk">
<body style="height: 100%; padding: 0 5px;"> <head>
<title>${labels.Loggingin}</title>
<div style="height: 15%"/> </head>
<body style="height: 100%; padding: 0 5px;">
<div align="center"> <div style="height: 15%" />
<div align="center">
<u:include src="login.zul"/> <u:include src="login.zul" />
</div>
</div> </body>
</body>
</html> </html>
src/main/webapp/login.zul
+29 -23
View File
@@ -1,36 +1,42 @@
<?page title="Přihlášení" contentType="text/x-component;charset=UTF-8"?> <?page title="${labels.Loggingin}" contentType="text/x-component;charset=UTF-8"?>
<zk> <zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?> <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window title="Přihlášení" border="normal" width="300px" <window
apply="org.zkoss.bind.BindComposer" border="normal"
viewModel="@id('vm') @init('info.bukova.isspst.ui.LoginVM')"> width="300px"
<label value="Špatný login nebo heslo!" style="font-weight:bold; font-size: 14px; color: red;" visible="@load(vm.loginFailed)"/> apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.LoginVM')">
<caption
image="/img/lock-032.png"
zclass="form-caption"
label="${labels.Loggingin}" />
<label
value="${labels.WrongNameOrPassword}"
style="font-weight:bold; font-size: 14px; color: red;"
visible="@load(vm.loginFailed)" />
<html style="font-family:arial,sans-serif;font-size:12px;"> <html style="font-family:arial,sans-serif;font-size:12px;">
<![CDATA[ <![CDATA[
<form name='loginForm' action="j_spring_security_check" <form name='loginForm' action="j_spring_security_check" method='POST'>
method='POST'>
<table> <table>
<tr> <tr>
<td>Uživatel:</td> <td>${labels.UsersFormFirstName}:</td>
<td><input type='text' name='j_username' value=''/> <td><input type='text' name='j_username' value='' size="25" /></td>
</td> </tr>
</tr> <tr>
<tr> <td>${labels.UsersFormPassword}:</td>
<td>Heslo:</td> <td><input type='password' name='j_password' size="25" /></td>
<td><input type='password' name='j_password' /> </tr>
</td> <tr>
</tr> <td colspan='2' align="center">
<tr> <input name="submit" type="submit" value="${labels.Login}" class="nicebutton" />
<td colspan='2'><input name="submit" type="submit" </td>
value="Přihlásit" class="nicebutton" /> </tr>
</td>
</tr>
</table> </table>
</form> </form>
]]> ]]>
</html> </html>
</window> </window>
</zk> </zk>
src/main/webapp/requirements/selectitems/selectItems.zul
+2 -2
View File
@@ -19,11 +19,11 @@
<tab <tab
id="tabMaterial" id="tabMaterial"
label="${labels.AgendaMaterial}" label="${labels.AgendaMaterial}"
image="/img/material.png" /> image="/img/palet-032.png" />
<tab <tab
id="tabService" id="tabService"
label="${labels.AgendaServices}" label="${labels.AgendaServices}"
image="/img/service.png" /> image="/img/painting-032.png" />
</tabs> </tabs>
<tabpanels> <tabpanels>
<tabpanel> <tabpanel>