Sjednocena práce s CSS soubory.

src/main/webapp/WEB-INF/zk-label.properties

@@ -1,4 +1,6 @@
 # Default file
+AppName=Objednávkový systém SPŠ Třebíč
+
 AgendaBuildings=Budovy
 
 BuildingsFormCode=Kód
@@ -14,6 +16,8 @@ ButtonSave=Uložit
 
 FormBuilding=Budova
 
+HeaderText=Hlavička
+
 ToolbarRecNew=Nový záznam
 ToolbarRecEdit=Úprava aktuálního záznamu
 ToolbarRecDelete=Odstranit aktuální záznam

src/main/webapp/WEB-INF/zk.xml

@@ -25,6 +25,8 @@
     
 	<desktop-config>
 		<theme-uri>/css/zk-modify.css</theme-uri>
+		<theme-uri>/css/form.css</theme-uri>
+		<theme-uri>/css/page.css</theme-uri>
 	</desktop-config>
     
     <!-- <library-property>

src/main/webapp/admin/addressbook/addrFindResult.zul

@@ -5,8 +5,6 @@
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressFindResult')"
 	closable="true" width="700px">
 	
-	<style src="/app/form.css"/>
-	
 	<listbox model="@load(vm.listResult)" height="300px" selectedItem="@bind(vm.selectedAddr)">
 		<listhead>
 			<listheader label="Firma" sort="auto(company)"/>

src/main/webapp/admin/addressbook/address.zul

@@ -5,8 +5,6 @@
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressForm')"
 	closable="true" width="600px">
 		
-	<style src="/app/form.css"/>
-		
 	<grid width="580px">
 		<columns>
 			<column label="" hflex="min"/>

src/main/webapp/admin/addressbook/addressbook.zul

@@ -6,7 +6,6 @@
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressList')">
 		
 	<include src="/app/toolbar.zul"/>
-	<style src="/app/form.css"/>              
 
     <hbox width="100%">
      <listbox id="dataGrid" model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" 

src/main/webapp/admin/permissions/permForm.zul

@@ -2,7 +2,6 @@
 <zk>
 <window id="editWin" title="Uživatel" border="normal" closable="true" width="550px" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.users.PermissionForm')">
-	<style src="/app/form.css"/>
 	
 	<label value="@load(vm.dataBean.description)" style="font-weight: bold;"/>
 

src/main/webapp/admin/users/userForm.zul

@@ -2,7 +2,7 @@
 <zk>
 <window id="editWin" title="Uživatel" border="normal" closable="true" width="450px" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.users.UserForm')">
-	<style src="/app/form.css"/>
+
 	<grid width="440px">
 		<columns>
 			<column hflex="min"></column>

src/main/webapp/app/header.zul

@@ -0,0 +1,7 @@
+<?page title="${labels.HeaderText}" contentType="text/html;charset=UTF-8"?>
+<zk>
+	<style src="/css/page.css"/>
+	<div id="header">
+		${labels.AppName}
+	</div>
+</zk>

src/main/webapp/app/page.css

@@ -1,70 +0,0 @@
-/*body {
-    font-family: sans-serif;
-}*/
-
-#container {
-   min-height:100%;
-   position:relative;
-}
-
-#header{
-	width: auto;
-	height:40px;
-	border: 1px solid #ccc;
-	padding:10px;
-}
-
-#leftcolumn{
-	width:140px;
-/*	margin: 20px 20px 20px 0px;*/
-	padding:10px;
-	float: left;
-/*	border: 1px solid #ccc;*/
-}
-
-#navbar{
-	border: 1px solid #ccc;
-}
-
-#maincolumn{
-	padding:10px;
-	padding-bottom:20px;   /* Height of the footer */
-	margin: 0px 0px 0px 160px;
-}
-
-#footer{
-	clear:both;
-	position:absolute;
-   	bottom:0;
-   	width:100%;
-   	height:20px;   /* Height of the footer */
-	
-	border: 1px solid #ccc;
-}
-
-.form-caption	{
-	--1overflow:hidden;
-	font-weight: bold;
-    font-size: 20px;
-}
-/*aaa*/
-.form-caption-content	{
-	float:left;
-}
-
-/*
-a:link,a:visited {
-   font-size: 12px;
-   color: #0000A0;
-   background-color: #FFFFFF;
-   text-decoration: none;
-   target-new: none;
-}
-
-a:hover {
-   font-size: 12px;
-   color: #0000A0;
-   background-color: #a3d3f8;
-   text-decoration: none;
-   target-new: none;
-}*/

src/main/webapp/app/passwd.zul

@@ -6,7 +6,7 @@
 	apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.users.PasswdVM')">
 	<caption src="/img/passwd.png" zclass="form-caption" label="Změnit heslo" />
-	<style src="/app/form.css"/>
+
 	<grid>
 		<columns>
 			<column hflex="min"/>

src/main/webapp/app/template.zhtml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <html  xmlns="native" xmlns:u="zul" xmlns:zk="zk">
-	<u:style src="/app/page.css"/>
+	<u:style src="/css/page.css"/>
 	
 	<script type="text/javascript">
 		zk.afterLoad("zk", function () {
@@ -42,9 +42,9 @@
 		</script>
 		
 	<div id="container">
-	<div id="header">
+		<div id="header">
-		hlavicka
+			Objednávkový systém SPŠ Třebíč
-	</div>
+		</div>
 
 	<div id="leftcolumn">
 		<u:include src="/app/navigation.zul"/>

src/main/webapp/buildings/building.zul

@@ -1,8 +1,8 @@
 <?page title="${labels.AgendaBuildings}" contentType="text/html;charset=UTF-8"?>
 <zk>
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-	<window title="${labels.AgendaBuildings}" border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.BuildingList')">
+	<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.BuildingList')">
-
+		<caption zclass="form-caption" label="${labels.AgendaBuildings}" />
 		<include src="/app/toolbar.zul" />
 
 		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">

src/main/webapp/css/page.css

@@ -0,0 +1,80 @@
+html {
+	/*vertical scrollbar allways visible */
+	overflow: -moz-scrollbars-vertical;
+	overflow-y: scroll;
+	
+	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+#container {
+	min-height: 100%;
+	position: relative;
+}
+
+#header {
+	width: auto;
+	height: 40px;
+	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 {
+	width: 140px;
+	padding: 10px;
+	float: left;
+}
+
+#navbar {
+	border: 1px solid #ccc;
+}
+
+#maincolumn {
+	padding: 10px;
+	padding-bottom: 20px; /* Height of the footer */
+	margin: 0px 0px 0px 160px;
+}
+
+#footer {
+	clear: both;
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	height: 20px; /* Height of the footer */
+	border: 1px solid #ccc;
+}
+
+.form-caption {
+	overflow: hidden;
+	font-weight: bold;
+	font-size: 20px;
+	text-shadow: 2px 2px 2px #888888;
+	padding-left: 5px;
+}
+/*aaa*/
+.form-caption-content {
+	float: left;
+}
+
+/*
+a:link,a:visited {
+   font-size: 12px;
+   color: #0000A0;
+   background-color: #FFFFFF;
+   text-decoration: none;
+   target-new: none;
+}
+
+a:hover {
+   font-size: 12px;
+   color: #0000A0;
+   background-color: #a3d3f8;
+   text-decoration: none;
+   target-new: none;
+}*/