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

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source
multitenant
Josef Rokos 11 years ago
parent 25a4d2dfb7 f299b8604c
commit 0f9d1baf94
7 changed files with 132 additions and 79 deletions
Show Stats Download Patch File Download Diff File

72
src/main/webapp/admin/addressbook/addressbook.zul
Unescape Escape View File

@ -10,46 +10,78 @@
<hbox width="100%"> <hbox width="100%">
<listbox id="dataGrid" model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" <listbox id="dataGrid" model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)"
onAfterRender="@command('afterRender')" selectedIndex="@load(vm.selIndex)" hflex="6" height="480px"> onAfterRender="@command('afterRender')" selectedIndex="@load(vm.selIndex)" hflex="6" height="480px">
<listhead vflex="true">
<listheader label="Firma" sort="auto(company)" onSort="@command('onSort', column='company')" />
<listheader label="IČ" width="100px"/>
<listheader label="Kontaktní osoba"/>
<listheader label="Ulice"/>
<listheader label="Číslo domu" width="80px"/>
<listheader label="Město" sort="auto(city)" onSort="@command('onSort', column='city')"/>
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)"> <auxhead sclass="category-center" visible="@load(vm.filter)">
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.company)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox instant="true" width="85%" </div>
value="@bind(vm.filterTemplate.company)" onChange="@command('doFilter')" /> </div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.ic)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox instant="true" width="85%" </div>
value="@bind(vm.filterTemplate.ic)" onChange="@command('doFilter')" /> </div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.contactName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox instant="true" width="85%" </div>
value="@bind(vm.filterTemplate.contactName)" onChange="@command('doFilter')"/> </div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.street)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox instant="true" width="85%" </div>
value="@bind(vm.filterTemplate.street)" onChange="@command('doFilter')"/> </div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.houseNumber)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox instant="true" width="85%" </div>
value="@bind(vm.filterTemplate.houseNumber)" onChange="@command('doFilter')"/> </div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.city)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox instant="true" width="85%" </div>
value="@bind(vm.filterTemplate.city)" onChange="@command('doFilter')"/> </div>
</auxheader> </auxheader>
</auxhead> </auxhead>
<listhead vflex="true">
<listheader label="Firma" sort="auto(company)" onSort="@command('onSort', column='company')" />
<listheader label="IČ" width="100px"/>
<listheader label="Kontaktní osoba"/>
<listheader label="Ulice"/>
<listheader label="Číslo domu" width="80px"/>
<listheader label="Město" sort="auto(city)" onSort="@command('onSort', column='city')"/>
</listhead>
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell label="@load(each.company)"/> <listcell label="@load(each.company)"/>

46
src/main/webapp/admin/users/users.zul
Unescape Escape View File

@ -8,30 +8,56 @@
<hbox width="100%" height="500px"> <hbox width="100%" height="500px">
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" width="650px" height="480px"> <listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" width="650px" height="480px">
<listhead>
<listheader label="Login"/>
<listheader label="Osobní číslo"/>
<listheader label="Jméno"/>
<listheader label="Příjmení"/>
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)"> <auxhead sclass="category-center" visible="@load(vm.filter)">
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.username)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox value="@bind(vm.filterTemplate.username)" instant="true" onChange="@command('doFilter')"/> </div>
</div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.personalNumber)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox value="@bind(vm.filterTemplate.personalNumber)" instant="true" onChange="@command('doFilter')"/> </div>
</div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.firstName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox value="@bind(vm.filterTemplate.firstName)" instant="true" onChange="@command('doFilter')"/> </div>
</div>
</auxheader> </auxheader>
<auxheader> <auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.lastName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" /> <image src="/img/funnel.png" />
<textbox value="@bind(vm.filterTemplate.lastName)" instant="true" onChange="@command('doFilter')"/> </div>
</div>
</auxheader> </auxheader>
</auxhead> </auxhead>
<listhead>
<listheader label="Login"/>
<listheader label="Osobní číslo"/>
<listheader label="Jméno"/>
<listheader label="Příjmení"/>
</listhead>
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell label="@load(each.username)"/> <listcell label="@load(each.username)"/>

5
src/main/webapp/app/header.zul
Unescape Escape View File

@ -1,7 +1,4 @@
<?page title="${labels.HeaderText}" contentType="text/html;charset=UTF-8"?> <?page title="${labels.HeaderText}" contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<style src="/css/page.css"/> <div sclass="header-content" xmlns="xhtml">${labels.AppName}</div>
<div id="header">
${labels.AppName}
</div>
</zk> </zk>

14
src/main/webapp/app/template.zhtml
Unescape Escape View File

@ -43,21 +43,15 @@
<div id="container"> <div id="container">
<div id="header"> <div id="header">
Objednávkový systém SPŠ Třebíč <u:include src="/app/header.zul" />
</div> </div>
<div id="leftcolumn"> <div id="leftcolumn">
<u:include src="/app/navigation.zul"/> <u:include src="/app/navigation.zul" />
</div> </div>
<div id="maincolumn"> <div id="maincolumn">
<u:include src="${gridZul}" />
<u:include src="${gridZul}"/>
</div>
<div id="footer">Footer
</div> </div>
<div id="footer">Footer</div>
</div> </div>
</html> </html>

2
src/main/webapp/buildings/building.zul
Unescape Escape View File

@ -11,6 +11,7 @@
<listheader label="${labels.BuildingsGridColumnName}" sort="auto(name)" onSort="@command('onSort', column='name')" width="30%" /> <listheader label="${labels.BuildingsGridColumnName}" sort="auto(name)" onSort="@command('onSort', column='name')" width="30%" />
<listheader label="${labels.BuildingsGridColumnDescription}" sort="auto(description)" onSort="@command('onSort', column='description')" width="60%" /> <listheader label="${labels.BuildingsGridColumnDescription}" sort="auto(description)" onSort="@command('onSort', column='description')" width="60%" />
</listhead> </listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)"> <auxhead sclass="category-center" visible="@load(vm.filter)">
<auxheader> <auxheader>
<div sclass="find-grid-cell"> <div sclass="find-grid-cell">
@ -43,6 +44,7 @@
</div> </div>
</auxheader> </auxheader>
</auxhead> </auxhead>
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell label="@load(each.code)" /> <listcell label="@load(each.code)" />

10
src/main/webapp/css/page.css
Unescape Escape View File

@ -2,7 +2,6 @@ html {
/*vertical scrollbar allways visible */ /*vertical scrollbar allways visible */
overflow: -moz-scrollbars-vertical; overflow: -moz-scrollbars-vertical;
overflow-y: scroll; overflow-y: scroll;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
} }
@ -13,16 +12,9 @@ html {
#header { #header {
width: auto; width: auto;
height: 40px; height: 60px;
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 10px;
background: url("/isspst/img/header-bg.png") 50% 0 repeat-x;
color: #ffffff;
font-size: 35px;
font-weight: bold;
text-align: center;
text-shadow: 2px 2px 2px #000000;
} }
#leftcolumn { #leftcolumn {

10
src/main/webapp/css/zk-modify.css
Unescape Escape View File

@ -1,3 +1,13 @@
.header-content {
padding: 10px;
background: url("/isspst/img/header-bg.png") 50% 0 repeat-x;
color: #ffffff;
font-size: 35px;
font-weight: bold;
text-align: center;
text-shadow: 2px 2px 2px #000000;
}
.find-grid-cell { .find-grid-cell {
display: table; display: table;
width: 100%; width: 100%;

Write Preview
Loading…
Cancel
Save