From 5404fb4e2ce4a178b8663417980fb875e6ccedca Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Thu, 7 Oct 2010 11:09:37 -0700
Subject: [PATCH 1/2] Added login to The Theme Machine.

--HG--
branch : dev
---
 src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
index f0bd49aaa..3165feca9 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
@@ -12,6 +12,7 @@
     }
 }
 <div id="layout-wrapper">
+@Display.User()
     <header id="layout-header">
         @// needs to be the page title, not page (head) title...
         <h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>

From 1e8cd2b2bbbe0c79f1286af4c8129d4ca6bfa5fd Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Thu, 7 Oct 2010 11:46:07 -0700
Subject: [PATCH 2/2] Added some floats and sidebar to TheThemeMachine.

--HG--
branch : dev
---
 .../Themes/TheThemeMachine/Styles/site.css    | 30 +++++++++++++++++--
 .../TheThemeMachine/Views/Layout.cshtml       | 10 +++----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
index 2e6bf5d97..0a3a3a2d0 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
@@ -55,7 +55,7 @@ header, footer, aside, nav, article {
 
 /* Clearing Float
 ***************************************************************/
-group:after {
+.group:after {
     content: ".";
     display: block;
     height: 0;
@@ -150,6 +150,32 @@ nav ul li a {
 
 /* For testing purposes */
 
-div, nav, section {
+#layout-wrapper {
 	border:1px solid #CCC;
+}
+
+
+/* Sidebar off - Content Zone 960 */
+#content {
+	background-color:#e8e8e8;
+	width: 960px;
+    clear:both;
+}
+
+/* Sidebar on - Content Zone 640 */
+.icanhassidebar #content {
+	background-color:#e8e8e8;
+	width: 640px;
+	float:left;
+    clear:both;
+}
+
+.sidebar {
+    background-color:#f6f6f6;
+    width: 320px;
+	float:right;
+}
+
+#sitemap {
+    clear:both;
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
index 3165feca9..dc09e2a6c 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
@@ -44,13 +44,13 @@
     </div>
     }
     @if(Model.Sidebar != null) {
-    <aside>
+    <aside class="sidebar">
         @Zone(Model.Sidebar)
     </aside>
     }
-    @if(Model.Footer != null) {
-    <footer>
-        @Zone(Model.Footer)
+
+    <footer id="sitemap">
+       Powered by Awesomeness...
     </footer>
-    }
+
 </div>
\ No newline at end of file