From e624c2d074d5ccf0b5c604bd7bf2e04afceeabcd Mon Sep 17 00:00:00 2001
From: Franta Pribyl <pribyl.franta@gmail.com>
Date: Fri, 3 Oct 2014 17:47:06 +0200
Subject: [PATCH] =?UTF-8?q?Nastaven=C3=AD=20/=20Administrace=20/=20St?=
 =?UTF-8?q?=C5=99ediska=20/=20komise=20=E2=80=A2=20p=C5=99eform=C3=A1tov?=
 =?UTF-8?q?=C3=A1n=20ZUL=20soubor,=20%=20zm=C4=9Bn=C4=9Bny=20na=20hflex/vf?=
 =?UTF-8?q?lex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #145
---
 .../webapp/admin/workgroups/workgroups.zul    | 122 ++++++++++++------
 1 file changed, 81 insertions(+), 41 deletions(-)

diff --git a/src/main/webapp/admin/workgroups/workgroups.zul b/src/main/webapp/admin/workgroups/workgroups.zul
index 39f92855..1fb7c86f 100644
--- a/src/main/webapp/admin/workgroups/workgroups.zul
+++ b/src/main/webapp/admin/workgroups/workgroups.zul
@@ -1,29 +1,46 @@
 <?page title="${labels.AgendaWorkgroups}" contentType="text/html;charset=UTF-8"?>
 <zk>
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-	<window border="normal" apply="org.zkoss.bind.BindComposer" 
+	<window
+		border="normal"
+		apply="org.zkoss.bind.BindComposer"
 		viewModel="@id('vm') @init('info.bukova.isspst.ui.workgroups.WorkgroupList')"
-		vflex="1">
-		<caption zclass="form-caption" label="${labels.AgendaWorkgroups}" />
+		vflex="1"
+		hflex="1">
+		<caption
+			zclass="form-caption"
+			label="${labels.AgendaWorkgroups}" />
 		<include src="/app/toolbar.zul" />
-
-		<hbox width="100%" vflex="1">
-		
-			<listbox model="@load(vm.dataList)" 
-				selectedItem="@bind(vm.dataBean)"  
-				width="680px" 
+		<hlayout vflex="1">
+			<listbox
+				model="@load(vm.dataList)"
+				selectedItem="@bind(vm.dataBean)"
+				hflex="1"
 				vflex="1">
 				<listhead menupopup="auto">
-					<listheader label="${labels.code}" sort="czech(code)" width="10%" />
-					<listheader label="${labels.name}" sort="czech(name)" width="30%" />
-					<listheader label="${labels.centre}" width="8%"/>
+					<listheader
+						label="${labels.code}"
+						sort="czech(code)"
+						hflex="10" />
+					<listheader
+						label="${labels.name}"
+						sort="czech(name)"
+						hflex="15" />
+					<listheader
+						label="${labels.centre}"
+						hflex="5" />
 				</listhead>
-				 
-				<auxhead sclass="category-center" visible="@load(vm.filter)">
-					 <auxheader>
+				<auxhead
+					sclass="category-center"
+					visible="@load(vm.filter)">
+					<auxheader>
 						<div sclass="find-grid-cell">
 							<div sclass="find-grid-divtextbox">
-								<textbox value="@bind(vm.filterTemplate.code)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+								<textbox
+									value="@bind(vm.filterTemplate.code)"
+									instant="true"
+									onChange="@command('doFilter')"
+									sclass="find-grid-textbox" />
 							</div>
 							<div sclass="find-grid-img">
 								<image src="/img/funnel.png" />
@@ -33,7 +50,11 @@
 					<auxheader>
 						<div sclass="find-grid-cell">
 							<div sclass="find-grid-divtextbox">
-								<textbox value="@bind(vm.filterTemplate.name)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+								<textbox
+									value="@bind(vm.filterTemplate.name)"
+									instant="true"
+									onChange="@command('doFilter')"
+									sclass="find-grid-textbox" />
 							</div>
 							<div sclass="find-grid-img">
 								<image src="/img/funnel.png" />
@@ -43,55 +64,75 @@
 					<auxheader>
 						<div sclass="find-grid-cell">
 							<div sclass="find-grid-divtextbox">
-								<checkbox label="${labels.centre}" checked="@bind(vm.filterTemplate.centre)" onClick="@command('doFilter')"/>	
+								<checkbox
+									label="${labels.centre}"
+									checked="@bind(vm.filterTemplate.centre)"
+									onClick="@command('doFilter')" />
 							</div>
 							<div sclass="find-grid-img">
 								<image src="/img/funnel.png" />
 							</div>
 						</div>
 					</auxheader>
-				</auxhead> 
-				 
+				</auxhead>
 				<template name="model">
 					<listitem>
 						<listcell label="@load(each.code)" />
 						<listcell label="@load(each.name)" />
-						<listcell label="@load(each.centre) @converter(vm.boolConverter)"/>
+						<listcell label="@load(each.centre) @converter(vm.boolConverter)" />
 					</listitem>
 				</template>
 			</listbox>
-			
-			<panel vflex="1">
-				<panelchildren style="overflow:auto;">
-					<vbox>
+			<panel
+				vflex="1"
+				hflex="1">
+				<panelchildren sclass="addScrollbar">
+					<vbox
+						vflex="1"
+						hflex="1">
 						<vbox children="@load(vm.workgroupRoles)">
 							<template name="children">
-								<grid model="@load(vm.dataBean.members)" visible="@load(each.authority ne 'ROLE_USER')">
+								<grid
+									model="@load(vm.dataBean.members)"
+									visible="@load(each.authority ne 'ROLE_USER')">
 									<columns>
-										<column label="@load(each.description)"/>
+										<column label="@load(each.description)" />
 									</columns>
 									<rows>
-										<template name="model" var="member">
+										<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>
+												<hbox>
+													<image src="/img/user-small-red.png" />
+													<label value="@load(member.member.fullName)" />
+												</hbox>
 											</row>
 										</template>
 									</rows>
-								</grid>					
-							</template>			
+								</grid>
+							</template>
 						</vbox>
-						
-						<groupbox mold="3d" closable="false">
-							<caption label="členové"/>
-							<tree hflex="1" model="@load(vm.workgroupTreeModel)">
+						<groupbox
+							mold="3d"
+							closable="false"
+							vflex="1"
+							hflex="1">
+							<caption label="${labels.members}" />
+							<tree
+								hflex="1"
+								vflex="1"
+								model="@load(vm.workgroupTreeModel)">
 								<treecols>
-									<treecol/>
+									<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>
+										<treerow>
+											<treecell
+												image="@load(each.data.person ? '/img/user-small.png' : '/img/commission-small.png')"
+												label="@load(each.data.fullName)" />
+										</treerow>
 									</treeitem>
 								</template>
 							</tree>
@@ -99,7 +140,6 @@
 					</vbox>
 				</panelchildren>
 			</panel>
-			
-		</hbox>
+		</hlayout>
 	</window>
 </zk>
\ No newline at end of file