From 88637093147f9d15fd20ca1c653cf12701d969fe Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Thu, 19 Nov 2009 09:28:45 +0000
Subject: [PATCH] Some initial work on admin view cleanup.

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041367
---
 .../Core/Settings/Views/Admin/Index.aspx      | 14 +-----
 src/Orchard.Web/Orchard.Web.csproj            |  1 -
 .../Orchard.Blogs/Views/Admin/Index.aspx      | 13 +-----
 .../Views/Admin/BulkDeleteConfirm.aspx        | 14 +-----
 .../Views/Admin/BulkPublishLater.aspx         | 14 +-----
 .../Views/Admin/ChooseTemplate.aspx           | 14 +-----
 .../Orchard.CmsPages/Views/Admin/Create.aspx  | 14 +-----
 .../Orchard.CmsPages/Views/Admin/Edit.aspx    | 25 +----------
 .../Orchard.CmsPages/Views/Admin/Export.aspx  | 14 +-----
 .../Orchard.CmsPages/Views/Admin/Index.aspx   | 16 ++-----
 .../Orchard.Media/Views/Admin/Add.aspx        | 14 +-----
 .../Orchard.Media/Views/Admin/Create.aspx     | 14 +-----
 .../Orchard.Media/Views/Admin/Edit.aspx       | 14 +-----
 .../Orchard.Media/Views/Admin/EditMedia.aspx  | 14 +-----
 .../Views/Admin/EditProperties.aspx           | 14 +-----
 .../Orchard.Media/Views/Admin/Index.aspx      | 14 +-----
 .../Orchard.Roles/Views/Admin/Create.aspx     | 14 +-----
 .../Orchard.Roles/Views/Admin/Edit.aspx       | 14 +-----
 .../Orchard.Roles/Views/Admin/Index.aspx      | 14 +-----
 .../Orchard.Users/Views/Admin/Create.aspx     | 14 +-----
 .../Orchard.Users/Views/Admin/Edit.aspx       | 14 +-----
 .../Orchard.Wikis/Views/Admin/Index.aspx      | 15 +------
 src/Orchard.Web/Views/Admin/Footer.aspx       | 43 +++++++++----------
 src/Orchard.Web/Views/Admin/Head.aspx         | 22 ----------
 src/Orchard.Web/Views/Admin/Header.aspx       | 23 ++++++++--
 25 files changed, 83 insertions(+), 313 deletions(-)
 delete mode 100644 src/Orchard.Web/Views/Admin/Head.aspx
diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx
index 6ec0ccd09..7db53e96e 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx
@@ -1,14 +1,6 @@
 ﻿<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Core.Settings.ViewModels.SettingsIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Edit Site Settings</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-u">
         <h2 class="separator">
             Edit Settings</h2>
@@ -29,6 +21,4 @@
         </ol>
         <%}/*EndForm*/%>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 575fc1e0d..0849e03d5 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -155,7 +155,6 @@
     <Content Include="Content\Admin\images\tableHeaderBackground.gif" />
     <Content Include="Content\Admin\Site.css" />
     <Content Include="Views\Admin\Footer.aspx" />
-    <Content Include="Views\Admin\Head.aspx" />
     <Content Include="Views\Admin\Header.aspx" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Admin/Index.aspx
index 47246c920..7c1f59541 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Admin/Index.aspx
@@ -1,17 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<AdminViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-g">
         <h2>Blogs Admin</h2>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
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 8d543eb8e..c224ffd61 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx
@@ -3,15 +3,7 @@
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-
-<!DOCTYPE html>
-<html>
-<head id="Head1" runat="server">
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-u">
         <h2 class="separator">Delete pages</h2>
         <p class="bottomSpacer">
@@ -42,6 +34,4 @@
             }%>
         <%}/*EndForm*/%>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ 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 319b3c07c..b6534f919 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx
@@ -3,15 +3,7 @@
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-
-<!DOCTYPE html>
-<html>
-<head id="Head1" runat="server">
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <%using (Html.BeginForm()) { %>
     <div class="yui-u">
         <h2 class="separator">Publish later</h2>
@@ -41,6 +33,4 @@
             }%>
     </div>
     <%}/*EndForm*/%>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ 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 3a9e34f02..489886104 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
@@ -1,15 +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" %>
-
-<!DOCTYPE html>
-<html>
-<head id="Head1" runat="server">
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-u">
         <h2 class="separator">Change Template</h2>
         <p class="bottomSpacer">
@@ -46,6 +38,4 @@
 
         <%}/*EndForm*/%>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ 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 80f9c4a26..a7cbd7709 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
@@ -1,14 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %>
-
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html>
-<html>
-<head id="Head1" runat="server">
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-u">
         <h2 class="separator">Add a Page</h2>
         <p class="bottomSpacer">
@@ -20,6 +12,4 @@
         <%= Html.EditorForModel() %>
         <%}/*EndForm*/%>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ 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 dde8cb926..8ea185d2c 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
@@ -1,25 +1,7 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageEditViewModel>" %>
 <%@ Import Namespace="Orchard.CmsPages.Models"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-
-<!DOCTYPE html>
-<html>
-<head id="Head1" runat="server">
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-    <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>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-g">    
         <h2><%=T("Edit Page")%></h2>
         <p class="bottomSpacer"><%=T("about setting up a page")%></p>
@@ -72,7 +54,4 @@
         </div>
         <%}/*EndForm*/%>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
-
+<% Html.Include("Footer"); %>
\ No newline at end of file
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 473631dd0..8aae5ae21 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
@@ -1,14 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<System.Collections.Generic.IEnumerable<Orchard.CmsPages.Models.Page>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-
-<!DOCTYPE html>
-<html>
-<head id="Head1" runat="server">
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-g">
         <h2>
             Export</h2>
@@ -25,6 +17,4 @@
             <%} %></ol>
             </li><%} %></ol>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ 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 5c0eb26c2..645e51f07 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-
+<%-- todo: (nheskew) not this --%>
 <script runat="server">
 public string DefaultText(string valueText, string defaultText)
 {
@@ -16,15 +16,7 @@ string SplitDateTime(DateTime dt)
            string.Format("{0:t}", dt);
 }
 </script>
-
-<!DOCTYPE html>
-<html>
-<head id="Head1" runat="server">
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
         <h2>
@@ -132,6 +124,4 @@ string SplitDateTime(DateTime dt)
         <%=Html.ActionLink("Add a page", "Create", new {}, new {@class="floatRight bottomSpacer"}) %>
     </div>
     <% Html.EndForm(); %>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx
index d01d78d8e..1f1515fdf 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx
@@ -2,16 +2,8 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Add Media</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
 					<div class="yui-g">
 						<h2 class="separator">Add Media </h2>
 						<p class="bottomSpacer">
@@ -38,6 +30,4 @@
                         <% } %>    
                         </div>
 					</div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx
index 87076bee1..a9f75ed30 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx
@@ -2,16 +2,8 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Create Media Folder</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
                     <div class="yui-g">
 						<h2 class="separator">Add a New Folder</h2>
 						<p class="bottomSpacer">
@@ -35,6 +27,4 @@
 						        </ol>
                                 <%}%>
 					</div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx
index 353a4d718..aa693971a 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx
@@ -3,15 +3,7 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Manage Media Folder</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
 						<h2 class="separator">Manage Folder</h2>
@@ -100,6 +92,4 @@
 				        </table>
 	</div>
 	<% Html.EndForm(); %>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx
index 264deb78e..0a599b03c 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx
@@ -2,16 +2,8 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Edit Media File</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
 					<div class="yui-g">
 						<h2 class="separator">Edit Media - <%= Model.Name %></h2>
 						<p class="bottomSpacer">
@@ -82,6 +74,4 @@
 							</fieldset>
 						</div>
 					</div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx
index f5015f56e..9ef4a5eac 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx
@@ -2,16 +2,8 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Media Folder Properties</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
                     <div class="yui-g">
 						<h2 class="separator">Folder Properties</h2>
 						<p class="bottomSpacer">
@@ -37,6 +29,4 @@
 						        </ol>
                                 <%}%>
 					</div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx
index 13fdedbf9..ae5f803aa 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx
@@ -1,15 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<MediaFolderIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Media Folders</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
 						<h2 class="separator">Manage Media Folders</h2>
@@ -63,6 +55,4 @@
 				        </table>
 	</div>
 	<% Html.EndForm(); %>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
index 238fbd20c..35c73847c 100644
--- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
@@ -1,15 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<RoleCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Roles.ViewModels"%>
-
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Add a Role</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <% Html.BeginForm(); %>
     <%= Html.ValidationSummary() %>
                     <div class="yui-g">
@@ -45,6 +37,4 @@
 					       <input type="submit" class="button" value="Save" />
 					</div>
 	<% Html.EndForm(); %>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx
index d261aca50..2f0daa2b4 100644
--- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx
@@ -1,15 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<RoleEditViewModel>" %>
 <%@ Import Namespace="Orchard.Roles.ViewModels"%>
-
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Edit a Role</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <% Html.BeginForm(); %>
     <%= Html.ValidationSummary() %>
                     <div class="yui-g">
@@ -51,6 +43,4 @@
 								<input type="submit" class="button" name="submit.Delete" value="Delete" />
 					</div>
 	<% Html.EndForm(); %>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx
index 1d47f0999..3602b8099 100644
--- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx
@@ -1,14 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Roles.ViewModels.RolesIndexViewModel>" %>
-
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>Manage Roles</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
         <h2 class="separator">Manage Roles</h2>
@@ -47,6 +39,4 @@
 	    </table>
     </div>
     <% Html.EndForm(); %>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx
index 20e83e125..fc207b5ae 100644
--- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx
@@ -1,15 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UserCreateViewModel>" %>
-
 <%@ Import Namespace="Orchard.Security" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>Add a new User</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-u">
         <h2 class="separator">
             Add a new User</h2>
@@ -26,6 +18,4 @@
         </ol>
         <%}/*EndForm*/%>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx
index c0191c5f5..f2f632fa3 100644
--- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx
@@ -1,15 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UserEditViewModel>" %>
-
 <%@ Import Namespace="Orchard.Security" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>Edit User</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <div class="yui-u">
         <h2 class="separator">
             Edit User</h2>
@@ -29,6 +21,4 @@
         </ol>
         <%}/*EndForm*/%>
     </div>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Wikis/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Wikis/Views/Admin/Index.aspx
index a1666a14c..8dd7973d4 100644
--- a/src/Orchard.Web/Packages/Orchard.Wikis/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Wikis/Views/Admin/Index.aspx
@@ -1,22 +1,11 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<AdminViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-
-
-<!DOCTYPE html>
-<html>
-<head id="Head1" runat="server">
-    <title>Index2</title>
-    <% Html.Include("Head"); %>
-</head>
-<body>
-    <% Html.Include("Header"); %>
+<% Html.Include("Header"); %>
     <% Html.BeginForm(); %>
     <div class="yui-g">
         <h2>Wiki Admin</h2>
         <p><%=Html.ActionLink("Create", "Create") %></p>
     </div>
     <% Html.EndForm(); %>
-    <% Html.Include("Footer"); %>
-</body>
-</html>
+<% Html.Include("Footer"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Views/Admin/Footer.aspx b/src/Orchard.Web/Views/Admin/Footer.aspx
index c49fcd1d1..78488de88 100644
--- a/src/Orchard.Web/Views/Admin/Footer.aspx
+++ b/src/Orchard.Web/Views/Admin/Footer.aspx
@@ -1,27 +1,24 @@
 <%@ 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><%-- 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>
-            
-            <%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><%-- bd --%>
+        <div id="ft" role="contentinfo">
         </div>
-    </div><%-- bd --%>
-    <div id="ft" role="contentinfo">
-    </div>
-</div><%-- yui-t2 --%>
+    </div><%-- yui-t2 --%>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Orchard.Web/Views/Admin/Head.aspx b/src/Orchard.Web/Views/Admin/Head.aspx
deleted file mode 100644
index ef611acae..000000000
--- a/src/Orchard.Web/Views/Admin/Head.aspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
-
-<link href="http://yui.yahooapis.com/2.7.0/build/reset-fonts-grids/reset-fonts-grids.css" rel="stylesheet" type="text/css" />
-<link href="<%=Page.ResolveClientUrl("~/Content/Admin/css/Site.css") %>" rel="stylesheet" type="text/css" />
-<script src="<%=Page.ResolveClientUrl("~/Scripts/jquery-1.2.6.js") %>" type="text/javascript"></script>
-<script type="text/javascript">
-//$(document).ready(function(){
-//$(".leftNavMod h4").click(function(){
-//$(this).next().slideToggle('fast');
-//return false;
-// });
-//});
-
-
-//$(function(){
-//$("#ShowAll").click(function(){
-//$('[class^=leftNavMod] > ul').show('fast');
-//return false;
-// });
-//});
-     
-</script>
diff --git a/src/Orchard.Web/Views/Admin/Header.aspx b/src/Orchard.Web/Views/Admin/Header.aspx
index 95a451e28..4c880ac66 100644
--- a/src/Orchard.Web/Views/Admin/Header.aspx
+++ b/src/Orchard.Web/Views/Admin/Header.aspx
@@ -1,6 +1,23 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<AdminViewModel>" %>
-
-<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
+<%@ 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" />
+    <link href="<%=Page.ResolveClientUrl("~/Content/Admin/css/Site.css") %>" rel="stylesheet" type="text/css" />
+    <script src="<%=Page.ResolveClientUrl("~/Scripts/jquery-1.2.6.js") %>" type="text/javascript"></script></head>
+    <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>
+<body>
 <div id="doc3" class="yui-t2">
     <div id="hd" role="banner">
         <div class="yui-g">
@@ -23,4 +40,4 @@
     <div id="bd" role="main">
         <div id="yui-main">
             <div class="yui-b">
-                <% Html.RenderPartial("Messages", Model.Messages); %>
+                <% Html.RenderPartial("Messages", Model.Messages); %>
\ No newline at end of file
