Merge branch 'master' of https://git.bukova.info/repos/git/isspst

2014-05-26 21:45:46 +02:00
parent 25a4d2dfb7 f299b8604c
commit 0f9d1baf94
7 changed files with 132 additions and 79 deletions
@@ -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>
@@ -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>