From 9abe1ab6a4f9601a611e373d433a5a715890d4ea Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Mon, 5 May 2014 21:06:15 +0200 Subject: [PATCH] =?UTF-8?q?Toolbar=20p=C5=99em=C3=ADst=C4=9Bn=20do=20samos?= =?UTF-8?q?tatn=C3=A9ho=20souboru.=20M=C3=ADrn=C3=A1=20=C3=BAprava=20layou?= =?UTF-8?q?tu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/admin/users/users.zul | 12 +++--------- src/main/webapp/app/page.css | 17 +++++++++++++---- src/main/webapp/app/template.zhtml | 3 +++ src/main/webapp/app/toolbar.zul | 9 +++++++++ 4 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 src/main/webapp/app/toolbar.zul diff --git a/src/main/webapp/admin/users/users.zul b/src/main/webapp/admin/users/users.zul index b7f4f7e0..49a93ba1 100644 --- a/src/main/webapp/admin/users/users.zul +++ b/src/main/webapp/admin/users/users.zul @@ -2,16 +2,10 @@ - - - - - - - - + viewModel="@id('vm') @init('info.bukova.isspst.ui.UsersList')" height="570px"> + + diff --git a/src/main/webapp/app/page.css b/src/main/webapp/app/page.css index 9996d2b4..c633edb5 100644 --- a/src/main/webapp/app/page.css +++ b/src/main/webapp/app/page.css @@ -1,10 +1,15 @@ -body { +/*body { font-family: sans-serif; +}*/ + +#container { + min-height:100%; + position:relative; } #header{ width: auto; - height:70px; + height:40px; border: 1px solid #ccc; padding:10px; } @@ -23,13 +28,17 @@ body { #maincolumn{ padding:10px; + padding-bottom:20px; /* Height of the footer */ margin: 0px 0px 0px 160px; - border: 1px solid #ccc; } #footer{ clear:both; - width:auto; + position:absolute; + bottom:0; + width:100%; + height:20px; /* Height of the footer */ + border: 1px solid #ccc; } /* diff --git a/src/main/webapp/app/template.zhtml b/src/main/webapp/app/template.zhtml index a1cd3ab8..22fa7376 100644 --- a/src/main/webapp/app/template.zhtml +++ b/src/main/webapp/app/template.zhtml @@ -2,6 +2,7 @@ +
@@ -11,11 +12,13 @@
+
+ \ No newline at end of file diff --git a/src/main/webapp/app/toolbar.zul b/src/main/webapp/app/toolbar.zul new file mode 100644 index 00000000..7c4684e0 --- /dev/null +++ b/src/main/webapp/app/toolbar.zul @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file