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

Přepracována struktura hlavního menu.

Browse Source
This commit is contained in:
František Přibyl
2014-06-13 12:06:31 +02:00
parent c440c65afd
commit 2547134420
16 changed files with 171 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/ui/NavigationVM.java
+7
View File
@@ -46,4 +46,11 @@ public class NavigationVM {
return moduleUrl.contains("passwd"); return moduleUrl.contains("passwd");
} }
public boolean isLists() {
return moduleUrl.contains("lists");
}
public boolean isRequirements() {
return moduleUrl.contains("requirements");
}
} }
src/main/webapp/WEB-INF/locales/zk-label.properties
+15
View File
@@ -1,6 +1,19 @@
# Default file # Default file
AppName=Objednávkový systém SPŠ Třebíč AppName=Objednávkový systém SPŠ Třebíč
MenuRequirements=Požadavky
MenuOrders=Objednávky
MenuLists=Seznamy
MenuSettings=Nastavení
MenuAdministration=Administrace
MenuUser=Uživatel
AgendaMyRequirements=Aktuální
AgendaRequirementsHistory=Ukončené
AgendaMyOrders=Aktuální
AgendaOrdersHistory=Ukončené
AgendaMUnits=Měrné jednotky AgendaMUnits=Měrné jednotky
MUnitsFormTitle=Měrná jednotka MUnitsFormTitle=Měrná jednotka
MUnitsFormCode=Kód MUnitsFormCode=Kód
@@ -19,6 +32,8 @@ BuildingsGridColumnCode=Kód
BuildingsGridColumnName=Název BuildingsGridColumnName=Název
BuildingsGridColumnDescription=Popis BuildingsGridColumnDescription=Popis
AgendaRooms=Místnosti
AgendaRights=Práva AgendaRights=Práva
RightsFormTitle=Práva RightsFormTitle=Práva
RightsGridRole=Role RightsGridRole=Role
src/main/webapp/app/navigation.zul
+24 -13
View File
@@ -6,24 +6,39 @@
<tabbox mold="accordion" apply="org.zkoss.bind.BindComposer" <tabbox mold="accordion" apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.NavigationVM')"> viewModel="@id('vm') @init('info.bukova.isspst.ui.NavigationVM')">
<tabs> <tabs>
<tab id="orders" label="Objednávky" selected="@load(vm.orders)"/> <tab id="requirements" label="${labels.MenuRequirements}" selected="@load(vm.requirements)"/>
<tab id="settings" label="Nastavení" selected="@load(vm.settings)"/> <tab id="orders" label="${labels.MenuOrders}" selected="@load(vm.orders)"/>
<tab id="admin" label="Administrace" selected="@load(vm.admin)"/> <tab id="lists" label="${labels.MenuLists}" selected="@load(vm.lists)"/>
<tab id="user" label="Uživatel" selected="@load(vm.user)"/> <tab id="settings" label="${labels.MenuSettings}" selected="@load(vm.settings)"/>
<tab id="admin" label="${labels.MenuAdministration}" selected="@load(vm.admin)"/>
<tab id="user" label="${labels.MenuUser}" selected="@load(vm.user)"/>
</tabs> </tabs>
<tabpanels hflex="1"> <tabpanels hflex="1">
<tabpanel> <tabpanel>
<menubar orient="vertical"> <menubar orient="vertical">
<menuitem label="Moje" href="/orders/my" width="120px"/> <menuitem label="${labels.AgendaMyRequirements}" href="/requirements/actual" />
<menuitem label="Ke schválení" href="/orders/approve"/> <menuitem label="${labels.AgendaRequirementsHistory}" href="/requirements/history" />
</menubar> </menubar>
</tabpanel> </tabpanel>
<tabpanel> <tabpanel>
<menubar orient="vertical"> <menubar orient="vertical">
<menuitem label="${labels.AgendaMUnits}" href="/munits" disabled="${not sec:isAllGranted('PERM_READ_MUNITS')}" width="120px"/> <menuitem label="${labels.AgendaMyOrders}" href="/orders/actual" />
<menuitem label="${labels.AgendaOrdersHistory}" href="/orders/history" />
</menubar>
</tabpanel>
<tabpanel>
<menubar orient="vertical">
<menuitem label="${labels.AgendaSuppliers}" href="/lists/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}"/>
<menuitem label="${labels.AgendaMaterial}" href="/lists/material" disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}"/>
<menuitem label="${labels.AgendaMUnits}" href="/lists/munits" disabled="${not sec:isAllGranted('PERM_READ_MUNITS')}" width="120px"/>
<menuitem label="${labels.AgendaBuildings}" href="/lists/buildings" disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
<menuitem label="${labels.AgendaRooms}" href="/lists/rooms" disabled="${not sec:isAllGranted('PERM_READ_ROOMS')}" />
</menubar>
</tabpanel>
<tabpanel>
<menubar orient="vertical">
<menuitem label="Limity částek"/>
<menuitem label="E-maily" /> <menuitem label="E-maily" />
<menuitem label="Další"/>
<menuitem label="Položka"/>
</menubar> </menubar>
</tabpanel> </tabpanel>
<tabpanel> <tabpanel>
@@ -31,10 +46,6 @@
<menuitem label="${labels.AgendaUsers}" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}" width="120px"/> <menuitem label="${labels.AgendaUsers}" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}" width="120px"/>
<menuitem label="Práva" href="/admin/permissions" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/> <menuitem label="Práva" href="/admin/permissions" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
<menuitem label="Střediska" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/> <menuitem label="Střediska" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
<menuitem label="${labels.AgendaBuildings}" href="/buildings" disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
<menuitem label="Místnosti" href="/admin/users"/>
<menuitem label="${labels.AgendaMaterial}" href="/material" disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}"/>
<menuitem label="Dodavatelé" href="/admin/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}"/>
</menubar> </menubar>
</tabpanel> </tabpanel>
<tabpanel> <tabpanel>
src/main/webapp/admin/addressbook/addrFindResult.zul → src/main/webapp/lists/addressbook/addrFindResult.zul
View File
src/main/webapp/admin/addressbook/address.zul → src/main/webapp/lists/addressbook/address.zul
View File
src/main/webapp/admin/addressbook/addressbook.zul → src/main/webapp/lists/addressbook/addressbook.zul
+125 -125
View File
@@ -1,126 +1,126 @@
<?page title="${labels.AgendaSuppliers}" contentType="text/html;charset=UTF-8"?> <?page title="${labels.AgendaSuppliers}" 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" height="570px" viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressList')"> <window border="normal" apply="org.zkoss.bind.BindComposer" height="570px" viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressList')">
<caption zclass="form-caption" label="${labels.AgendaSuppliers}" /> <caption zclass="form-caption" label="${labels.AgendaSuppliers}" />
<include src="/app/toolbar.zul" /> <include src="/app/toolbar.zul" />
<hbox width="100%"> <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"> <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"> <listhead vflex="true" menupopup="auto">
<listheader label="${labels.SuppliersGridColumnCompany}" sort="czech(company)" /> <listheader label="${labels.SuppliersGridColumnCompany}" sort="czech(company)" />
<listheader label="${labels.SuppliersGridColumnIC}" sort="auto(ic)" width="100px" /> <listheader label="${labels.SuppliersGridColumnIC}" sort="auto(ic)" width="100px" />
<listheader label="${labels.SuppliersGridColumnContact}" sort="czech(contactName)" /> <listheader label="${labels.SuppliersGridColumnContact}" sort="czech(contactName)" />
<listheader label="${labels.SuppliersGridColumnStreet}" sort="czech(street)" /> <listheader label="${labels.SuppliersGridColumnStreet}" sort="czech(street)" />
<listheader label="${labels.SuppliersGridColumnNo}" sort="czech(houseNumber)" width="80px" /> <listheader label="${labels.SuppliersGridColumnNo}" sort="czech(houseNumber)" width="80px" />
<listheader label="${labels.SuppliersGridColumnCity}" sort="czech(city)" /> <listheader label="${labels.SuppliersGridColumnCity}" sort="czech(city)" />
</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">
<div sclass="find-grid-divtextbox"> <div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.company)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox value="@bind(vm.filterTemplate.company)" 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" />
</div> </div>
</div> </div>
</auxheader> </auxheader>
<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.ic)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox value="@bind(vm.filterTemplate.ic)" 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" />
</div> </div>
</div> </div>
</auxheader> </auxheader>
<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.contactName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox value="@bind(vm.filterTemplate.contactName)" 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" />
</div> </div>
</div> </div>
</auxheader> </auxheader>
<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.street)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox value="@bind(vm.filterTemplate.street)" 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" />
</div> </div>
</div> </div>
</auxheader> </auxheader>
<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.houseNumber)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox value="@bind(vm.filterTemplate.houseNumber)" 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" />
</div> </div>
</div> </div>
</auxheader> </auxheader>
<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.city)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" /> <textbox value="@bind(vm.filterTemplate.city)" 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" />
</div> </div>
</div> </div>
</auxheader> </auxheader>
</auxhead> </auxhead>
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell label="@load(each.company)" /> <listcell label="@load(each.company)" />
<listcell label="@load(each.ic)" /> <listcell label="@load(each.ic)" />
<listcell label="@load(each.contactName)" /> <listcell label="@load(each.contactName)" />
<listcell label="@load(each.street)" /> <listcell label="@load(each.street)" />
<listcell label="@load(each.houseNumber)" /> <listcell label="@load(each.houseNumber)" />
<listcell label="@load(each.city)" /> <listcell label="@load(each.city)" />
</listitem> </listitem>
</template> </template>
</listbox> </listbox>
<div hflex="4"> <div hflex="4">
<label value="${labels.SuppliersGridColumnDetail}:" sclass="bold" /> <label value="${labels.SuppliersGridColumnDetail}:" sclass="bold" />
<grid visible="@load(vm.dataBean ne null)" hflex="1"> <grid visible="@load(vm.dataBean ne null)" hflex="1">
<columns> <columns>
<column hflex="min" /> <column hflex="min" />
<column /> <column />
</columns> </columns>
<rows> <rows>
<row> <row>
<label value="${labels.SuppliersGridColumnDepartment}" /> <label value="${labels.SuppliersGridColumnDepartment}" />
<label value="@load(vm.dataBean.department)" /> <label value="@load(vm.dataBean.department)" />
</row> </row>
<row> <row>
<label value="${labels.SuppliersGridColumnPhone}" /> <label value="${labels.SuppliersGridColumnPhone}" />
<label value="@load(vm.dataBean.phone)" /> <label value="@load(vm.dataBean.phone)" />
</row> </row>
<row> <row>
<label value="${labels.SuppliersGridColumnEmail}" /> <label value="${labels.SuppliersGridColumnEmail}" />
<label value="@load(vm.dataBean.email)" /> <label value="@load(vm.dataBean.email)" />
</row> </row>
<row> <row>
<label value="${labels.SuppliersGridColumnWWW}" /> <label value="${labels.SuppliersGridColumnWWW}" />
<label value="@load(vm.dataBean.web)" /> <label value="@load(vm.dataBean.web)" />
</row> </row>
</rows> </rows>
</grid> </grid>
<label value="${labels.SuppliersGridColumnNote}:" visible="@load(not empty vm.dataBean.description)" sclass="bold" /> <label value="${labels.SuppliersGridColumnNote}:" visible="@load(not empty vm.dataBean.description)" sclass="bold" />
<html style="font-family:arial,sans-serif;font-size:12px;" content="@load(vm.dataBean.description)" /> <html style="font-family:arial,sans-serif;font-size:12px;" content="@load(vm.dataBean.description)" />
<mapa address="@load((empty vm.dataBean.street ? vm.dataBean.city : vm.dataBean.street).concat(' ').concat(vm.dataBean.houseNumber).concat(', ').concat(vm.dataBean.city))" width="100%" height="300px" visible="@load(vm.dataBean ne null)" /> <mapa address="@load((empty vm.dataBean.street ? vm.dataBean.city : vm.dataBean.street).concat(' ').concat(vm.dataBean.houseNumber).concat(', ').concat(vm.dataBean.city))" width="100%" height="300px" visible="@load(vm.dataBean ne null)" />
</div> </div>
</hbox> </hbox>
</window> </window>
</zk> </zk>
src/main/webapp/admin/addressbook/index.zul → src/main/webapp/lists/addressbook/index.zul
View File
src/main/webapp/buildings/building.zul → src/main/webapp/lists/buildings/building.zul
View File
src/main/webapp/buildings/buildingForm.zul → src/main/webapp/lists/buildings/buildingForm.zul
View File
src/main/webapp/buildings/index.zul → src/main/webapp/lists/buildings/index.zul
View File
src/main/webapp/material/index.zul → src/main/webapp/lists/material/index.zul
View File
src/main/webapp/material/material.zul → src/main/webapp/lists/material/material.zul
View File
src/main/webapp/material/materialForm.zul → src/main/webapp/lists/material/materialForm.zul
View File
src/main/webapp/munits/index.zul → src/main/webapp/lists/munits/index.zul
View File
src/main/webapp/munits/munitsForm.zul → src/main/webapp/lists/munits/munitsForm.zul
View File
src/main/webapp/munits/munitsGrid.zul → src/main/webapp/lists/munits/munitsGrid.zul
View File