From 0e82f05a426f066c2c44553e80df12935d9cf07d Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Sun, 22 Nov 2009 08:46:22 +0000
Subject: [PATCH] Some more work on the admin UI (expanding scope to all
 CMSPages admin pages) - mainly markup/CSS cleanup and touch-up and dropping
 YUI reset in favor pulling some Eric Meyer reset into the base

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041743
---
 src/Orchard.Web/Content/Admin/css/base.css    |  73 ++++++++--
 .../Content/Admin/css/yui.reset-3.0.0.css     | 126 ------------------
 .../Content/Admin/css/yui.reset-3.0.0.min.css |   8 --
 src/Orchard.Web/Orchard.Web.csproj            |   2 -
 .../Views/Admin/BulkDeleteConfirm.aspx        |   6 +-
 .../Views/Admin/BulkPublishLater.aspx         |   6 +-
 .../Views/Admin/ChooseTemplate.aspx           |   8 +-
 .../Orchard.CmsPages/Views/Admin/Create.aspx  |   6 +-
 .../Orchard.CmsPages/Views/Admin/Edit.aspx    |   4 +-
 .../EditorTemplates/PageCreateViewModel.ascx  |   2 +-
 .../Orchard.CmsPages/Views/Admin/Export.aspx  |   7 +-
 .../Orchard.CmsPages/Views/Admin/Index.aspx   |   3 +-
 src/Orchard.Web/Views/Admin/Foot.aspx         |   1 +
 src/Orchard.Web/Views/Admin/Head.aspx         |   4 +-
 14 files changed, 83 insertions(+), 173 deletions(-)
 delete mode 100644 src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.css
 delete mode 100644 src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.min.css

diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css
index 384297120..f178b7f8a 100644
--- a/src/Orchard.Web/Content/Admin/css/base.css
+++ b/src/Orchard.Web/Content/Admin/css/base.css
@@ -1,4 +1,49 @@
-html {
+/* begin: reset
+   todo: (nheskew) pare down and combine with existing selectors where appropriate */
+/* http://meyerweb.com/eric/tools/css/reset/ */
+/* v1.0 | 20080212 */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	border:0;
+	font-size:100%;
+	margin:0;
+	padding:0;
+	vertical-align:baseline;
+}
+ol, ul {
+	list-style:none;
+}
+blockquote, q {
+	quotes:none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content:'';
+	content:none;
+}
+:focus {
+	outline:0;
+}
+ins {
+	text-decoration:none;
+}
+del {
+	text-decoration:line-through;
+}
+table {
+	border-collapse:collapse;
+	border-spacing:0;
+}
+/* end: reset */
+
+html {
     background:#8a8f7a;
     color:#525e50;
 }
@@ -6,7 +51,7 @@ 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;*/
+	line-height:1.6em;
     margin:0 auto 1em;
     min-width:96em; /* 960px */
     padding:0 .4em;
@@ -48,7 +93,6 @@ a, a:link, a:visited {
 }
 a:hover, a:active, a:focus {
     color:#1e5d7d;
-    outline:0;
     text-decoration:underline;
 }
 
@@ -79,7 +123,7 @@ a.linkButton, a.linkButton:visited {
 	background:url(images/orchardLogo.jpg) no-repeat;
 	display:block;
 	height:60px;
-	margin:-10px 0 0 14px;
+	margin:-11px 0 0 14px;
 	text-indent:-9999px;
 	width:105px;
 }
@@ -126,12 +170,16 @@ a.linkButton, a.linkButton:visited {
 #main {
     display:inline;
     float:right;
-    width:83.06%;
+    margin-left:-22em;
+    width:100%;
+}
+#main .wrapper {
+    margin-left:22em;
 }
 #navigation {
     display:inline;
     float:left;
-    width:15.28%;
+    width:20.5em;
 }
 
 /* Navigation
@@ -145,7 +193,7 @@ a.linkButton, a.linkButton:visited {
 #navigation li {
 	background:#fff;
 	border:1px solid #d2d6c6;
-	margin:10px 0 14px 0;
+	margin:10px 0 15px 0;
 }
 #navigation ul li {
     border:0;
@@ -153,7 +201,7 @@ a.linkButton, a.linkButton:visited {
 }
 #navigation li h4 {
 	background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
-	padding:4px 4px 6px 8px;
+	padding:6px 4px 8px 8px;
 }
 #navigation ul a {
 	color:#5a5b32;
@@ -171,16 +219,16 @@ a.linkButton, a.linkButton:visited {
 #navigation ul a:hover, #navigation ul a:focus {
 	background:#f0ecd2;
 	color: #3e4301;
-	outline:0;
 	text-decoration:underline;
 }
 
 /* Content
 ----------------------------------------------------------*/
-#content h2 {
+#main h2, #main h3, #main h4 {
+    margin:.23em 0 1em;
+}
+#main h2 {
     border-bottom:1px dashed #e4e7dc;
-    margin:3px 0 8px;
-    padding:0 0 2px;
 }
 
 
@@ -218,7 +266,6 @@ div.confirmation, div.warning, div.critical {
 
 fieldset {
 	margin:10px;
-	padding:10px;
 	border:1px solid #d2d6c6;
 }
 
diff --git a/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.css b/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.css
deleted file mode 100644
index ccc5479ea..000000000
--- a/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.css
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-Copyright (c) 2009, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 3.0.0
-build: 1549
-*/
-/*
-	TODO will need to remove settings on HTML since we can't namespace it.
-	TODO with the prefix, should I group by selector or property for weight savings?
-*/
-html{
-	color:#000;
-	background:#FFF;
-}
-/*
-	TODO remove settings on BODY since we can't namespace it.
-*/
-/*
-	TODO test putting a class on HEAD.
-		- Fails on FF. 
-*/
-body,
-div,
-dl,
-dt,
-dd,
-ul,
-ol,
-li,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-pre,
-code,
-form,
-fieldset,
-legend,
-input,
-textarea,
-p,
-blockquote,
-th,
-td {
-	margin:0;
-	padding:0;
-}
-table {
-	border-collapse:collapse;
-	border-spacing:0;
-}
-fieldset,
-img {
-	border:0;
-}
-/*
-	TODO think about hanlding inheritence differently, maybe letting IE6 fail a bit...
-*/
-address,
-caption,
-cite,
-code,
-dfn,
-em,
-strong,
-th,
-var {
-	font-style:normal;
-	font-weight:normal;
-}
-/*
-	TODO Figure out where this list-style rule is best set. Hedger has a request to investigate.
-*/
-li {
-	list-style:none;
-}
-
-caption,
-th {
-	text-align:left;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-	font-size:100%;
-	font-weight:normal;
-}
-q:before,
-q:after {
-	content:'';
-}
-abbr,
-acronym {
-	border:0;
-	font-variant:normal;
-}
-/* to preserve line-height and selector appearance */
-sup {
-	vertical-align:text-top;
-}
-sub {
-	vertical-align:text-bottom;
-}
-input,
-textarea,
-select {
-	font-family:inherit;
-	font-size:inherit;
-	font-weight:inherit;
-}
-/*to enable resizing for IE*/
-input,
-textarea,
-select {
-	*font-size:100%;
-}
-/*because legend doesn't inherit in IE */
-legend {
-	color:#000;
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.min.css b/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.min.css
deleted file mode 100644
index fb264a0c5..000000000
--- a/src/Orchard.Web/Content/Admin/css/yui.reset-3.0.0.min.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-Copyright (c) 2009, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 3.0.0
-build: 1549
-*/
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}
\ No newline at end of file
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index ff42546ef..9f18e77ba 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -164,8 +164,6 @@
     <Content Include="Config\Diagnostics.config" />
     <Content Include="Content\Admin\css\base.css" />
     <Content Include="Content\Admin\css\Site.css" />
-    <Content Include="Content\Admin\css\yui.reset-3.0.0.min.css" />
-    <Content Include="Content\Admin\css\yui.reset-3.0.0.css" />
     <Content Include="Content\Images\headerBackground.gif" />
     <Content Include="Content\Images\header_background.gif" />
     <Content Include="Content\Images\innerheader_background.gif" />
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx
index c224ffd61..db6ea5e47 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx
@@ -3,9 +3,9 @@
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("Head"); %>
     <div class="yui-u">
-        <h2 class="separator">Delete pages</h2>
+        <h2>Delete pages</h2>
         <p class="bottomSpacer">
             Are you sure you want to delete the pages?</p>
     </div>
@@ -34,4 +34,4 @@
             }%>
         <%}/*EndForm*/%>
     </div>
-<% Html.Include("Footer"); %>
\ No newline at end of file
+<% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx
index b6534f919..caff2098e 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx
@@ -3,10 +3,10 @@
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("Head"); %>
     <%using (Html.BeginForm()) { %>
     <div class="yui-u">
-        <h2 class="separator">Publish later</h2>
+        <h2>Publish later</h2>
         <p class="bottomSpacer">Enter the scheduled publication date:</p>
         <%=Html.EditorFor(m => m.Options.BulkPublishLaterDate)%>
     </div>
@@ -33,4 +33,4 @@
             }%>
     </div>
     <%}/*EndForm*/%>
-<% Html.Include("Footer"); %>
\ No newline at end of file
+<% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
index 489886104..e19fe43ff 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
@@ -1,9 +1,9 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.ChooseTemplateViewModel>" %>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("Head"); %>
     <div class="yui-u">
-        <h2 class="separator">Change Template</h2>
+        <h2>Change Template</h2>
         <p class="bottomSpacer">
             Select your layout from one of the templates below.</p>
     </div>
@@ -20,7 +20,7 @@
             <li>
             <ul>
             <li class="clearLayout">
-            <h4 class="separator"><%=Html.Encode(template.DisplayName)%></h4>
+            <h3><%=Html.Encode(template.DisplayName)%></h3>
             </li>
             <li>
             <label title="<%=Html.Encode(template.DisplayName)%>" for="TemplateName_<%=template.Name%>">
@@ -38,4 +38,4 @@
 
         <%}/*EndForm*/%>
     </div>
-<% Html.Include("Footer"); %>
\ No newline at end of file
+<% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
index a7cbd7709..93f78f85c 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
@@ -1,8 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("Head"); %>
     <div class="yui-u">
-        <h2 class="separator">Add a Page</h2>
+        <h2>Add a Page</h2>
         <p class="bottomSpacer">
             Select your layout from one of the templates below.</p>
     </div>
@@ -12,4 +12,4 @@
         <%= Html.EditorForModel() %>
         <%}/*EndForm*/%>
     </div>
-<% Html.Include("Footer"); %>
\ No newline at end of file
+<% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
index d64e95fee..d922596c0 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageEditViewModel>" %>
 <%@ Import Namespace="Orchard.CmsPages.Models"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("Head"); %>
     <div class="yui-g">    
         <h2><%=_Encoded("Edit Page")%></h2>
         <p class="bottomSpacer"><%=_Encoded("about setting up a page")%></p>
@@ -54,4 +54,4 @@
         </div>
         <%}/*EndForm*/%>
     </div>
-<% Html.Include("Footer"); %>
\ No newline at end of file
+<% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx
index 6d7d2c52e..b7cd526fe 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx
@@ -14,7 +14,7 @@
             <li>
             <ul>
             <li class="clearLayout">
-            <h4 class="separator"><%=Html.Encode(template.DisplayName)%></h4>
+            <h3><%=Html.Encode(template.DisplayName)%></h3>
             </li>
             <li>
             <label title="<%=Html.Encode(template.DisplayName)%>" for="TemplateName_<%=template.Name%>">
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
index 8aae5ae21..3edf9bb9c 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<System.Collections.Generic.IEnumerable<Orchard.CmsPages.Models.Page>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("Head"); %>
     <div class="yui-g">
-        <h2>
-            Export</h2>
+        <h2>Export</h2>
         <p class="bottomSpacer">
             Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur
             adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris
@@ -17,4 +16,4 @@
             <%} %></ol>
             </li><%} %></ol>
     </div>
-<% Html.Include("Footer"); %>
\ No newline at end of file
+<% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
index 9a09cb3b1..37645e4be 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
@@ -19,8 +19,7 @@ string SplitDateTime(DateTime dt)
 <% Html.Include("Head"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
-        <h2>
-            Manage Pages</h2>
+        <h2>Manage Pages</h2>
         <p class="bottomSpacer">
             Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur
             adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris
diff --git a/src/Orchard.Web/Views/Admin/Foot.aspx b/src/Orchard.Web/Views/Admin/Foot.aspx
index fe55950a3..a64d05d48 100644
--- a/src/Orchard.Web/Views/Admin/Foot.aspx
+++ b/src/Orchard.Web/Views/Admin/Foot.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<AdminViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+            </div><%-- .wrapper --%>
         </div><%-- #main --%>
         <ul id="navigation" role="navigation">
             <li class="first"><h4>Dashboard</h4></li>
diff --git a/src/Orchard.Web/Views/Admin/Head.aspx b/src/Orchard.Web/Views/Admin/Head.aspx
index 3fc10ca34..581ba211a 100644
--- a/src/Orchard.Web/Views/Admin/Head.aspx
+++ b/src/Orchard.Web/Views/Admin/Head.aspx
@@ -8,7 +8,6 @@ todo: (heskew) rework how/what pages are assembled when we get into theming --%>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <%-- todo: (heskew) get this from the menu system
     --%><title>Admin :: Orchard</title>
-    <link href="<%=Page.ResolveClientUrl("~/Content/Admin/css/yui.reset-3.0.0.css") %>" rel="stylesheet" type="text/css" />
     <%-- todo: (heskew) same as scripts [below]
     --%><link href="<%=Page.ResolveClientUrl("~/Content/Admin/css/base.css") %>" rel="stylesheet" type="text/css" />
     <%-- todo: (heskew) this should come from the admin "page" (partial) 
@@ -29,4 +28,5 @@ todo: (heskew) rework how/what pages are assembled when we get into theming --%>
     <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); %>
\ No newline at end of file
+            <div class="wrapper">
+                <% Html.RenderPartial("Messages", Model.Messages); %>
\ No newline at end of file