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
This commit is contained in:
Josef Rokos
2014-05-31 20:00:52 +02:00
parent 4e5ae2bbfa 0ea29ce50e
commit b4a86ea5c2
6 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/admin/addressbook/addressbook.zul
+5 -5
View File
@@ -8,12 +8,12 @@
<hbox width="100%">
<listbox id="dataGrid" model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" onAfterRender="@command('afterRender')" selectedIndex="@load(vm.selIndex)" hflex="6" height="480px">
<listhead vflex="true" menupopup="auto">
<listheader label="${labels.SuppliersGridColumnCompany}" sort="auto(company)" />
<listheader label="${labels.SuppliersGridColumnCompany}" sort="czech(company)" />
<listheader label="${labels.SuppliersGridColumnIC}" sort="auto(ic)" width="100px" />
<listheader label="${labels.SuppliersGridColumnContact}" sort="auto(contactName)" />
<listheader label="${labels.SuppliersGridColumnStreet}" sort="auto(street)" />
<listheader label="${labels.SuppliersGridColumnNo}" sort="auto(houseNumber)" width="80px" />
<listheader label="${labels.SuppliersGridColumnCity}" sort="auto(city)" />
<listheader label="${labels.SuppliersGridColumnContact}" sort="czech(contactName)" />
<listheader label="${labels.SuppliersGridColumnStreet}" sort="czech(street)" />
<listheader label="${labels.SuppliersGridColumnNo}" sort="czech(houseNumber)" width="80px" />
<listheader label="${labels.SuppliersGridColumnCity}" sort="czech(city)" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">
src/main/webapp/admin/permissions/permissions.zul
+1 -1
View File
@@ -11,7 +11,7 @@
<hbox width="100%">
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" width="300px">
<listhead>
<listheader label="${labels.RightsGridRole}"/>
<listheader label="${labels.RightsGridRole}" />
</listhead>
<template name="model">
<listitem>
src/main/webapp/admin/users/users.zul
+4 -4
View File
@@ -8,10 +8,10 @@
<hbox width="100%" height="500px">
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" width="650px" height="480px">
<listhead menupopup="auto">
<listheader label="${labels.UsersGridColumnLogin}" sort="auto(username)" />
<listheader label="${labels.UsersGridColumnPersonalID}" sort="auto(personalNumber)" />
<listheader label="${labels.UsersGridColumnFirstName}" sort="auto(firstName)" />
<listheader label="${labels.UsersGridColumnSureName}" sort="auto(lastName)" />
<listheader label="${labels.UsersGridColumnLogin}" sort="czech(username)" />
<listheader label="${labels.UsersGridColumnPersonalID}" sort="czech(personalNumber)" />
<listheader label="${labels.UsersGridColumnFirstName}" sort="czech(firstName)" />
<listheader label="${labels.UsersGridColumnSureName}" sort="czech(lastName)" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">
src/main/webapp/buildings/building.zul
+3 -3
View File
@@ -7,9 +7,9 @@
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
<listhead menupopup="auto">
<listheader label="${labels.BuildingsGridColumnCode}" sort="auto(code)" width="10%" />
<listheader label="${labels.BuildingsGridColumnName}" sort="auto(name)" width="30%" />
<listheader label="${labels.BuildingsGridColumnDescription}" sort="auto(description)" width="60%" />
<listheader label="${labels.BuildingsGridColumnCode}" sort="czech(code)" width="10%" />
<listheader label="${labels.BuildingsGridColumnName}" sort="czech(name)" width="30%" />
<listheader label="${labels.BuildingsGridColumnDescription}" sort="czech(description)" width="60%" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">