More admin cleanup and consolidation...

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

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

@@ -51,16 +51,14 @@ html {
     color:#525e50;
 }
 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 */
 	line-height:1.6em;
     margin:0 auto 1em;
     min-width:94.6em; /* 946px */
     padding:0 .4em;
 }
-body, input, select, textarea {
-	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;
-}
 body#preview {
     min-width:0;
 }
@@ -152,11 +150,13 @@ h2 { font-size:2.4em; } /* 24px */
 h3 { font-size:2.1em; } /* 21px */
 h4 { font-size:1.8em; } /* 18px */
 h5 { font-size:1.6em; } /* 16px */
+
 h6, p, label, input, select, .button, .cancel /* todo: (heskew) need to do something better with cancel */,
 .message, th, td { font-size:1.5em; line-height:1.5em; } /* 15px */
-p .button { font-size:inherit; }
+p .button,
+td *, .mceLayout td { font-size:inherit; }
 
-h3 span { font-size:.57em; }
+h3 span { font-size:.57em; } /* 12px */
 
 /* ---------- Links ---------- */
 a, a:link, a:visited {
@@ -382,7 +382,7 @@ button:focus, .button:focus {
 }
 #main div.actions {
     height:2em;
-    padding:.6em 0 0;
+    padding:.6em 0 .1em;
     text-align:right;
 }
 #main .manage a.button {

src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx

@@ -1,6 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Core.Settings.ViewModels.SettingsIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <div class="yui-u">
         <h2 class="separator">
             Edit Settings</h2>
@@ -21,4 +21,4 @@
         </ol>
         <%}/*EndForm*/%>
     </div>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Orchard.Web.csproj

@@ -161,8 +161,6 @@
     <Content Include="Content\Admin\css\images\background_header.jpg" />
     <Content Include="Content\Admin\css\images\orchardLogo.jpg" />
     <Content Include="Content\Admin\css\images\tableHeaderBackground.gif" />
-    <Content Include="Views\Admin\Footer.aspx" />
-    <Content Include="Views\Admin\Header.aspx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config\Diagnostics.config" />
@@ -176,8 +174,8 @@
     <Content Include="Content\Images\title_background.gif" />
     <Content Include="Content\Site2.css" />
     <Content Include="Content\Site3.css" />
-    <Content Include="Views\Admin\Head.aspx" />
-    <Content Include="Views\Admin\Foot.aspx" />
+    <Content Include="Views\Shared\AdminHead.aspx" />
+    <Content Include="Views\Shared\AdminFoot.aspx" />
     <Content Include="Views\Admin\Messages.ascx" />
     <Content Include="Views\Shared\ExtraUserControl.ascx" />
     <Content Include="Views\Shared\Footer.ascx" />

src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj

@@ -113,8 +113,6 @@
     <Content Include="Views\Blog\DisplayTemplates\BlogsViewModel.ascx" />
     <Content Include="Views\Blog\EditorTemplates\CreateBlogViewModel.ascx" />
     <Content Include="Views\Blog\Item.aspx" />
-    <Content Include="Views\Shared\Foot.aspx" />
-    <Content Include="Views\Shared\Head.aspx" />
     <Content Include="Views\Shared\Messages.ascx" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />

src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx

@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Security" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Create New Blog</h2>
     <p><a href="<%=Url.Blogs() %>">Manage Blogs</a> &gt; Create Blog</p>
     <% using (Html.BeginForm()) { %>
@@ -10,4 +10,4 @@
         <%=Html.EditorForModel() %>
         <fieldset><input class="button" type="submit" value="Create" /></fieldset>
     <% } %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx

@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Edit Blog</h2>
     <p><a href="<%=Url.Blogs() %>">Manage Blogs</a> &gt; Editing <strong><%=Html.Encode(Model.Name)%></strong></p>
     <% using (Html.BeginForm()) { %>
@@ -10,4 +10,4 @@
         <%=Html.EditorForModel() %>
         <fieldset><input class="button" type="submit" value="Save" /></fieldset>
     <% } %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.aspx

@@ -3,8 +3,8 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Manage Blogs</h2>
     <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
     <%=Html.DisplayForModel() %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx

@@ -3,11 +3,11 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Security" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Create a New Blog Post</h2>
     <p><a href="<%=Url.Blogs() %>">Manage Blogs</a> &gt; <a href="<%=Url.BlogEdit(Model.Blog.Slug) %>"><%=Html.Encode(Model.Blog.Name) %></a> &gt; Create Blog Post</p>
     <%using (Html.BeginForm()) { %>
         <%= Html.ValidationSummary() %>
         <%= Html.EditorForModel() %>
     <% } %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx

@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Edit Blog Post</h2>
     <p><a href="<%=Url.Blogs() %>">Manage Blogs</a> &gt; <a href="<%=Url.BlogEdit(Model.Blog.Slug) %>"><%=Html.Encode(Model.Blog.Name)%></a> &gt; <a href="<%=Url.BlogPostEdit(Model.Blog.Slug, Model.Post.Slug) %>"><%=Model.Title %></a></p>
     <% using (Html.BeginForm()) { %>
@@ -18,4 +18,4 @@
             <%=Html.EditorFor(m=>editor.Model, editor.TemplateName, editor.Prefix) %>
         <% } %>
     <%} %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/ListByBlog.aspx

@@ -6,7 +6,8 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<% Html.Include("Header"); %>
+<%-- todo: (heskew) make master-less when we get into theming --%>
+<asp:Content ContentPlaceHolderID="MainContent" runat="server">
     <div class="yui-g">
         <h2>Posts</h2><%
         //TODO: (erikpo) Replace this with an Html extension method of some sort (ListForModel?)
@@ -18,4 +19,4 @@
         </ul><%
         } %>
     </div>
-<% Html.Include("Footer"); %>
+</asp:Content>

src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Delete pages</h2>
     <p>Are you sure you want to delete the pages?</p>
     <% using (Html.BeginForm()) { %>
@@ -22,4 +22,4 @@
             } %>
         </fieldset>
     <% } %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <% using (Html.BeginForm()) { %>
         <h2>Publish later</h2>
         <p>Enter the scheduled publication date:</p>
@@ -22,4 +22,4 @@
             } %>
         </fieldset>
     <% } %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx

@@ -1,7 +1,7 @@
 <%@ 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("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Change Template</h2>
     <p>Select your layout from one of the templates below.</p>    
     <% using (Html.BeginForm()) {
@@ -20,4 +20,4 @@
             <%=Html.ActionLink("Cancel", "Edit", new { Id = ViewContext.RouteData.GetRequiredString("id") }, new { @class = "cancel" })%>
         </div><%
        } %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx

@@ -1,10 +1,10 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Add a Page</h2>
     <p>Select your layout from one of the templates below.</p>
     <% using (Html.BeginForm()) { %>
         <%=Html.ValidationSummary() %>
         <%=Html.EditorForModel() %>
     <% } %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

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("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2><%=_Encoded("Edit Page") %></h2>
     <p class="bottomSpacer"><%=_Encoded("about setting up a page") %></p>
     <%=Html.ValidationSummary() %>
@@ -47,4 +47,4 @@
         </div>
         <% } %>
     </div>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx

@@ -1,6 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<IEnumerable<Orchard.CmsPages.Models.Page>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Export</h2>
     <p>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 et neque eget justo suscipit blandit.</p>
         <ol>
@@ -16,4 +16,4 @@
             </li><%
                } %>
         </ol>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.CmsPages.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <%-- todo: (heskew) localize --%>
-<% Html.Include("Head"); %>
+<% Html.Include("AdminHead"); %>
     <h2>Manage Pages</h2>
     <p>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 et neque eget justo suscipit blandit.</p>
     <% using (Html.BeginForm()) { %>
@@ -97,4 +97,4 @@
         </fieldset>
         <div class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %></div>
     <% } %>
-<% Html.Include("Foot"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx

@@ -1,7 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<CommentsCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Comments.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <%= Html.ValidationSummary() %>
                     <div class="yui-g">
@@ -32,4 +32,4 @@
 					    </ol>
 					</div>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx

@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Comments.Models"%>
 <%@ Import Namespace="Orchard.Comments.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
 						<h2 class="separator">Comments for <%= Model.DisplayNameForCommentedItem %></h2>
@@ -96,4 +96,4 @@
 	</div>
 	
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx

@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Comments.Models"%>
 <%@ Import Namespace="Orchard.Comments.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <%= Html.ValidationSummary() %>
                     <div class="yui-g">
@@ -45,4 +45,4 @@
 					    </ol>
 					</div>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx

@@ -2,38 +2,30 @@
 <%@ Import Namespace="Orchard.Comments.Models"%>
 <%@ Import Namespace="Orchard.Comments.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
+	<h2>Manage Comments</h2>
     <% Html.BeginForm(); %>
-    <div class="yui-g">
-						<h2 class="separator">Manage Comments</h2>
 		<%=Html.ValidationSummary() %>
-						<ol class="horizontal actions floatLeft">
-                        <li>
-                            <label class="floatLeft" for="publishActions"> Actions:</label>
+        <fieldset class="actions bulk">
+            <label for="publishActions">Actions: </label>
             <select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction)%>">
                 <%=Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, "Choose action...")%>
                 <%=Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, "Delete")%>
                 <%=Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, "Mark as Spam")%>
             </select>
-                        </li>
-                        <li>
-                        <input class="button roundCorners" type="submit" name="submit.BulkEdit" value="Apply" />
-                        </li>
-                        </ol>
-                        <ol class="horizontal actions">
-                        <li>
-                            <label class="floatLeft" for="filterResults"></label>
+            <input class="button" type="submit" name="submit.BulkEdit" value="Apply" />
+        </fieldset>
+        <fieldset class="actions bulk">
+            <label for="filterResults">Filter: </label>
             <select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter)%>">
                 <%=Html.SelectOption(Model.Options.Filter, CommentIndexFilter.All, "All Comments")%>
                 <%=Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Approved, "Approved Comments")%>
                 <%=Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Spam, "Spam")%>
             </select>
-                        </li>
-                        <li>
-                        <input class="button roundCorners" type="submit" name="submit.Filter" value="Filter"/>
-                        </li>
-                        </ol>
-						<table id="Table1" cellspacing="0" class="roundCorners clearLayout" summary="This is a table of the comments in your application">
+            <input class="button" type="submit" name="submit.Filter" value="Filter"/>
+        </fieldset>
+        <fieldset>
+		    <table summary="This is a table of the comments in your application">
 			    <colgroup>
 				    <col id="Col1" />
 				    <col id="Col2" />
@@ -45,7 +37,7 @@
 			    </colgroup>
 			    <thead>
 				    <tr>
-									<th scope="col"><%--<input type="checkbox" value="" />--%></th>
+					    <th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
 					    <th scope="col">Status</th>
 					    <th scope="col">Author</th>
 					    <th scope="col">Comment</th>
@@ -85,6 +77,6 @@
                     commentIndex++;
                     } %>
             </table>
-	</div>
+        </fieldset>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
 					<div class="yui-g">
 						<h2 class="separator">Add Media </h2>
 						<p class="bottomSpacer">
@@ -30,4 +30,4 @@
                         <% } %>    
                         </div>
 					</div>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
                     <div class="yui-g">
 						<h2 class="separator">Add a New Folder</h2>
 						<p class="bottomSpacer">
@@ -27,4 +27,4 @@
 						        </ol>
                                 <%}%>
 					</div>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
 						<h2 class="separator">Manage Folder</h2>
@@ -92,4 +92,4 @@
 				        </table>
 	</div>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
 					<div class="yui-g">
 						<h2 class="separator">Edit Media - <%= Model.Name %></h2>
 						<p class="bottomSpacer">
@@ -74,4 +74,4 @@
 							</fieldset>
 						</div>
 					</div>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
                     <div class="yui-g">
 						<h2 class="separator">Folder Properties</h2>
 						<p class="bottomSpacer">
@@ -29,4 +29,4 @@
 						        </ol>
                                 <%}%>
 					</div>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx

@@ -1,13 +1,11 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<MediaFolderIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
+	<h2>Manage Media Folders</h2>
     <% Html.BeginForm(); %>
-    <div class="yui-g">
-						<h2 class="separator">Manage Media Folders</h2>
-						<p class="bottomSpacer">
-						<%=Html.ActionLink("Media Folders", "Index")%> &#62; 
-						Manage Media Folders</p>
+		<p><%=Html.ActionLink("Media Folders", "Index")%> &#62; Manage Media Folders</p>
+        <%=Html.ValidationSummary() %>
 						<ol class="horizontal actions floatLeft">
 							<li><label class="floatLeft" for="bulkActions">Actions:</label>
 							<select id="Select1" name="publishActions">
@@ -55,4 +53,4 @@
 				        </table>
 	</div>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx

@@ -1,7 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<RoleCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Roles.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <%= Html.ValidationSummary() %>
                     <div class="yui-g">
@@ -37,4 +37,4 @@
 					       <input type="submit" class="button" value="Save" />
 					</div>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx

@@ -1,7 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<RoleEditViewModel>" %>
 <%@ Import Namespace="Orchard.Roles.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <%= Html.ValidationSummary() %>
                     <div class="yui-g">
@@ -43,4 +43,4 @@
 								<input type="submit" class="button" name="submit.Delete" value="Delete" />
 					</div>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx

@@ -1,6 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Roles.ViewModels.RolesIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
         <h2 class="separator">Manage Roles</h2>
@@ -39,4 +39,4 @@
 	    </table>
     </div>
     <% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Create.aspx

@@ -1,14 +1,14 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsAdminCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
+	<h2>Add a Tag</h2>
     <% Html.BeginForm(); %>
         <%= Html.ValidationSummary() %>
-                    <div class="yui-g">
-						<h2 class="separator">Add a Tag</h2>
+        <fieldset>
 	        <label for="TagName">Name:</label>
-						<input id="TagName" class="inputText inputTextLarge" name="TagName" type="text" value="<%= Model.TagName %>" />
+		    <input id="TagName" class="text" name="TagName" type="text" value="<%= Model.TagName %>" />
 	        <input type="submit" class="button" value="Save" />
-					</div>
+        </fieldset>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Edit.aspx

@@ -1,22 +1,15 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsAdminEditViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
+	<h2>Edit a Tag</h2>
     <% Html.BeginForm(); %>
         <%= Html.ValidationSummary() %>
-                    <div class="yui-g">
-						<h2 class="separator">Edit a Tag</h2>
-						<h3>Information</h3>
-						<ol>
-						<li>
+	    <fieldset>
             <label for="Name">Name:</label>
             <input id="Id" name="Id" type="hidden" value="<%=Model.Id %>" />
-						<input id="TagName" class="inputText inputTextLarge" name="TagName" type="text" value="<%= Model.TagName %>" />
-						</li>
-					    <li>
+	        <input id="TagName" class="text" name="TagName" type="text" value="<%= Model.TagName %>" />
 		    <input type="submit" class="button" value="Save" />
-					    </li>
-					    </ol>
-					</div>
+		</fieldset>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx

@@ -1,27 +1,21 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsAdminIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
+	<h2>Manage Tags</h2>
     <% Html.BeginForm(); %>
-    <div class="yui-g">
-						<h2 class="separator">Manage Tags</h2>
 		<%=Html.ValidationSummary() %>
-						<ol class="horizontal actions floatLeft">
-                        <li>
-                            <label class="floatLeft" for="publishActions"> Actions:</label>
+        <fieldset class="actions bulk">
+            <label for="publishActions">Actions: </label>
             <select id="publishActions" name="<%=Html.NameOf(m => m.BulkAction)%>">
                 <%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, "Choose action...")%>
                 <%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.Delete, "Delete")%>
             </select>
-                        </li>
-                        <li>
             <input class="button roundCorners" type="submit" name="submit" value="Apply" />
-                        </li>
-                        </ol>
-                        <span class="filterActions">
-						    <%=Html.ActionLink("Add a new tag", "Create") %>
-						</span>
-						<table id="Table1" cellspacing="0" class="roundCorners clearLayout" summary="This is a table of the tags in your application">
+        </fieldset>
+        <div class="manage"><%=Html.ActionLink("Add a tag", "Create", new { }, new { @class = "button" })%></div>
+		<fieldset>
+		    <table summary="This is a table of the tags in your application">
 			    <colgroup>
 				    <col id="Col1" />
 				    <col id="Col2" />
@@ -29,7 +23,7 @@
 			    </colgroup>
 			    <thead>
 				    <tr>
-									<th scope="col"><%--<input type="checkbox" value="" />--%></th>
+					    <th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
 					    <th scope="col">Name</th>
 					    <th scope="col"></th>
 				    </tr>
@@ -52,6 +46,7 @@
                 </tr>
                 <% tagIndex++; } %>
             </table>
-	</div>
+        </fieldset>
+        <div class="manage"><%=Html.ActionLink("Add a tag", "Create", new { }, new { @class = "button" })%></div>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx

@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Models"%>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
 						<h2 class="separator">List of contents tagged with <%= Model.TagName %></h2>
@@ -31,4 +31,4 @@
 				        </table>
 	</div>
 	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx

@@ -1,7 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UserCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Security" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <div class="yui-u">
         <h2 class="separator">
             Add a new User</h2>
@@ -18,4 +18,4 @@
         </ol>
         <%}/*EndForm*/%>
     </div>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx

@@ -1,7 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UserEditViewModel>" %>
 <%@ Import Namespace="Orchard.Security" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <div class="yui-u">
         <h2 class="separator">
             Edit User</h2>
@@ -21,4 +21,4 @@
         </ol>
         <%}/*EndForm*/%>
     </div>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx

@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Models"%>
 <%@ Import Namespace="Orchard.Security" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("Header"); %>
+<% Html.Include("AdminHead"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
         <h2>
@@ -44,4 +44,4 @@
         </table>
     </div>
     <% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
+<% Html.Include("AdminFoot"); %>

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

@@ -1,19 +0,0 @@
-<%@ 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>
-            <%if (Model.AdminMenu != null) {
-                  foreach (var menuSection in Model.AdminMenu) {%>
-                  <li><h4><%=Html.Encode(menuSection.Text)%></h4><ul><%foreach (var menuItem in menuSection.Items) { %>
-                  <li><%=Html.ActionLink(menuItem.Text, (string)menuItem.RouteValues["action"], menuItem.RouteValues)%></li>
-                  <%} %></ul></li>
-            <%
-                }
-              }%>
-        </ul>
-    </div><%-- #content --%>
-    <div id="footer" role="contentinfo"></div><%-- #contentinfo --%>
-</body>
-</html>

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

@@ -1,24 +0,0 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<AdminViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-                </div><%-- yui-b --%>
-            </div><%-- yui-main --%>
-            <%-- Navigation --%>
-            <div class="yui-b">
-                <div class="leftNavMod">
-                    <h4>Dashboard</h4>
-                </div>
-                <%if (Model.AdminMenu != null) {
-                      foreach (var menuSection in Model.AdminMenu) {%>
-                      <div class="leftNavMod"><h4><%=Html.Encode(menuSection.Text)%></h4><ul><%foreach (var menuItem in menuSection.Items) { %>
-                      <li><%=Html.ActionLink(menuItem.Text, (string)menuItem.RouteValues["action"], menuItem.RouteValues)%></li>
-                      <%} %></ul></div>
-                <%
-                    }
-                  }%>
-            </div>
-        </div><%-- bd --%>
-        <div id="ft" role="contentinfo">
-        </div>
-    </div><%-- yui-t2 --%>
-</body>
-</html>

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

@@ -1,45 +0,0 @@
-<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<AdminViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
-<%@ Import Namespace="Orchard.Mvc.Html"
-%><%--
-todo: (heskew) rework how/what pages are assembled when we get into theming --%><!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <%-- todo: (heskew) get this from the menu system
-    --%><title>Admin :: Orchard</title>
-    <%-- 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) 
-         todo: (heskew) should have at the minimum something like, say, includeScript(scriptName[, releaseScriptName], scriptPath[, releaseScriptPath])
-    --%><script src="<%=Page.ResolveClientUrl("~/Scripts/jquery-1.3.2.js") %>" type="text/javascript"></script>
-    <%-- todo: (heskew) this should come from the admin "page" (partial)
-         todo: (heskew) use the TinyMCE jQuery package instead?
-    --%><script type="text/javascript" src="<%=ResolveUrl("~/Packages/TinyMce/Scripts/tiny_mce.js") %>"></script>
-    <script type="text/javascript">
-        tinyMCE.init({
-            theme: "advanced",
-            mode: "specific_textareas",
-            editor_selector: "html",
-            plugins: "fullscreen,autoresize,searchreplace",
-            theme_advanced_toolbar_location: "top",
-            theme_advanced_toolbar_align: "left",
-            theme_advanced_buttons1: "search,replace,|,cut,copy,paste,|,undo,redo,|,image,|,link,unlink,charmap,emoticon,codeblock,|,bold,italic,|,numlist,bullist,formatselect,|,code,fullscreen",
-            theme_advanced_buttons2: "",
-            theme_advanced_buttons3: ""
-            });
-        </script>
-</head>
-<body>
-    <div id="header" role="banner">
-        <h1><%=Html.ActionLink(T("Project Orchard").ToString(), "Index", new { Area = "", Controller = "Home" })%></h1>
-        <div id="site"><%=Html.ActionLink(T("Your Site").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
-        <% 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>
-    <div id="content">
-        <div id="navshortcut"><a href="#navigation"><%=T("Skip to navigation") %></a></div>
-        <div id="main" role="main">
-            <div class="wrapper">
-                <% Html.RenderPartial("Messages", Model.Messages); %>

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

@@ -1,40 +0,0 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<AdminViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"
-%><!DOCTYPE html>
-<html>
-<head>
-    <title>Admin :: Orchard</title>
-    <link href="http://yui.yahooapis.com/2.7.0/build/reset-fonts-grids/reset-fonts-grids.css" rel="stylesheet" type="text/css" />
-    <%-- todo: (heskew) same as scripts [below] --%>
-    <link href="<%=Page.ResolveClientUrl("~/Content/Admin/css/Site.css") %>" rel="stylesheet" type="text/css" />
-    <%-- todo: (heskew) this should come from the admin "page" (partial) --%>
-    <%-- todo: (heskew) should have at the minimum something like, say, includeScript(scriptName[, releaseScriptName], scriptPath[, releaseScriptPath]) --%>
-    <script src="<%=Page.ResolveClientUrl("~/Scripts/jquery-1.3.2.js") %>" type="text/javascript"></script>
-    <%-- todo: (heskew) this should come from the admin "page" (partial) --%>
-    <script type="text/javascript" src="<%=ResolveUrl("~/Packages/TinyMce/Scripts/tiny_mce.js") %>"></script>
-    <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="doc3" class="yui-t2">
-        <div id="hd" role="banner">
-            <div class="yui-g">
-                <div class="yui-u first">
-                    <h1>
-                        <a href="<%=Url.Action("Index", new{Area="",Controller="Home"}) %>"><span class="displayText">
-                            Project Orchard</span></a></h1>
-                    <%= Html.ActionLink("Your Site", "Index", new { Area = "", Controller = "Home" })%>
-                </div>
-                <div class="yui-u">
-                <% if (Model.CurrentUser != null) { %>
-                    <div id="login">
-                        User:
-                        <%=Model.CurrentUser.UserName%>
-                        | <%=Html.ActionLink("Logout", "LogOff", "Account", new {}, new{area=""})%></div>
-                        <%} %>
-                </div>
-            </div>
-        </div>
-        <div id="bd" role="main">
-            <div id="yui-main">
-                <div class="yui-b">
-                    <% Html.RenderPartial("Messages", Model.Messages); %>