From e10dc241c47546aebf88a40e68b7c8712de6c070 Mon Sep 17 00:00:00 2001
From: Michael Dorian Bach <mibach@microsoft.com>
Date: Wed, 13 Oct 2010 19:22:49 -0700
Subject: [PATCH] Updated User shape and more CSS revisions

--HG--
branch : dev
---
 src/Orchard.Web/Orchard.Web.csproj                |  3 ++-
 .../Themes/TheThemeMachine/Styles/Site.css        | 15 +++++++++++----
 .../Themes/TheThemeMachine/Views/Layout.cshtml    |  5 ++++-
 .../Themes/TheThemeMachine/Views/User.cshtml      | 13 +++++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 src/Orchard.Web/Themes/TheThemeMachine/Views/User.cshtml

diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index dd352827b..ab2ce8eb1 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -137,7 +137,7 @@
     <Content Include="Themes\TheAdmin\Styles\images\menuOpen.gif" />
     <Content Include="Themes\TheAdmin\Styles\images\menuOpenHover.gif" />
     <Content Include="Themes\TheThemeMachine\draft.html" />
-    <Content Include="Themes\TheThemeMachine\Styles\site.css" />
+    <Content Include="Themes\TheThemeMachine\Styles\Site.css" />
     <Content Include="Themes\TheThemeMachine\Theme.png" />
     <Content Include="Themes\TheThemeMachine\Theme.txt" />
     <None Include="Themes\Classic\App_Data\Localization\fr-FR\orchard.theme.po" />
@@ -145,6 +145,7 @@
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Themes\TheThemeMachine\Views\User.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
index af2f678ef..50658a503 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -80,6 +80,7 @@ header, footer, aside, nav, article { display: block; }
 }
 
 
+
 /* General
 ***************************************************************/
 /* Default font settings. 
@@ -165,7 +166,6 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
 
 #layout-header 
 {
-    border-top: 1px solid #dbdbdb;
     margin: 36px auto;
 }
     #branding 
@@ -178,6 +178,11 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
         text-decoration:none;
     }
 
+#layout-footer 
+{
+   border-top: 1px solid #dbdbdb; 
+}
+
 /* Navigation */
 #navigation 
 {
@@ -217,11 +222,11 @@ nav ul
     }
 
 /* Zones */
-/*.zone { background-color: yellow; }  Used for visualizing zones */
-.zone-header {}
+/* .zone { background-color: yellow; }   Used for visualizing zones */
+.zone-header { }
 .zone-footer { padding: 24px 0 12px 0px; float: left; font-size: 1.3em; color: #999999; }
 .zone-content { padding: 12px 0 12px 0px; }
-.zone-asidethird {}
+.zone-asidethird { padding: 0 0 6px 0; }
 
 
 /* Main
@@ -362,6 +367,8 @@ button:focus, .button:focus {
 .bottom     { margin-bottom:0; padding-bottom:0; }
 
 .user-display { float: left; padding: 24px 12px 12px 12px; font-size: 1.3em; }
+.user-display .welcome {}
+.user-display .user-actions {}
 
 
 
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
index 323e07a1f..ec176f5c2 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
@@ -82,14 +82,17 @@
     </aside>
     }
 </div>
+
 @* span -> p (?) *@
 @using(Capture(pbo => WorkContext.Layout.Footer.Add(pbo) )) {
-    <span>Powered by Orchard &#169; The Theme Machine 2010.</span>
+    <span class="poweredby">Powered by Orchard</span> <span class="copyright">&#169; The Theme Machine 2010.</span>
 }
+
 @if(Model.Footer != null) {
 <footer id="layout-footer" class="group">
     @Zone(Model.Footer)
  @Display.User()
 </footer>
 }
+
 @tag.EndElement
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/User.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/User.cshtml
new file mode 100644
index 000000000..a0a15b667
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/User.cshtml
@@ -0,0 +1,13 @@
+@using System.Web.Mvc;
+
+<div class="user-display">
+    @if (Request.IsAuthenticated) {
+            <span class="welcome">@T("Welcome, <strong>{0}</strong>!", WorkContext.CurrentUser.UserName)</span>
+            <span class="user-actions">
+                @Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })
+                @Html.ActionLink("Dashboard", "Index", new { Area = "Dashboard", Controller = "Admin" })
+            </span>
+    } else {
+            <span class="user-actions">@Html.ActionLink(T("Login").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })</span>
+    }
+</div>
\ No newline at end of file