From 44f76b4276d2ae7fb46f668265242c1385de93a9 Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Mon, 11 Oct 2010 10:32:54 -0700
Subject: [PATCH] Updated navigation in the new theme.

--HG--
branch : dev
---
 src/Orchard.Web/Orchard.Web.csproj            | 12 +++--
 .../Themes/TheThemeMachine/Styles/site.css    | 50 ++++++++++++++++++-
 .../TheThemeMachine/Views/Layout.cshtml       | 12 +++--
 3 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index ddab2de4f..4a1018f20 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -139,12 +139,16 @@
     <Content Include="Themes\TheThemeMachine\Styles\site.css" />
     <Content Include="Themes\TheThemeMachine\Theme.png" />
     <Content Include="Themes\TheThemeMachine\Theme.txt" />
-    <None Include="Themes\TheThemeMachine\Views\Content.cshtml" />
-    <None Include="Themes\TheThemeMachine\Views\Featured.cshtml" />
-    <None Include="Themes\TheThemeMachine\Views\Layout-Blog.cshtml" />
     <None Include="Themes\TheThemeMachine\Views\Layout-homePage.cshtml" />
-    <None Include="Themes\TheThemeMachine\Views\Recent.cshtml" />
+    <None Include="Themes\TheThemeMachine\Views\Recent.cshtml">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Themes\TheThemeMachine\Views\Layout-Blog.cshtml" />
+    <None Include="Themes\TheThemeMachine\Views\Featured.cshtml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Themes\TheThemeMachine\Views\Document.cshtml" />
+    <None Include="Themes\TheThemeMachine\Views\Content.cshtml" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
index a4af8be35..90fe56c08 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
@@ -109,7 +109,7 @@ p {
 
 /* Structure
 ***************************************************************/
-#layout-wrapper {
+#layout-wrapper, #layout-header {
 	width:960px;
 	margin:0 auto;
 }
@@ -118,7 +118,7 @@ p {
        #logo {}
        
        
-/* Navigation */
+/* Navigation 
 
 nav ul li {
 	margin:2em 0 0 0;
@@ -132,6 +132,42 @@ nav ul li a {
 	text-decoration:none;
 	text-transform:uppercase;
 	float:left;
+} */
+
+
+
+#navigation {
+    width: 960px;
+	margin: 4px auto;
+	display:block;
+    border-bottom: 1px solid #999;
+}
+
+nav ul {
+	padding: 0 0 0 8px;
+}
+
+nav ul li
+ {
+	border:1px solid #999;
+	background:#e7e7e7;
+	display:block;
+	float:left;
+	margin:0 2px -1px 0;
+}
+
+nav ul li.on {
+	border-bottom: 1px solid #fff;
+	background:#fff;
+}
+
+nav ul a {
+	padding:0 18px;
+    display:block;
+	float:left;
+    font-size:1.4em;
+    text-decoration:none;
+    line-height:24px;
 }
 
 #footer {}
@@ -195,6 +231,11 @@ form.inline p { margin-bottom:0; }
 
 /* For testing purposes */
 
+
+#layout-header {
+    border:1px solid #CCC;
+}
+
 #layout-wrapper {
 	border:1px solid #CCC;
 }
@@ -244,4 +285,9 @@ form.inline p { margin-bottom:0; }
     float:left;
     width: 462px;
     margin: 6px;
+}
+
+
+.clearfix {
+	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 16b56c9ba..b0a6f8096 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
@@ -11,7 +11,8 @@
         Html.AddPageClassNames(new[]{"has-sidebar"});
     }
 }
-<div id="layout-wrapper">
+
+
     <header id="layout-header">
         @* needs to be the page title, not page (head) title... *@
         <h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
@@ -20,12 +21,17 @@
             @Zone(Model.Header)
         </div>
         }
+    </header>
+
+
         @if(Model.Navigation != null) {
-        <div id="navigation">
+        <div id="navigation" class="group">
             @Zone(Model.Navigation)
         </div>
         }
-    </header>
+
+
+<div id="layout-wrapper">
     @if(Model.Messages != null) {
     <div id="messages">
         @Zone(Model.Messages)