From 4f4eefaa2fc2fa6b58faee4cd76789a0e0e66471 Mon Sep 17 00:00:00 2001 From: inghamn Date: Fri, 18 Dec 2009 15:45:40 +0000 Subject: [PATCH] Updated Templating to match the Cemeteries application git-svn-id: https://rosehill.googlecode.com/svn/branches/php@5 100bd78a-fc82-11de-b5bc-ffd2847a4b57 --- html/skins/local/screen.css | 7 ++++++ templates/html/full-width.inc | 4 ++- templates/html/partials/banner.inc | 10 ++++++++ templates/html/partials/menubar.inc | 25 +++++++++++-------- templates/html/partials/panel-one.inc | 12 +++------ templates/html/partials/panel-two.inc | 3 +++ .../html/partials/panel-widgets/Users.inc | 7 ------ templates/html/three-column.inc | 4 ++- templates/html/two-column.inc | 4 ++- 9 files changed, 47 insertions(+), 29 deletions(-) delete mode 100644 templates/html/partials/panel-widgets/Users.inc diff --git a/html/skins/local/screen.css b/html/skins/local/screen.css index e69de29..dfef7a0 100644 --- a/html/skins/local/screen.css +++ b/html/skins/local/screen.css @@ -0,0 +1,7 @@ +#banner .loginForm { position:absolute; top:5px; right:5px; color:white; } +#banner .loginForm h1 { display:none; } +#banner .loginForm th label { color:white; } +#banner .loginForm fieldset { border:none; margin:0; padding:0; } +#banner .loginForm legend { display:none; } +#banner .loginForm button {display:inline; } +#banner .loginForm a { font-weight:bold; color:blue; } diff --git a/templates/html/full-width.inc b/templates/html/full-width.inc index 174bc2f..ccc7e5b 100644 --- a/templates/html/full-width.inc +++ b/templates/html/full-width.inc @@ -9,7 +9,9 @@
diff --git a/templates/html/partials/banner.inc b/templates/html/partials/banner.inc index e94ff3b..d099e14 100644 --- a/templates/html/partials/banner.inc +++ b/templates/html/partials/banner.inc @@ -3,4 +3,14 @@ +
+ Logout"; + } + else { + include APPLICATION_HOME.'/blocks/html/loginForm.inc'; + } + ?> +
diff --git a/templates/html/partials/menubar.inc b/templates/html/partials/menubar.inc index 616169a..be2f87c 100644 --- a/templates/html/partials/menubar.inc +++ b/templates/html/partials/menubar.inc @@ -1,12 +1,17 @@
- +
diff --git a/templates/html/partials/panel-one.inc b/templates/html/partials/panel-one.inc index 07876fe..ed6c9b1 100644 --- a/templates/html/partials/panel-one.inc +++ b/templates/html/partials/panel-one.inc @@ -1,11 +1,5 @@
- - +includeBlocks('panel-one'); +?>
diff --git a/templates/html/partials/panel-two.inc b/templates/html/partials/panel-two.inc index 64c0d9f..5214323 100644 --- a/templates/html/partials/panel-two.inc +++ b/templates/html/partials/panel-two.inc @@ -1,2 +1,5 @@
+includeBlocks('panel-two'); +?>
diff --git a/templates/html/partials/panel-widgets/Users.inc b/templates/html/partials/panel-widgets/Users.inc deleted file mode 100644 index b5825f3..0000000 --- a/templates/html/partials/panel-widgets/Users.inc +++ /dev/null @@ -1,7 +0,0 @@ -
-

Admin

- -
diff --git a/templates/html/three-column.inc b/templates/html/three-column.inc index 03873fc..15af82a 100644 --- a/templates/html/three-column.inc +++ b/templates/html/three-column.inc @@ -9,7 +9,9 @@
diff --git a/templates/html/two-column.inc b/templates/html/two-column.inc index d3ff663..f76ce4d 100644 --- a/templates/html/two-column.inc +++ b/templates/html/two-column.inc @@ -9,7 +9,9 @@