More work on the admin UI overhaul (WIP @ /admin/pages)

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041563

src/Orchard.Web/Content/Admin/css/base.css

@@ -6,13 +6,15 @@ body {
 	color:#5a5b32;
     font-family:Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size:62.5%; /* 10px */
+    max-width:120.4em;
+    margin:0 auto 1em;
     min-width:96em; /* 960px */
 }
 body#preview {
     min-width:0;
 }
-#main {
+#content {
-    font-size:1.2em; /* 12px */
+    background:#f9faf5;
 }
 
 /* Headings and defaults
@@ -64,14 +66,14 @@ a.linkButton, a.linkButton:visited {
 
 /* Header - Branding and Login  
 ----------------------------------------------------------*/
-#banner {
+#header {
 	background:#8a8f7a url(images/background_header.jpg) no-repeat bottom right;
 	height:60px;
 }
-#banner h1 {
+#header h1 {
     float:left;
 }
-#banner h1 a {
+#header h1 a {
 	background:url(images/orchardLogo.jpg) no-repeat;
 	display:block;
 	height:60px;
@@ -80,24 +82,56 @@ a.linkButton, a.linkButton:visited {
 	width:105px;
 }
 
-#hd a, #hd a:visited, #hd a:active {
+#site, #login {
-	display:block;
+    font-size:1.5em;
+}
+
+#site a, #site a:visited, #site a:active {
+	color:#e2e4dd;
+	float:left;
+	line-height:2.2em;
+	padding:14px 0 0 6px;
 	position:relative;
-	padding:14px 0 0 12px;
-	color: #e2e4dd;
 }
 
 #login{
-	float:right;
-	display:block;
-	margin:20px 20px 0 0;
 	color:#1a1505;
+	display:block;
+	float:right;
+	margin:20px 20px 0 0;
+	white-space:nowrap;
 }
 
-#login a, #login a:visited, #login a:active {color: #e2e4dd; display:inline; padding:0px;}
+#login a, #login a:visited, #login a:active {
+    color:#e2e4dd;
+    padding:0;
+}
+#login a:hover, #login a:focus {
+    color:#ffea9b;
+}
 
-#login a:hover {color:#ffea9b;}
 
+/* temp rough structure */
+#header, #footer {
+    width:100%;
+}
+#header {
+    overflow:hidden;
+}
+#content {
+    overflow:auto;
+    padding:1.4em;
+}
+#main {
+    display:inline;
+    float:right;
+    width:77.41%;
+}
+#navigation {
+    display:inline;
+    float:left;
+    width:20.93%;
+}
 
 /* Left navigation pane
 ----------------------------------------------------------*/
@@ -386,17 +420,11 @@ ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.ho
 .separator {border-bottom:1px dashed #E4E7DC; margin-bottom:8px; padding-bottom:2px;}
 
 /*TODO - Remove roundCorners class*/
-table, textarea, #bd, .button, .inputText, .inputTextLarge, .inputTextPermalink, .linkButton, .leftNavMod, div.confirmation, div.warning, div.critical, .roundCorners {
+table, textarea, #content, .button, .inputText, .inputTextLarge,
-
+.inputTextPermalink, .linkButton, .leftNavMod, div.confirmation,
-	-moz-border-radius-bottomleft:4px;
+div.warning, div.critical, .roundCorners {
-	-moz-border-radius-bottomright:4px;
+	-moz-border-radius:4px;
-	-moz-border-radius-topleft:4px;
+	-webkit-border-top-radius:4px;
-	-moz-border-radius-topright:4px;
-	
-	-webkit-border-top-left-radius: 4px;
-	-webkit-border-top-right-radius: 4px;
-	-webkit-border-bottom-left-radius: 4px;
-	-webkit-border-bottom-right-radius: 4px;
 }
 
 

src/Orchard.Web/Views/Admin/Foot.aspx

@@ -1,8 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<AdminViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-        </div><%-- #content --%>
+        </div><%-- #main --%>
-        <%-- Navigation --%>
+        <div id="navigation" role="navigation">
-        <div id="navigation">
             <div class="leftNavMod">
                 <h4>Dashboard</h4>
             </div>
@@ -15,6 +14,7 @@
                 }
               }%>
         </div>
-    </div><%-- #main --%>
+    </div><%-- #content --%>
+    <div id="footer" role="contentinfo"></div><%-- #contentinfo --%>
 </body>
 </html>

src/Orchard.Web/Views/Admin/Head.aspx

@@ -19,13 +19,14 @@ todo: (heskew) rework how/what pages are assembled when we get into theming --%>
     <script type="text/javascript">tinyMCE.init({ theme: "advanced", mode: "textareas", plugins: "fullscreen,autoresize", theme_advanced_toolbar_location: "top", theme_advanced_toolbar_align: "left", theme_advanced_buttons3_add: "fullscreen" });</script>
 </head>
 <body>
-    <div id="banner" role="banner">
+    <div id="header" role="banner">
         <h1><%=Html.ActionLink(T("Project Orchard").ToString(), "Index", new { Area = "", Controller = "Home" })%></h1>
-        <div><%=Html.ActionLink(T("Your Site").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
+        <div id="site"><%=Html.ActionLink(T("Your Site").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
-        <% if (Model.CurrentUser != null) {
+        <% if (Model.CurrentUser != null) { //todo: (heskew) localize the string format "User: <username> | a:logoff"
-            %><div id="login"><%=T("User")%><%=H(Model.CurrentUser.UserName)%> | <%=Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "", Controller = "Account" }) %></div><%
+            %><div id="login"><%=T("User")%>: <%=H(Model.CurrentUser.UserName)%> | <%=Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "", Controller = "Account" }) %></div><%
             } %>
     </div>
-    <div id="main" role="main">
+    <div id="content">
-        <div id="content">
+        <div id="navshortcut"><a href="#navigation"><%=T("Skip to navigation") %></a></div>
+        <div id="main" role="main">
             <% Html.RenderPartial("Messages", Model.Messages); %>