From 0c7c3af4723b025c20f8b444ae7dd8cb8135df51 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Tue, 26 Aug 2014 15:11:46 +0200
Subject: [PATCH] =?UTF-8?q?Upraveno=20zobrazen=C3=AD=20oken=20ve=20zbytku?=
 =?UTF-8?q?=20agend=20-=20grid=20se=20roztahuje=20na=20v=C3=BD=C5=A1ku=20o?=
 =?UTF-8?q?brazovky.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/admin/permissions/permissions.zul  | 14 ++--
 src/main/webapp/admin/users/users.zul         | 14 +++-
 .../webapp/admin/workgroups/workgroups.zul    | 81 ++++++++++---------
 .../webapp/lists/addressbook/addressbook.zul  | 12 ++-
 4 files changed, 73 insertions(+), 48 deletions(-)

diff --git a/src/main/webapp/admin/permissions/permissions.zul b/src/main/webapp/admin/permissions/permissions.zul
index c3a1ca7b..11d1f588 100644
--- a/src/main/webapp/admin/permissions/permissions.zul
+++ b/src/main/webapp/admin/permissions/permissions.zul
@@ -1,15 +1,19 @@
 <?page title="${labels.AgendaRights}" contentType="text/html;charset=UTF-8"?>
 <zk>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-<window border="normal" apply="org.zkoss.bind.BindComposer"
-	viewModel="@id('vm') @init('info.bukova.isspst.ui.users.PermissionsList')" height="570px">
+<window border="normal" 
+	apply="org.zkoss.bind.BindComposer"
+	viewModel="@id('vm') @init('info.bukova.isspst.ui.users.PermissionsList')" 
+	vflex="1">
 	<caption zclass="form-caption" label="${labels.AgendaRights}" />
 	<toolbar>
 		<toolbarbutton image="/img/edit.png" tooltiptext="${labels.ToolbarRecEdit}" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
 	</toolbar>
 	
-	<hbox width="100%">	
-	<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" width="300px">
+	<hbox width="100%" vflex="1">	
+	<listbox model="@load(vm.dataList)" 
+		selectedItem="@bind(vm.dataBean)" 
+		width="300px">
 		<listhead>
 			<listheader label="${labels.RightsGridRole}" />
 		</listhead>
@@ -19,7 +23,7 @@
 			</listitem>
 		</template>
 	</listbox>
-	<panel hflex="1" height="480px">
+	<panel hflex="1" vflex="1">
 		<panelchildren style="overflow:auto;">
 			<label value="${labels.RightsGridModules}:" style="font-weight: bold;"/>
 			<vbox children="@load(vm.modules)" hflex="1">
diff --git a/src/main/webapp/admin/users/users.zul b/src/main/webapp/admin/users/users.zul
index 81ef6c55..93f82af6 100644
--- a/src/main/webapp/admin/users/users.zul
+++ b/src/main/webapp/admin/users/users.zul
@@ -1,12 +1,18 @@
 <?page title="${labels.AgendaUsers}" contentType="text/html;charset=UTF-8"?>
 <zk>
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-	<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.users.UsersList')" height="570px">
+	<window border="normal" 
+		apply="org.zkoss.bind.BindComposer" 
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.users.UsersList')" 
+		vflex="1">
 		<caption zclass="form-caption" label="${labels.AgendaUsers}" />
 		<include src="/app/toolbar.zul" />
 
-		<hbox width="100%" height="500px">
-			<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" width="650px" height="480px">
+		<hbox width="100%" vflex="1">
+			<listbox model="@load(vm.dataList)" 
+				selectedItem="@bind(vm.dataBean)" 
+				width="650px" 
+				vflex="1">
 				<listhead menupopup="auto">
 					<listheader label="${labels.UsersGridColumnLogin}" sort="czech(username)" />
 					<listheader label="${labels.UsersGridColumnPersonalID}" sort="czech(personalNumber)" />
@@ -66,7 +72,7 @@
 					</listitem>
 				</template>
 			</listbox>
-			<panel hflex="1" height="480px" width="70%">
+			<panel hflex="1" vflex="1" width="70%">
 				<panelchildren style="overflow:auto;">
 					<label value="Efektivní práva:" style="font-weight: bold;" />
 					<vbox children="@load(vm.modules)" hflex="1">
diff --git a/src/main/webapp/admin/workgroups/workgroups.zul b/src/main/webapp/admin/workgroups/workgroups.zul
index 1826fcda..39f92855 100644
--- a/src/main/webapp/admin/workgroups/workgroups.zul
+++ b/src/main/webapp/admin/workgroups/workgroups.zul
@@ -2,13 +2,17 @@
 <zk>
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 	<window border="normal" apply="org.zkoss.bind.BindComposer" 
-	viewModel="@id('vm') @init('info.bukova.isspst.ui.workgroups.WorkgroupList')">
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.workgroups.WorkgroupList')"
+		vflex="1">
 		<caption zclass="form-caption" label="${labels.AgendaWorkgroups}" />
 		<include src="/app/toolbar.zul" />
 
-		<hbox width="100%" height="500px">
+		<hbox width="100%" vflex="1">
 		
-			<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)"  width="680px" height="480px">
+			<listbox model="@load(vm.dataList)" 
+				selectedItem="@bind(vm.dataBean)"  
+				width="680px" 
+				vflex="1">
 				<listhead menupopup="auto">
 					<listheader label="${labels.code}" sort="czech(code)" width="10%" />
 					<listheader label="${labels.name}" sort="czech(name)" width="30%" />
@@ -57,40 +61,45 @@
 				</template>
 			</listbox>
 			
-			<vbox>
-				<vbox children="@load(vm.workgroupRoles)">
-					<template name="children">
-						<grid model="@load(vm.dataBean.members)" visible="@load(each.authority ne 'ROLE_USER')">
-							<columns>
-								<column label="@load(each.description)"/>
-							</columns>
-							<rows>
-								<template name="model" var="member">
-									<row visible="@load(member.role eq each)">
-										<hbox><image src="/img/user-small-red.png"/><label value="@load(member.member.fullName)"/></hbox>
-									</row>
+			<panel vflex="1">
+				<panelchildren style="overflow:auto;">
+					<vbox>
+						<vbox children="@load(vm.workgroupRoles)">
+							<template name="children">
+								<grid model="@load(vm.dataBean.members)" visible="@load(each.authority ne 'ROLE_USER')">
+									<columns>
+										<column label="@load(each.description)"/>
+									</columns>
+									<rows>
+										<template name="model" var="member">
+											<row visible="@load(member.role eq each)">
+												<hbox><image src="/img/user-small-red.png"/><label value="@load(member.member.fullName)"/></hbox>
+											</row>
+										</template>
+									</rows>
+								</grid>					
+							</template>			
+						</vbox>
+						
+						<groupbox mold="3d" closable="false">
+							<caption label="členové"/>
+							<tree hflex="1" model="@load(vm.workgroupTreeModel)">
+								<treecols>
+									<treecol/>
+								</treecols>
+								<template name="model">
+									<treeitem>
+									<treerow>
+										<treecell image="@load(each.data.person ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(each.data.fullName)"/>
+									</treerow>
+									</treeitem>
 								</template>
-							</rows>
-						</grid>					
-					</template>			
-				</vbox>
-				
-				<groupbox mold="3d" closable="false">
-					<caption label="členové"/>
-					<tree hflex="1" model="@load(vm.workgroupTreeModel)">
-						<treecols>
-							<treecol/>
-						</treecols>
-						<template name="model">
-							<treeitem>
-							<treerow>
-								<treecell image="@load(each.data.person ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(each.data.fullName)"/>
-							</treerow>
-							</treeitem>
-						</template>
-					</tree>
-				</groupbox>
-			</vbox>
+							</tree>
+						</groupbox>
+					</vbox>
+				</panelchildren>
+			</panel>
+			
 		</hbox>
 	</window>
 </zk>
\ No newline at end of file
diff --git a/src/main/webapp/lists/addressbook/addressbook.zul b/src/main/webapp/lists/addressbook/addressbook.zul
index 9247c8f6..d339570d 100644
--- a/src/main/webapp/lists/addressbook/addressbook.zul
+++ b/src/main/webapp/lists/addressbook/addressbook.zul
@@ -1,12 +1,18 @@
 <?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')">
+	<window border="normal" apply="org.zkoss.bind.BindComposer" vflex="1" 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">
+		<hbox width="100%" vflex="1">
+			<listbox id="dataGrid" 
+				model="@load(vm.dataList)" 
+				selectedItem="@bind(vm.dataBean)" 
+				onAfterRender="@command('afterRender')" 
+				selectedIndex="@load(vm.selIndex)" 
+				hflex="6" 
+				vflex="1">
 				<listhead vflex="true" menupopup="auto">
 					<listheader label="${labels.SuppliersGridColumnCompany}" sort="czech(company)" />
 					<listheader label="${labels.SuppliersGridColumnIC}" sort="auto(ic)" width="100px" />