Přepracována struktura hlavního menu.

src/main/java/info/bukova/isspst/ui/NavigationVM.java

@@ -46,4 +46,11 @@ public class NavigationVM {
 		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

@@ -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

src/main/webapp/app/navigation.zul

@@ -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="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>
 	<tabpanels hflex="1">
 		<tabpanel>
 			<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>
 		</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>