Some initial work on admin view cleanup.

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041367
This commit is contained in:
skewed
2009-11-19 09:28:45 +00:00
parent 0a329de071
commit 8863709314
25 changed files with 83 additions and 313 deletions

View File

@@ -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"); %>

View File

@@ -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>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -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"); %>

View File

@@ -1,16 +1,12 @@
<%@ 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>
<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) { %>
@@ -19,9 +15,10 @@
<%
}
}%>
</div>
</div><%-- bd --%>
<div id="ft" role="contentinfo">
</div>
</div><%-- yui-t2 --%>
</div><%-- yui-t2 --%>
</body>
</html>

View File

@@ -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>

View File

@@ -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">