Přepracována struktura hlavního menu.
This commit is contained in:
@@ -1,6 +1,19 @@
|
||||
# Default file
|
||||
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
|
||||
MUnitsFormTitle=Měrná jednotka
|
||||
MUnitsFormCode=Kód
|
||||
@@ -19,6 +32,8 @@ BuildingsGridColumnCode=Kód
|
||||
BuildingsGridColumnName=Název
|
||||
BuildingsGridColumnDescription=Popis
|
||||
|
||||
AgendaRooms=Místnosti
|
||||
|
||||
AgendaRights=Práva
|
||||
RightsFormTitle=Práva
|
||||
RightsGridRole=Role
|
||||
|
||||
@@ -6,24 +6,39 @@
|
||||
<tabbox mold="accordion" apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.NavigationVM')">
|
||||
<tabs>
|
||||
<tab id="orders" label="Objednávky" selected="@load(vm.orders)"/>
|
||||
<tab id="settings" label="Nastavení" selected="@load(vm.settings)"/>
|
||||
<tab id="admin" label="Administrace" selected="@load(vm.admin)"/>
|
||||
<tab id="user" label="Uživatel" selected="@load(vm.user)"/>
|
||||
<tab id="requirements" label="${labels.MenuRequirements}" selected="@load(vm.requirements)"/>
|
||||
<tab id="orders" label="${labels.MenuOrders}" selected="@load(vm.orders)"/>
|
||||
<tab id="lists" label="${labels.MenuLists}" selected="@load(vm.lists)"/>
|
||||
<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>
|
||||
<tabpanels hflex="1">
|
||||
<tabpanel>
|
||||
<menubar orient="vertical">
|
||||
<menuitem label="Moje" href="/orders/my" width="120px"/>
|
||||
<menuitem label="Ke schválení" href="/orders/approve"/>
|
||||
<menuitem label="${labels.AgendaMyRequirements}" href="/requirements/actual" />
|
||||
<menuitem label="${labels.AgendaRequirementsHistory}" href="/requirements/history" />
|
||||
</menubar>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
<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="Další"/>
|
||||
<menuitem label="Položka"/>
|
||||
</menubar>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
@@ -31,10 +46,6 @@
|
||||
<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="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>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
|
||||
+125
-125
@@ -1,126 +1,126 @@
|
||||
<?page title="${labels.AgendaSuppliers}" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<?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')">
|
||||
<caption zclass="form-caption" label="${labels.AgendaSuppliers}" />
|
||||
<include src="/app/toolbar.zul" />
|
||||
|
||||
<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="czech(company)" />
|
||||
<listheader label="${labels.SuppliersGridColumnIC}" sort="auto(ic)" width="100px" />
|
||||
<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)">
|
||||
<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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</auxheader>
|
||||
</auxhead>
|
||||
|
||||
<template name="model">
|
||||
<listitem>
|
||||
<listcell label="@load(each.company)" />
|
||||
<listcell label="@load(each.ic)" />
|
||||
<listcell label="@load(each.contactName)" />
|
||||
<listcell label="@load(each.street)" />
|
||||
<listcell label="@load(each.houseNumber)" />
|
||||
<listcell label="@load(each.city)" />
|
||||
</listitem>
|
||||
</template>
|
||||
</listbox>
|
||||
|
||||
<div hflex="4">
|
||||
<label value="${labels.SuppliersGridColumnDetail}:" sclass="bold" />
|
||||
<grid visible="@load(vm.dataBean ne null)" hflex="1">
|
||||
<columns>
|
||||
<column hflex="min" />
|
||||
<column />
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="${labels.SuppliersGridColumnDepartment}" />
|
||||
<label value="@load(vm.dataBean.department)" />
|
||||
</row>
|
||||
<row>
|
||||
<label value="${labels.SuppliersGridColumnPhone}" />
|
||||
<label value="@load(vm.dataBean.phone)" />
|
||||
</row>
|
||||
<row>
|
||||
<label value="${labels.SuppliersGridColumnEmail}" />
|
||||
<label value="@load(vm.dataBean.email)" />
|
||||
</row>
|
||||
<row>
|
||||
<label value="${labels.SuppliersGridColumnWWW}" />
|
||||
<label value="@load(vm.dataBean.web)" />
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<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)" />
|
||||
<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>
|
||||
</hbox>
|
||||
</window>
|
||||
<?page title="${labels.AgendaSuppliers}" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<?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')">
|
||||
<caption zclass="form-caption" label="${labels.AgendaSuppliers}" />
|
||||
<include src="/app/toolbar.zul" />
|
||||
|
||||
<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="czech(company)" />
|
||||
<listheader label="${labels.SuppliersGridColumnIC}" sort="auto(ic)" width="100px" />
|
||||
<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)">
|
||||
<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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</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" />
|
||||
</div>
|
||||
</div>
|
||||
</auxheader>
|
||||
</auxhead>
|
||||
|
||||
<template name="model">
|
||||
<listitem>
|
||||
<listcell label="@load(each.company)" />
|
||||
<listcell label="@load(each.ic)" />
|
||||
<listcell label="@load(each.contactName)" />
|
||||
<listcell label="@load(each.street)" />
|
||||
<listcell label="@load(each.houseNumber)" />
|
||||
<listcell label="@load(each.city)" />
|
||||
</listitem>
|
||||
</template>
|
||||
</listbox>
|
||||
|
||||
<div hflex="4">
|
||||
<label value="${labels.SuppliersGridColumnDetail}:" sclass="bold" />
|
||||
<grid visible="@load(vm.dataBean ne null)" hflex="1">
|
||||
<columns>
|
||||
<column hflex="min" />
|
||||
<column />
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="${labels.SuppliersGridColumnDepartment}" />
|
||||
<label value="@load(vm.dataBean.department)" />
|
||||
</row>
|
||||
<row>
|
||||
<label value="${labels.SuppliersGridColumnPhone}" />
|
||||
<label value="@load(vm.dataBean.phone)" />
|
||||
</row>
|
||||
<row>
|
||||
<label value="${labels.SuppliersGridColumnEmail}" />
|
||||
<label value="@load(vm.dataBean.email)" />
|
||||
</row>
|
||||
<row>
|
||||
<label value="${labels.SuppliersGridColumnWWW}" />
|
||||
<label value="@load(vm.dataBean.web)" />
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<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)" />
|
||||
<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>
|
||||
</hbox>
|
||||
</window>
|
||||
</zk>
|
||||
Reference in New Issue
Block a user