diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index b997ffd33..e7da4bb89 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/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 { diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx index 7db53e96e..d087e9eb6 100644 --- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx @@ -1,6 +1,6 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.Html"%> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %>

Edit Settings

@@ -21,4 +21,4 @@ <%}/*EndForm*/%>
-<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index d5a0d8bfa..c1ab3faee 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -161,8 +161,6 @@ - - @@ -176,8 +174,8 @@ - - + + diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj index a56511679..e475b3324 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj @@ -113,8 +113,6 @@ - - diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx index 4b7ebe2aa..0cce57cf9 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx +++ b/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"); %>

Create New Blog

Manage Blogs > Create Blog

<% using (Html.BeginForm()) { %> @@ -10,4 +10,4 @@ <%=Html.EditorForModel() %>
<% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx index 500722983..b2fcef603 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx +++ b/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"); %>

Edit Blog

Manage Blogs > Editing <%=Html.Encode(Model.Name)%>

<% using (Html.BeginForm()) { %> @@ -10,4 +10,4 @@ <%=Html.EditorForModel() %>
<% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.aspx index cd340a230..40ce79b38 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.aspx +++ b/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"); %>

Manage Blogs

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.

<%=Html.DisplayForModel() %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx index d8a8e74ce..8c917a0b7 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx +++ b/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"); %>

Create a New Blog Post

Manage Blogs > <%=Html.Encode(Model.Blog.Name) %> > Create Blog Post

<%using (Html.BeginForm()) { %> <%= Html.ValidationSummary() %> <%= Html.EditorForModel() %> <% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx index 206b2aaa7..02946e7c4 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx +++ b/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"); %>

Edit Blog Post

Manage Blogs > <%=Html.Encode(Model.Blog.Name)%> > <%=Model.Title %>

<% using (Html.BeginForm()) { %> @@ -18,4 +18,4 @@ <%=Html.EditorFor(m=>editor.Model, editor.TemplateName, editor.Prefix) %> <% } %> <%} %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/ListByBlog.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/ListByBlog.aspx index f6729d7db..6b0be1141 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/ListByBlog.aspx +++ b/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 --%> +

Posts

<% //TODO: (erikpo) Replace this with an Html extension method of some sort (ListForModel?) @@ -18,4 +19,4 @@ <% } %>
-<% Html.Include("Footer"); %> \ No newline at end of file + \ 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 d3e88fd97..61c3c0cd6 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx +++ b/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"); %>

Delete pages

Are you sure you want to delete the pages?

<% using (Html.BeginForm()) { %> @@ -22,4 +22,4 @@ } %> <% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 223a944d2..934c23529 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx +++ b/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()) { %>

Publish later

Enter the scheduled publication date:

@@ -22,4 +22,4 @@ } %> <% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 b7ae68059..b9e5481e7 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx @@ -1,7 +1,7 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Head"); %> +<% Html.Include("AdminHead"); %>

Change Template

Select your layout from one of the templates below.

<% using (Html.BeginForm()) { @@ -20,4 +20,4 @@ <%=Html.ActionLink("Cancel", "Edit", new { Id = ViewContext.RouteData.GetRequiredString("id") }, new { @class = "cancel" })%> <% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 7559e6bc6..80875e296 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx @@ -1,10 +1,10 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Head"); %> +<% Html.Include("AdminHead"); %>

Add a Page

Select your layout from one of the templates below.

<% using (Html.BeginForm()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForModel() %> <% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 a6ae99be7..b0aedc5aa 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" %> <%@ Import Namespace="Orchard.CmsPages.Models" %> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Head"); %> +<% Html.Include("AdminHead"); %>

<%=_Encoded("Edit Page") %>

<%=_Encoded("about setting up a page") %>

<%=Html.ValidationSummary() %> @@ -47,4 +47,4 @@ <% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 b1b9dbcab..e5b06fd55 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx @@ -1,6 +1,6 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage>" %> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Head"); %> +<% Html.Include("AdminHead"); %>

Export

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.

    @@ -16,4 +16,4 @@ <% } %>
-<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 4cfdde330..a5cd11227 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx +++ b/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"); %>

Manage Pages

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.

<% using (Html.BeginForm()) { %> @@ -97,4 +97,4 @@
<%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %>
<% } %> -<% Html.Include("Foot"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx index 2804060d3..604ea1cea 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx @@ -1,7 +1,7 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Comments.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %> <% Html.BeginForm(); %> <%= Html.ValidationSummary() %>
@@ -32,4 +32,4 @@
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx index ab56e0798..c90cb2897 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx +++ b/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(); %>

Comments for <%= Model.DisplayNameForCommentedItem %>

@@ -96,4 +96,4 @@
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx index 149ea2ac2..25020a9a7 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx +++ b/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() %>
@@ -45,4 +45,4 @@
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx index 4502e3f3a..05064b7c8 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx @@ -2,89 +2,81 @@ <%@ Import Namespace="Orchard.Comments.Models"%> <%@ Import Namespace="Orchard.Comments.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %> +

Manage Comments

<% Html.BeginForm(); %> -
-

Manage Comments

- <%=Html.ValidationSummary() %> -
    -
  1. - - -
    2. -
  2. - -
    3. -
-
    -
  1. - - -
    2. -
  2. - -
    3. -
- - - - - - - - - - - - - - - - - - - - - - <% - int commentIndex = 0; - foreach (var commentEntry in Model.Comments) { - %> - - - - - - - - - - <% - commentIndex++; - } %> -
<%----%>StatusAuthorCommentDateCommented On
- - - <% if (commentEntry.Comment.Status == CommentStatus.Spam) {%> Spam <% } %> - <% else {%> Approved <% } %> - <%= commentEntry.Comment.UserName %> - <% if (commentEntry.Comment.CommentText != null) {%> - <%= commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText %> ... - <% } %> - <%= commentEntry.Comment.CommentDate %> - <%=Html.ActionLink(commentEntry.CommentedOn, "Details", new {id = commentEntry.Comment.CommentedOn}) %> - - <%=Html.ActionLink("Edit", "Edit", new {commentEntry.Comment.Id}) %> | - <%=Html.ActionLink("Delete", "Delete", new {id = commentEntry.Comment.Id, redirectToAction = "Index"}) %> -
-
+ <%=Html.ValidationSummary() %> +
+ + + +
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + <% + int commentIndex = 0; + foreach (var commentEntry in Model.Comments) { + %> + + + + + + + + + + <% + commentIndex++; + } %> +
 ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%>StatusAuthorCommentDateCommented On
+ + + <% if (commentEntry.Comment.Status == CommentStatus.Spam) {%> Spam <% } %> + <% else {%> Approved <% } %> + <%= commentEntry.Comment.UserName %> + <% if (commentEntry.Comment.CommentText != null) {%> + <%= commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText %> ... + <% } %> + <%= commentEntry.Comment.CommentDate %> + <%=Html.ActionLink(commentEntry.CommentedOn, "Details", new {id = commentEntry.Comment.CommentedOn}) %> + + <%=Html.ActionLink("Edit", "Edit", new {commentEntry.Comment.Id}) %> | + <%=Html.ActionLink("Delete", "Delete", new {id = commentEntry.Comment.Id, redirectToAction = "Index"}) %> +
+
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 1f1515fdf..d62737f1d 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx +++ b/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"); %>

Add Media

@@ -30,4 +30,4 @@ <% } %>

-<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 a9f75ed30..6e77369c9 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx +++ b/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"); %>

Add a New Folder

@@ -27,4 +27,4 @@ <%}%>

-<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 aa693971a..0a1f94ffe 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx +++ b/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(); %>

Manage Folder

@@ -92,4 +92,4 @@
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 0a599b03c..2e2790ba7 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx +++ b/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"); %>

Edit Media - <%= Model.Name %>

@@ -74,4 +74,4 @@

-<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 9ef4a5eac..42ef76841 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx +++ b/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"); %>

Folder Properties

@@ -29,4 +29,4 @@ <%}%>

-<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 ae5f803aa..42fe8d027 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx @@ -1,13 +1,11 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %> +

Manage Media Folders

<% Html.BeginForm(); %> -
-

Manage Media Folders

-

- <%=Html.ActionLink("Media Folders", "Index")%> > - Manage Media Folders

+

<%=Html.ActionLink("Media Folders", "Index")%> > Manage Media Folders

+ <%=Html.ValidationSummary() %>
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 2f0daa2b4..96d0d79c8 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx @@ -1,7 +1,7 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Roles.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %> <% Html.BeginForm(); %> <%= Html.ValidationSummary() %>
@@ -43,4 +43,4 @@
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 3602b8099..bd24f1d5c 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx @@ -1,6 +1,6 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %> <% Html.BeginForm(); %>

Manage Roles

@@ -39,4 +39,4 @@
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Create.aspx index 59f42b869..32d6cb31a 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Create.aspx @@ -1,14 +1,14 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Tags.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %> +

Add a Tag

<% Html.BeginForm(); %> - <%= Html.ValidationSummary() %> -
-

Add a Tag

- - - -
+ <%= Html.ValidationSummary() %> +
+ + + +
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Edit.aspx index 1892bb888..ef78a07c5 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Edit.aspx @@ -1,22 +1,15 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Tags.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %> +

Edit a Tag

<% Html.BeginForm(); %> - <%= Html.ValidationSummary() %> -
-

Edit a Tag

-

Information

-
    -
  1. - - - -
    2. -
  2. - -
    3. -
-
+ <%= Html.ValidationSummary() %> +
+ + + + +
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx index 3c12f4bae..36fe4ae64 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx @@ -1,57 +1,52 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Tags.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %> +

Manage Tags

<% Html.BeginForm(); %> -
-

Manage Tags

- <%=Html.ValidationSummary() %> -
    -
  1. - - -
    2. -
  2. - -
    3. -
- - <%=Html.ActionLink("Add a new tag", "Create") %> - - - - - - - - - - - - - - - <% - int tagIndex = 0; - foreach (var tagEntry in Model.Tags) { - %> - - - - - - <% tagIndex++; } %> -
<%----%>Name
- - - - <%=Html.ActionLink(tagEntry.Tag.TagName, "Search", new {id = tagEntry.Tag.Id}) %> - - <%=Html.ActionLink("Edit", "Edit", new {id = tagEntry.Tag.Id}) %> -
-
+ <%=Html.ValidationSummary() %> +
+ + + +
+
<%=Html.ActionLink("Add a tag", "Create", new { }, new { @class = "button" })%>
+
+ + + + + + + + + + + + + + <% + int tagIndex = 0; + foreach (var tagEntry in Model.Tags) { + %> + + + + + + <% tagIndex++; } %> +
 ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%>Name
+ + + + <%=Html.ActionLink(tagEntry.Tag.TagName, "Search", new {id = tagEntry.Tag.Id}) %> + + <%=Html.ActionLink("Edit", "Edit", new {id = tagEntry.Tag.Id}) %> +
+
+
<%=Html.ActionLink("Add a tag", "Create", new { }, new { @class = "button" })%>
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx index e8d94a727..1cadb6e2f 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx +++ b/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(); %>

List of contents tagged with <%= Model.TagName %>

@@ -31,4 +31,4 @@
<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 fc207b5ae..b34588a93 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx @@ -1,7 +1,7 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %>

Add a new User

@@ -18,4 +18,4 @@ <%}/*EndForm*/%>
-<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ 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 f2f632fa3..263545c49 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx @@ -1,7 +1,7 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("Header"); %> +<% Html.Include("AdminHead"); %>

Edit User

@@ -21,4 +21,4 @@ <%}/*EndForm*/%>
-<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx index 367e58460..9d155f5fe 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx +++ b/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(); %>

@@ -44,4 +44,4 @@

<% Html.EndForm(); %> -<% Html.Include("Footer"); %> \ No newline at end of file +<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Views/Admin/Foot.aspx b/src/Orchard.Web/Views/Admin/Foot.aspx deleted file mode 100644 index a64d05d48..000000000 --- a/src/Orchard.Web/Views/Admin/Foot.aspx +++ /dev/null @@ -1,19 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> - <%-- .wrapper --%> - <%-- #main --%> - - <%-- #content --%> - <%-- #contentinfo --%> - - \ No newline at end of file diff --git a/src/Orchard.Web/Views/Admin/Footer.aspx b/src/Orchard.Web/Views/Admin/Footer.aspx deleted file mode 100644 index 78488de88..000000000 --- a/src/Orchard.Web/Views/Admin/Footer.aspx +++ /dev/null @@ -1,24 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> - <%-- yui-b --%> - <%-- yui-main --%> - <%-- Navigation --%> -
-
-

Dashboard

-
- <%if (Model.AdminMenu != null) { - foreach (var menuSection in Model.AdminMenu) {%> -

<%=Html.Encode(menuSection.Text)%>

    <%foreach (var menuItem in menuSection.Items) { %> -
  • <%=Html.ActionLink(menuItem.Text, (string)menuItem.RouteValues["action"], menuItem.RouteValues)%>
    • - <%} %>
- <% - } - }%> -
- <%-- bd --%> - - <%-- yui-t2 --%> - - \ 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 de6ff60ff..000000000 --- a/src/Orchard.Web/Views/Admin/Head.aspx +++ /dev/null @@ -1,45 +0,0 @@ -<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels" %> -<%@ Import Namespace="Orchard.Mvc.Html" -%><%-- -todo: (heskew) rework how/what pages are assembled when we get into theming --%> - - - - <%-- todo: (heskew) get this from the menu system - --%>Admin :: Orchard - <%-- todo: (heskew) same as scripts [below] - --%>" 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]) - --%> - <%-- todo: (heskew) this should come from the admin "page" (partial) - todo: (heskew) use the TinyMCE jQuery package instead? - --%> - - - - -
- -
-
- <% Html.RenderPartial("Messages", Model.Messages); %> \ No newline at end of file diff --git a/src/Orchard.Web/Views/Admin/Header.aspx b/src/Orchard.Web/Views/Admin/Header.aspx deleted file mode 100644 index 2b1dd6984..000000000 --- a/src/Orchard.Web/Views/Admin/Header.aspx +++ /dev/null @@ -1,40 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels" -%> - - - Admin :: Orchard - - <%-- todo: (heskew) same as scripts [below] --%> - " 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]) --%> - - <%-- todo: (heskew) this should come from the admin "page" (partial) --%> - - - - -
- -
-
-
- <% Html.RenderPartial("Messages", Model.Messages); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Foot.aspx b/src/Orchard.Web/Views/Shared/AdminFoot.aspx similarity index 100% rename from src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Foot.aspx rename to src/Orchard.Web/Views/Shared/AdminFoot.aspx diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Head.aspx b/src/Orchard.Web/Views/Shared/AdminHead.aspx similarity index 100% rename from src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Head.aspx rename to src/Orchard.Web/Views/Shared/AdminHead.aspx