From f299b8604c59402ff8e2d0cffb8b44705b7e03c8 Mon Sep 17 00:00:00 2001
From: Franta Pribyl <pribyl.franta@gmail.com>
Date: Mon, 26 May 2014 13:13:06 +0200
Subject: [PATCH] =?UTF-8?q?Sjednoceny=20hlavi=C4=8Dky=20pro=20filtrov?=
 =?UTF-8?q?=C3=A1n=C3=AD=20z=C3=A1znam=C5=AF.=20Header=20p=C5=99eform?=
 =?UTF-8?q?=C3=A1tov=C3=A1n=20a=20texty=20na=C4=8D=C3=ADt=C3=A1ny=20z=20la?=
 =?UTF-8?q?bels.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #77
---
 .../webapp/admin/addressbook/addressbook.zul  | 96 ++++++++++++-------
 src/main/webapp/admin/users/users.zul         | 62 ++++++++----
 src/main/webapp/app/header.zul                |  5 +-
 src/main/webapp/app/template.zhtml            | 24 ++---
 src/main/webapp/buildings/building.zul        |  2 +
 src/main/webapp/css/page.css                  | 12 +--
 src/main/webapp/css/zk-modify.css             | 10 ++
 7 files changed, 132 insertions(+), 79 deletions(-)

diff --git a/src/main/webapp/admin/addressbook/addressbook.zul b/src/main/webapp/admin/addressbook/addressbook.zul
index a6a9f715..2338f14b 100644
--- a/src/main/webapp/admin/addressbook/addressbook.zul
+++ b/src/main/webapp/admin/addressbook/addressbook.zul
@@ -10,38 +10,6 @@
     <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">
-		<auxhead sclass="category-center" visible="@load(vm.filter)">
-            <auxheader>
-                <image src="/img/funnel.png" />
-                <textbox instant="true" width="85%" 
-                    value="@bind(vm.filterTemplate.company)" onChange="@command('doFilter')" />
-            </auxheader>
-            <auxheader>
-                <image src="/img/funnel.png" />
-                <textbox instant="true" width="85%" 
-                    value="@bind(vm.filterTemplate.ic)" onChange="@command('doFilter')" />
-            </auxheader>
-            <auxheader>
-            	<image src="/img/funnel.png" />
-                <textbox instant="true"  width="85%"
-                    value="@bind(vm.filterTemplate.contactName)" onChange="@command('doFilter')"/>
-            </auxheader>
-            <auxheader>
-            	<image src="/img/funnel.png" />
-                <textbox instant="true" width="85%"
-                    value="@bind(vm.filterTemplate.street)" onChange="@command('doFilter')"/>
-            </auxheader>
-            <auxheader>
-            	<image src="/img/funnel.png" />
-                <textbox instant="true" width="85%"
-                    value="@bind(vm.filterTemplate.houseNumber)" onChange="@command('doFilter')"/>
-            </auxheader>
-            <auxheader>
-            	<image src="/img/funnel.png" />
-                <textbox instant="true" width="85%"
-                    value="@bind(vm.filterTemplate.city)" onChange="@command('doFilter')"/>
-            </auxheader>
-        </auxhead>
 		<listhead vflex="true">
 			<listheader label="Firma" sort="auto(company)" onSort="@command('onSort', column='company')" />
 			<listheader label="IČ" width="100px"/>
@@ -50,6 +18,70 @@
 			<listheader label="Číslo domu" width="80px"/>
 			<listheader label="Město" sort="auto(city)" onSort="@command('onSort', column='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)"/>
diff --git a/src/main/webapp/admin/users/users.zul b/src/main/webapp/admin/users/users.zul
index 9e25d1cd..8821eea7 100644
--- a/src/main/webapp/admin/users/users.zul
+++ b/src/main/webapp/admin/users/users.zul
@@ -8,30 +8,56 @@
 	
 	<hbox width="100%" height="500px">	
 	<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" width="650px" height="480px">
-		<auxhead sclass="category-center" visible="@load(vm.filter)">
-            <auxheader>
-            	<image src="/img/funnel.png" />
-            	<textbox value="@bind(vm.filterTemplate.username)" instant="true" onChange="@command('doFilter')"/>
-            </auxheader>
-            <auxheader>
-            	<image src="/img/funnel.png" />
-            	<textbox value="@bind(vm.filterTemplate.personalNumber)" instant="true" onChange="@command('doFilter')"/>
-            </auxheader>
-            <auxheader>
-            	<image src="/img/funnel.png" />
-            	<textbox value="@bind(vm.filterTemplate.firstName)" instant="true" onChange="@command('doFilter')"/>
-            </auxheader>
-            <auxheader>
-            	<image src="/img/funnel.png" />
-            	<textbox value="@bind(vm.filterTemplate.lastName)" instant="true" onChange="@command('doFilter')"/>
-            </auxheader>
-        </auxhead>
 		<listhead>
 			<listheader label="Login"/>
 			<listheader label="Osobní číslo"/>
 			<listheader label="Jméno"/>
 			<listheader label="Příjmení"/>
 		</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.username)" 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.personalNumber)" 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.firstName)" 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.lastName)" 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.username)"/>
diff --git a/src/main/webapp/app/header.zul b/src/main/webapp/app/header.zul
index c77ef762..e326e955 100644
--- a/src/main/webapp/app/header.zul
+++ b/src/main/webapp/app/header.zul
@@ -1,7 +1,4 @@
 <?page title="${labels.HeaderText}" contentType="text/html;charset=UTF-8"?>
 <zk>
-	<style src="/css/page.css"/>
-	<div id="header">
-		${labels.AppName}
-	</div>
+	<div sclass="header-content" xmlns="xhtml">${labels.AppName}</div>
 </zk>
\ No newline at end of file
diff --git a/src/main/webapp/app/template.zhtml b/src/main/webapp/app/template.zhtml
index 5c9bf1ef..1992abbd 100644
--- a/src/main/webapp/app/template.zhtml
+++ b/src/main/webapp/app/template.zhtml
@@ -40,24 +40,18 @@
 			}
 		});
 		</script>
-		
+
 	<div id="container">
 		<div id="header">
-			Objednávkový systém SPŠ Třebíč
+			<u:include src="/app/header.zul" />
 		</div>
-
-	<div id="leftcolumn">
-		<u:include src="/app/navigation.zul"/>
-	</div>
-
-	<div id="maincolumn">
-		
-		<u:include src="${gridZul}"/>
-	</div>
-                
-	<div id="footer">Footer
-
-	</div>
+		<div id="leftcolumn">
+			<u:include src="/app/navigation.zul" />
+		</div>
+		<div id="maincolumn">
+			<u:include src="${gridZul}" />
+		</div>
+		<div id="footer">Footer</div>
 	</div>
 
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/buildings/building.zul b/src/main/webapp/buildings/building.zul
index 9ad44adc..09876516 100644
--- a/src/main/webapp/buildings/building.zul
+++ b/src/main/webapp/buildings/building.zul
@@ -11,6 +11,7 @@
 				<listheader label="${labels.BuildingsGridColumnName}" sort="auto(name)" onSort="@command('onSort', column='name')" width="30%" />
 				<listheader label="${labels.BuildingsGridColumnDescription}" sort="auto(description)" onSort="@command('onSort', column='description')" width="60%" />
 			</listhead>
+			
 			<auxhead sclass="category-center" visible="@load(vm.filter)">
 				<auxheader>
 					<div sclass="find-grid-cell">
@@ -43,6 +44,7 @@
 					</div>
 				</auxheader>
 			</auxhead>
+			
 			<template name="model">
 				<listitem>
 					<listcell label="@load(each.code)" />
diff --git a/src/main/webapp/css/page.css b/src/main/webapp/css/page.css
index 91072ff4..1a11b2d7 100644
--- a/src/main/webapp/css/page.css
+++ b/src/main/webapp/css/page.css
@@ -2,7 +2,6 @@ html {
 	/*vertical scrollbar allways visible */
 	overflow: -moz-scrollbars-vertical;
 	overflow-y: scroll;
-	
 	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
@@ -13,16 +12,9 @@ html {
 
 #header {
 	width: auto;
-	height: 40px;
+	height: 60px;
 	border: 1px solid #ccc;
-	padding: 10px;
-	background: url("/isspst/img/header-bg.png") 50% 0 repeat-x;
-	
-	color: #ffffff;
-	font-size: 35px;
-	font-weight: bold;
-	text-align: center;
-	text-shadow: 2px 2px 2px #000000;
+
 }
 
 #leftcolumn {
diff --git a/src/main/webapp/css/zk-modify.css b/src/main/webapp/css/zk-modify.css
index 84a1f57a..a21baef4 100644
--- a/src/main/webapp/css/zk-modify.css
+++ b/src/main/webapp/css/zk-modify.css
@@ -1,3 +1,13 @@
+.header-content {
+	padding: 10px;
+	background: url("/isspst/img/header-bg.png") 50% 0 repeat-x;
+	color: #ffffff;
+	font-size: 35px;
+	font-weight: bold;
+	text-align: center;
+	text-shadow: 2px 2px 2px #000000;
+}
+
 .find-grid-cell {
 	display: table;
 	width: 100%;