Improve website layout

12 files changed, 661 insertions, 166 deletions

diff --git a/israwhidebroken/controllers.py b/israwhidebroken/controllers.py
index 03e049e..01b0497 100644
--- a/israwhidebroken/controllers.py
+++ b/israwhidebroken/controllers.py
@@ -9,15 +9,10 @@ from cherrypy import request, response
 
 class Root(controllers.RootController):
     @expose(template="israwhidebroken.templates.index")
-    # @identity.require(identity.in_group("admin"))
     def index(self):
-        import time
-        # log.debug("Happy TurboGears Controller Responding For Duty")
-        if identity.current.anonymous:
-            flash("Your application is now running")
-        else:
-            flash("Welcome, %s" % identity.current.user_name)
-        return dict(now=time.ctime())
+        # TODO: find most recent tree(s)
+        return dict(in_qa='qa' in identity.current.groups,
+                    admin='qa-admin' in identity.current.groups)
 
     @expose(template="israwhidebroken.templates.login")
     def login(self, forward_url=None, *args, **kw):
@@ -28,8 +23,10 @@ class Root(controllers.RootController):
             else:
                 del request.params['forward_url']
 
+        # If the login was successful...
         if not identity.current.anonymous and identity.was_login_attempted() \
                 and not identity.get_identity_errors():
+            flash("Welcome, %s" % identity.current.user_name)
             redirect(tg.url(forward_url or '/', kw))
 
         if identity.was_login_attempted():
diff --git a/israwhidebroken/static/css/layout.css b/israwhidebroken/static/css/layout.css
new file mode 100644
index 0000000..d5a37ca
--- /dev/null
+++ b/israwhidebroken/static/css/layout.css
@@ -0,0 +1,610 @@
+/* $Id: layout.css,v 1.3 2007/01/06 08:03:27 lmacken Exp $ */
+
+body {
+	font-size: 0.9em;
+	font-family: liberation, veranda, sans-serif;
+    color: #4F4F4F;
+	margin: 0;
+	padding: 0;
+	background-color: #d9d9d9;
+}
+
+#form_builds_text {
+    width: 20em;
+}
+
+a:link {
+	color: #22437F;
+}
+a:visited {
+	color: #48468f;
+}
+a:hover {
+	color: #f20;
+}
+a[name] {
+	color: inherit;
+	text-decoration: inherit;
+}
+
+#page-main {
+        padding-right: 20px;
+        padding-left: 20px;
+}
+
+#fedora-header {
+	background-color: #fff;
+	height: 62px;
+}
+#fedora-header img {
+	border: 0;
+	vertical-align: middle;
+}
+#fedora-header-logo {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	left: 26px;
+	top: 13px;
+	z-index: 3;
+}
+#fedora-header-logo img {
+    /*
+	width: 110px;
+	height: 40; */
+}
+#fedora-header-items {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	right: 10px;
+	top: 8px;
+	text-align: right;
+	display: inline;
+}
+#fedora-header-items a {
+	color: #000;
+	text-decoration: none;
+	padding: 7pt;
+	font-size: 0.8em;
+}
+#fedora-header-items a:hover, #fedora-header-search-button:hover {
+	color: #f20;
+	cursor: pointer;
+}
+#fedora-header-items img {
+	margin-right: 1px;
+    /*
+	width: 36px;
+	height: 36px;*/
+}
+#fedora-header-search {
+	height: 25px;
+}
+#fedora-header-search-entry {
+	vertical-align: top;
+	margin: 0.65em 4px 0 10px;
+	padding: 2px 4px;
+	background-color: #f5f5f5;
+	border: 1px solid #999;
+	font-size: 0.8em !important;
+}
+#fedora-header-search-entry:focus {
+	background-color: #fff;
+	border: 1px solid #555;
+}
+#fedora-header-search-button {
+	font-size: 0.8em !important;
+	vertical-align: top;
+	margin-top: 0.2em;
+	border: 0;
+	padding: 7px;
+	padding-left: 21px;
+}
+#fedora-header-items form {
+	float: right;
+}
+#fedora-header-items input {
+	font-size: 0.85em;
+}
+#fedora-nav {
+	margin: 0;
+	padding: 0;
+	background-color: #22437f;
+	font-size: 0;
+	height: 5px;
+	border-top: 1px solid #000;
+	border-bottom: 1px solid #f5f5f5;
+}
+#fedora-nav ul {
+	margin: 0;
+	padding: 0;
+}
+#fedora-nav li {
+	display: inline;
+	list-style: none;
+	padding: 0 5pt;
+}
+#fedora-nav li + li {
+	padding-left: 8pt;
+	border-left: 1px solid #99a5bf;
+}
+#fedora-nav a {
+	color: #c5ccdb;
+	text-decoration: none;
+}
+#fedora-nav a:hover {
+	color: #fff;
+}
+
+#fedora-side-left {
+	position: absolute;
+	z-index: 2;
+	width: 12em;
+	/* Space down for the approx line height (fonts) */
+	left: 12px;
+}
+#fedora-side-right {
+	position: absolute;
+	z-index: 1;
+	width: 13em;
+	right: 12px;
+	padding-top: 3px;
+	}
+#fedora-side-left, #fedora-side-right {
+	top: 2px;
+	/* add to the top margin to compensate for the fixed sizes */
+	margin-top: 75px;
+	color: #555;
+	font-size: 0.9em;
+}
+#fedora-side-right ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0;
+}
+
+/* Left-side naviagation */
+#fedora-side-nav-label {
+	display: none;
+}
+#fedora-side-nav {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #5976b2;
+	border-top: 0;
+	background-color: #22437f;
+}
+#fedora-side-nav li {
+	margin: 0;
+	padding: 0;
+	border-top: 1px solid #5976b2;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #22437f;
+}
+#fedora-side-nav a {
+	margin: 0;
+	color: #c5ccdb;
+	display: block;
+	text-decoration: none;
+	padding: 4px 6px;
+}
+#fedora-side-nav a:hover {
+	background-color: #34548f;
+	color: #fff;
+}
+#fedora-side-nav ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+#fedora-side-nav ul li {
+	border-top: 1px solid #34548e;
+	background-color: #34548e;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #34548e;
+}
+#fedora-side-nav ul li:hover {
+	border-bottom: 1px solid #34548f;
+}
+#fedora-side-nav ul li a {
+	padding-left: 18px;
+	color: #a7b2c9;
+}
+#fedora-side-nav ul li a:hover {
+  /*
+	background-color: #46659e;
+   */
+}
+#fedora-side-nav ul ul li a {
+	padding-left: 36px;
+}
+#fedora-side-nav strong a {
+	font-weight: normal;
+	color: #fff !important;
+	background-color: #10203b;
+}
+#fedora-side-nav strong a:hover {
+	background-color: #172e56 !important;
+}
+
+/* content containers */
+#fedora-middle-one, #fedora-middle-two, #fedora-middle-three {
+	font-size: 0.9em;
+	/* position: relative; */ /* relative to utilize z-index */
+	width: auto;
+	min-width: 120px;
+	margin: 10px;
+	z-index: 3; /* content can overlap when the browser is narrow */
+}
+#fedora-middle-two, #fedora-middle-three {
+	margin-left: 12em;
+	padding-left: 24px;
+}
+#fedora-middle-three {
+	margin-right: 13em;
+}
+
+#fedora-content {
+	padding-top: 24px;
+	padding-bottom: 24px;
+	border: 1px solid #aaa;
+	background-color: #fff;
+}
+
+#fedora-content > .fedora-corner-bottom { top: 0 }
+
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	background-color: #d9d9d9;
+	position: relative;
+	width: 19px;
+	height: 19px;
+	/* The following line is to render PNGs with alpha transparency within IE/Win, using DirectX */
+	/* Work-around for IE6/Mac borkage (Part 1) */
+	display: none;
+}
+
+.fedora-corner-tl, .fedora-corner-bl { float: left; left: 0px; }
+.fedora-corner-tr, .fedora-corner-br { float: right; right: 0px; }
+.fedora-corner-tl, .fedora-corner-tr { top: 0px; }
+.fedora-corner-bl, .fedora-corner-br { bottom: 0px; margin-top: -19px; /* Opera fix (part 1) */ top: -18px;}
+
+html>body .fedora-corner-tl { background: #d9d9d9 url("/static/images/corner-tl.png") no-repeat left top; }
+html>body .fedora-corner-tr { background: #d9d9d9 url("/static/images/corner-tr.png") no-repeat right top; }
+html>body .fedora-corner-bl { background: #d9d9d9 url("/static/images/corner-bl.png") no-repeat left bottom; }
+html>body .fedora-corner-br { background: #d9d9d9 url("/static/images/corner-br.png") no-repeat right bottom; }
+
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	/* Restore the view for everything but IE6/Mac (part 2 of the "IE/Mac fix") */
+	display: block;
+}
+
+.fedora-corner-bl, .fedora-corner-br {
+	top: 0px;
+}
+
+.content { margin: 0 1em }
+
+#fedora-sidelist {
+	position: relative;
+	bottom: 3px;
+	margin: 0;
+	padding: 3px !important;
+	border: 1px solid #bbb;
+	background-color: #ccc;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist strong a {
+	font-weight: normal;
+	background-color: #555;
+	color: #fff;
+}
+#fedora-sidelist strong a:hover {
+	background-color: #333;
+	color: #fff;
+}
+#fedora-sidelist li {
+	list-style-position: outside;
+	font-size: 0.9em;
+	list-style: none;
+	border: 1px solid #ccc;
+	border-width: 1px 0;
+	padding: 0;
+	list-style: none;
+}
+#fedora-sidelist li a {
+	text-decoration: none;
+	display: block;
+	padding: 6px 8px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist li a:hover {
+	background-color: #999;
+	color: #eee;
+}
+
+#fedora-footer {
+	font-size: 0.75em;
+	text-align: right;
+	color: #777;
+	margin-bottom: 2em;
+    margin-right: 2em;
+}
+#loginlogout {
+        font-size: 0.75em;
+        text-align: right;
+        vertical-align: bottom;
+        margin-right: 24px;
+}
+#fedora-printable {
+	text-align: center;
+	margin: 1em 0;
+	font-size: 0.85em;
+}
+#fedora-printable a {
+	text-decoration: none;
+	padding: 5px 0;
+	padding-left: 18px;
+	background: transparent url("/images/printable.png") no-repeat left;
+}
+#fedora-printable a:hover {
+	text-decoration: underline;
+}
+
+input.c1 {
+    font-size:12px;
+    border: 1px solid #4F4F4F;
+}
+
+textarea.c2 {
+    font-size: 12px;
+    border: 1px solid #4F4F4F;
+}
+
+option.c3 {
+    font-size:12px;
+    /* border: 1px solid #4F4F4F; */
+}
+
+select.c4 {
+    font-size:12px;
+    border: 1px solid #4F4F4F;
+}
+
+input.button {
+    font-size:12px;
+    border: 1px solid #4F4F4F;
+}
+
+
+/*
+** The update list (list.kid)
+*/
+table.list {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+th.list {
+    padding-left: 25px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    text-align: left;
+    color: #FFFFFF;
+    background-color: #4f4f4f;
+}
+
+tr.list {
+    border-bottom: 1px solid #bcbcbc;
+}
+
+td.list {
+    padding-left: 25px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+}
+
+a.list {
+    text-decoration: none;
+}
+
+div.list {
+    text-align: right;
+    padding-right: 10px;
+    padding-bottom: 5px;
+}
+
+/*
+** CSS for displaying package updates (show.kid)
+*/
+
+table.show {
+    vertical-align: middle;
+    border-collapse: collapse;
+    width: 100%;
+    border-top: 1px solid #bcbcbc;
+    border-bottom: 1px solid #bcbcbc;
+}
+
+/*
+td.title {
+    text-align: right;
+    vertical-align: top;
+    background-color: #f1f1f1;
+    width: 25%;
+    padding-top: 5px;
+    padding-right: 5px;
+}
+    */
+
+td.value {
+    text-align: left;
+    padding-top: 5px;
+    padding-left: 5px;
+}
+
+div.show {
+    padding-bottom: 5px;
+    font-size: 1.5em;
+}
+
+div.alert {
+    padding-left: 20px;
+}
+
+div.flash {
+    padding-top: 4px;
+    padding-bottom: 4px;
+    margin-bottom: 10px;
+    width: 75%;
+    font-weight: bold;
+    background: #ffb200;
+}
+
+/*
+** Login CSS (login.kid)
+*/
+
+table.login {
+    border-collapse: collapse;
+    border-bottom: 1px solid #bcbcbc;
+    border-top: 1px solid #bcbcbc;
+    width: 100%;
+}
+
+
+td.title {
+    text-align: right;
+    vertical-align: top;
+    background-color: #f1f1f1;
+    width: 175px;
+    padding-top: 5px;
+    padding-right: 5px;
+    font-weight: bold;
+    padding: 5px;
+}
+
+td.value {
+    text-align: left;
+    padding-top: 5px;
+    padding-left: 5px;
+    padding: 5px;
+}
+
+h1.padded {
+    padding-left: 10px;
+}
+
+p.padded {
+    padding-left: 10px;
+}
+
+/*
+td.title {
+    text-align: right;
+    vertical-align: top;
+    background-color: #f1f1f1;
+    width: 25%;
+    padding-right: 5px;
+}
+    */
+
+td.value {
+    text-align: left;
+    padding-left: 5px;
+}
+
+.release
+{
+  overflow: auto;
+}
+
+.release .link
+{
+  float: left;
+  margin: 0;
+  padding: 0;
+}
+
+.release .rsslink
+{
+  float: right;
+  width: 18px;
+  overflow:hidden;
+  padding-left: 0!important;
+  padding-right: 4px!important;
+}
+
+.release .rsslink:hover, .release .link:hover
+{
+  background: none!important;
+}
+
+.rsslink img
+{
+  display: block;
+  border: none;
+  margin: 0;
+  padding: 0;
+}
+
+#mashstatus 
+{
+    overflow: scroll;
+    height: 50em;
+}
+
+/* jquery.tooltip.css */
+#tooltip {
+	position: absolute;
+	z-index: 3000;
+	border: 1px solid #111;
+	background-color: #eee;
+	padding: 5px;
+	opacity: 0.85;
+}
+#tooltip h3, #tooltip div { margin: 0; }
+
+#tooltip.pretty {
+	font-family: Arial;
+	border: none;
+	width: 210px;
+	padding:20px;
+	height: 135px;
+	opacity: 0.8;
+	background: url('/updates/static/images/shadow.png');
+}
+#tooltip.pretty h3 {
+	margin-bottom: 0.75em;
+	font-size: 12pt;
+	width: 220px;
+	text-align: center;
+}
+#tooltip.pretty div { width: 220px; text-align: left; }
+
+#tooltip.fancy {
+	background: url('/updates/static/images/shadow2.png');
+	padding-top: 4em;
+	height: 100px;
+}
+
+#main { padding: 1em; }
+#banner { padding: 15px; background-color: #06b; color: white; font-size: large; border-bottom: 1px solid #ccc;
+    background: url(bg.gif) repeat-x; text-align: center }
+fieldset { padding: 8px; }
+legend { font-weight: bold; }
+    
+.jscom, .mix htcom   { color: #4040c2; }
+.com      { color: green; }
+.regexp   { color: maroon; }
+.string   { color: teal; }
+.keywords { color: blue; }
+.global   { color: #008; }
+.numbers  { color: #880; }
+.comm     { color: green; }
+.tag      { color: blue; }
+.entity   { color: blue; }
+.string   { color: teal; }
+.aname    { color: maroon; }
+.avalue   { color: maroon; }
+.jquery   { color: #00a; }
+.plugin   { color: red; }
diff --git a/israwhidebroken/static/css/style.css b/israwhidebroken/static/css/style.css
deleted file mode 100644
index c98d40e..0000000
--- a/israwhidebroken/static/css/style.css
+++ /dev/null
@@ -1,134 +0,0 @@
-/*

- * Quick mash-up of CSS for the TG quick start page.

- */

-

-html, body {

-  color: black;

-  background-color: #ddd;

-  font: x-small "Lucida Grande", "Lucida Sans Unicode", geneva, verdana, sans-serif;

-  margin: 0;

-  padding: 0;

-}

-

-td, th {padding:3px;border:none;}

-tr th {text-align:left;background-color:#f0f0f0;color:#333;}

-tr.odd td {background-color:#edf3fe;}

-tr.even td {background-color:#fff;}

-

-#header {

-  height: 80px;

-  width: 777px;

-  background: blue URL('../images/header_inner.png') no-repeat;

-  border-left: 1px solid #aaa;

-  border-right: 1px solid #aaa;

-  margin: 0 auto 0 auto;

-}

-

-a.link, a, a.active {

-  color: #369;

-}

-

-

-#main_content {

-  color: black;

-  font-size: 127%;

-  background-color: white;

-  width: 757px;

-  margin: 0 auto 0 auto;

-  border-left: 1px solid #aaa;

-  border-right: 1px solid #aaa;

-  padding: 10px;

-}

-

-#sidebar {

-  border: 1px solid #aaa;

-  background-color: #eee;

-  margin: 0.5em;

-  padding: 1em;

-  float: right;

-  width: 200px;

-  font-size: 88%;

-}

-

-#sidebar h2 {

-  margin-top: 0;

-}

-

-#sidebar ul {

-  margin-left: 1.5em;

-  padding-left: 0;

-}

-

-h1,h2,h3,h4,h5,h6,#getting_started_steps {

-  font-family: "Century Schoolbook L", Georgia, serif;

-  font-weight: bold;

-}

-

-h2 {

-  font-size: 150%;

-}

-

-#getting_started_steps a {

-  text-decoration: none;

-}

-

-#getting_started_steps a:hover {

-  text-decoration: underline;

-}

-

-#getting_started_steps li {

-  font-size: 80%;

-  margin-bottom: 0.5em;

-}

-

-#getting_started_steps h2 {

-  font-size: 120%;

-}

-

-#getting_started_steps p {

-  font: 100% "Lucida Grande", "Lucida Sans Unicode", geneva, verdana, sans-serif;

-}

-

-#footer {

-  border: 1px solid #aaa;

-  border-top: 0px none;

-  color: #999;

-  background-color: white;

-  padding: 10px;

-  font-size: 80%;

-  text-align: center;

-  width: 757px;

-  margin: 0 auto 1em auto;

-}

-

-.code {

-  font-family: monospace;

-}

-

-span.code {

-  font-weight: bold;

-  background: #eee;

-}

-

-#status_block {

-  margin: 0 auto 0.5em auto;

-  padding: 15px 10px 15px 55px;

-  background: #cec URL('../images/ok.png') left center no-repeat;

-  border: 1px solid #9c9;

-  width: 450px;

-  font-size: 120%;

-  font-weight: bolder;

-}

-

-.notice {

-  margin: 0.5em auto 0.5em auto;

-  padding: 15px 10px 15px 55px;

-  width: 450px;

-  background: #eef URL('../images/info.png') left center no-repeat;

-  border: 1px solid #cce;

-}

-

-.fielderror {

-    color: red;

-    font-weight: bold;

-}
\ No newline at end of file
diff --git a/israwhidebroken/static/images/corner-bl.png b/israwhidebroken/static/images/corner-bl.png
new file mode 100644
index 0000000..58d269c
--- /dev/null
+++ b/israwhidebroken/static/images/corner-bl.png
diff --git a/israwhidebroken/static/images/corner-br.png b/israwhidebroken/static/images/corner-br.png
new file mode 100644
index 0000000..c03dd92
--- /dev/null
+++ b/israwhidebroken/static/images/corner-br.png
diff --git a/israwhidebroken/static/images/corner-tl.png b/israwhidebroken/static/images/corner-tl.png
new file mode 100644
index 0000000..08ab7a3
--- /dev/null
+++ b/israwhidebroken/static/images/corner-tl.png
diff --git a/israwhidebroken/static/images/corner-tr.png b/israwhidebroken/static/images/corner-tr.png
new file mode 100644
index 0000000..b279db2
--- /dev/null
+++ b/israwhidebroken/static/images/corner-tr.png
diff --git a/israwhidebroken/static/images/header-fedora_logo.png b/israwhidebroken/static/images/header-fedora_logo.png
new file mode 100644
index 0000000..55300d2
--- /dev/null
+++ b/israwhidebroken/static/images/header-fedora_logo.png
diff --git a/israwhidebroken/templates/footer.html b/israwhidebroken/templates/footer.html
index c703769..f7b5f62 100644
--- a/israwhidebroken/templates/footer.html
+++ b/israwhidebroken/templates/footer.html
@@ -1,17 +1,21 @@
 <html xmlns:py="http://genshi.edgewall.org/"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       py:strip="">
-<py:def function="footer">
-<div id="footer"> 
-  <div class="flogo">
-    <img src="${tg.url('/static/images/under_the_hood_blue.png')}" alt="TurboGears" />
-    <p><a href="http://www.turbogears.org/2.0/">Powered by TurboGears 2</a></p>
-  </div>
-  <div class="foottext">
-    <p>TurboGears is a open source front-to-back web development
-      framework written in Python. Copyright (c) 2005-2008 </p>
-  </div>
-  <div class="clearingdiv"></div>
+<py:def function="tg_footer">
+<center>
+  <a href="http://www.turbogears.org/">
+    <img src="${tg.url('/static/images/under_the_hood_blue.png')}" alt="TurboGears" border="0" />
+  </a>
+</center>
+</py:def>
+<py:def function="fedora_footer">
+<!-- !FIXME is there a function for this in the python-fedora stuff? -->
+<div id="fedora-footer">
+  Copyright © 2009 Red Hat, Inc. and others. All Rights Reserved.<br/>
+  Licensed under the GNU Public License v2 or later.<br/>
+  The Fedora Project is maintained and driven by the community and sponsored by Red Hat.<br/>
+  This is a community maintained site.  Red Hat is not responsible for content.<br/>
+  [ <a href="http://fedoraproject.org/wiki/Legal">Legal</a>, <a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a> ]
 </div>
 </py:def>    
 </html>
diff --git a/israwhidebroken/templates/header.html b/israwhidebroken/templates/header.html
index 0276130..407f2b9 100644
--- a/israwhidebroken/templates/header.html
+++ b/israwhidebroken/templates/header.html
@@ -2,13 +2,18 @@
       xmlns:xi="http://www.w3.org/2001/XInclude"
       py:strip="">
 <py:def function="header">
-  <div id="header">
+  <div id="fedora-header">
+    <div id="fedora-header-logo">
+      <a href="${tg.url('/')}"><img src="${tg.url('/static/images/header-fedora_logo.png')}"/></a>
+    </div>
+    <div id="fedora-header-items">
   	<h1>
                 Is Rawhide Broken?
                 <py:if test="defined('subtitle')">
 		<span class="subtitle" py:replace="subtitle"></span>
                 </py:if>
 	</h1>
+    </div>
   </div>
 </py:def>
 </html>
diff --git a/israwhidebroken/templates/index.html b/israwhidebroken/templates/index.html
index eb3bc8f..df78833 100644
--- a/israwhidebroken/templates/index.html
+++ b/israwhidebroken/templates/index.html
@@ -12,6 +12,8 @@
 </head>
 
 <body>
-    <div>CONTENT!</div>
+    <div>RESULTS GO HERE</div>
+    <div py:if="in_qa"><a href="#edit">edit link</a></div>
+    <div py:if="admin"><a href="#admin">admin link</a></div>
 </body>
 </html>
diff --git a/israwhidebroken/templates/master.html b/israwhidebroken/templates/master.html
index da38a2d..b4b16c6 100644
--- a/israwhidebroken/templates/master.html
+++ b/israwhidebroken/templates/master.html
@@ -12,21 +12,32 @@
     <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
     <title py:replace="''">Your title goes here</title>
     <meta py:replace="select('*')"/>
-    <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/static/css/style.css')}" />
+    <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/static/css/layout.css')}" />
 </head>
 
 <body py:match="body" py:attrs="select('@*')">
-  <div id="pageLogin">
-    <li py:if="tg.identity.anonymous" id="login" class="loginlogout"><a href="${tg.url(tg.identity.login_url)}">Login</a></li>
-    <li py:if="not tg.identity.anonymous" id="login" class="loginlogout"><a href="${tg.url('/logout')}">Logout</a></li>
-  </div>
+  <!-- header -->
   ${header()}
-  <div id="main_content">
-  <div id="status_block" class="flash" 
-       py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>
-  <div py:replace="select('*|text()')"/>
-    <!-- End of content -->
+  <!-- content -->
+  <div id="fedora-middle-one">
+    <div class="fedora-corner-tr"/><div class="fedora-corner-tl"/>
+    <div id="fedora-content">
+      <div id="page-main">
+        <div id="status_block" class="flash"
+             py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>
+        <div py:replace="select('*|text()')"/> <!--!CONTENT GOES HERE -->
+      </div>
+
+      <div py:if="not defined('logging_in')" id="loginlogout">
+        <py:if test="tg.identity.anonymous"><a href="${tg.url(tg.identity.login_url)}">login</a></py:if>
+        <py:if test="not tg.identity.anonymous"><a href="${tg.url('/logout')}">logout ${tg.identity.user_name}</a></py:if>
+      </div>
+
+    </div>
+    <div class="fedora-corner-br"/><div class="fedora-corner-bl"/>
+    <!--!${tg_footer()}-->
   </div>
-  ${footer()}
+  <!-- footer -->
+  ${fedora_footer()}
 </body>
 </html>