diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index a73b60fa4..146170023 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -264,9 +264,12 @@ a:hover, a:active, a:focus { /* Content ----------------------------------------------------------*/ -#main h2, #main h3, #main h4, #main p { +#main h2 { margin:.23em 0 1em; } +#main h3, #main h4 { + margin:.5em 0; +} #main p { margin:0 0 1.5em; } @@ -274,7 +277,7 @@ a:hover, a:active, a:focus { margin:0 0 1.4em; } #main .meta { - margin:0 0 .4em; + margin:-.4em 0 .4em; } #main form { margin:.345em 0 1.5em; @@ -317,6 +320,15 @@ span.message { background:#fff; border:1px dashed #D2D6C6; } +.debug.message { + background:#eee; + border:1px dashed #D2D6C6; + color:#7a7a7a; + margin:20px 0 14px 0; +} +.debug.message:before { + content:"DEBUG » "; +} /* Forms ----------------------------------------------------------*/ @@ -337,6 +349,9 @@ fieldset.bulk.actions label, label.sub { label span { font-weight:normal; } +label input { + vertical-align:text-top; +} /* todo: (heskew) try to get .text on stuff like #PublishLaterDate and .text-box */ select, textarea, input.text, input.text-box, #PublishLaterDate { @@ -512,46 +527,46 @@ ol.actions label { /* Content item lists ----------------------------------------------------------*/ -ul.contentItems { +.contentItems { background:#FFF; border:1px solid #B0B083; margin:1.4em 0; padding:2px; } -ul.contentItems li { +.contentItems li { background:#FFF; border-bottom:1px solid #EAE9D9; margin:0; overflow:hidden; padding:.7em 1.4em; } -ul.contentItems li.last { +.contentItems li.last { border-bottom:0; } -#main ul.contentItems li h3 { +#main .contentItems li h3 { border-bottom:0; - margin:0 0 .1em; + margin-top:0; } -#main ul.contentItems li .actions { +#main .contentItems li .actions { color:#EAE9D9; height:auto; margin:-1.3em 0 0; padding:0 0 .1em; } -#main ul.contentItems li .actions .ibutton { +#main .contentItems li .actions .ibutton { margin-right:6px; } -#main ul.contentItems li .actions .destruct .ibutton { +#main .contentItems li .actions .destruct .ibutton { margin-left:8px; margin-right:0; } -#main ul.contentItems li:hover { background:#fafbed; } -#main ul.contentItems li:hover a.ibutton { background-position:0 0; } -#main ul.contentItems li:hover a.ibutton.remove { background-position:-20px 0; } -#main ul.contentItems li:hover a.ibutton.view { background-position:-40px 0; } -#main ul.contentItems li:hover a.ibutton.add.page { background-position:-60px 0; } -#main ul.contentItems li:hover a.ibutton.edit { background-position:-80px 0; } -#main ul.contentItems li:hover a.ibutton.publish { background-position:-100px 0; } +#main .contentItems li:hover { background:#fafbed; } +#main .contentItems li:hover a.ibutton { background-position:0 0; } +#main .contentItems li:hover a.ibutton.remove { background-position:-20px 0; } +#main .contentItems li:hover a.ibutton.view { background-position:-40px 0; } +#main .contentItems li:hover a.ibutton.add.page { background-position:-60px 0; } +#main .contentItems li:hover a.ibutton.edit { background-position:-80px 0; } +#main .contentItems li:hover a.ibutton.publish { background-position:-100px 0; } /* Tables ----------------------------------------------------------*/ @@ -664,7 +679,7 @@ todo: (heskew) pull out into relevant modules where appropriate #content, #navigation li, button, .button, table, textarea, input.text, input.text-box, -ul.contentItems, .message { +.contentItems, .message { -moz-border-radius:4px; -webkit-border-radius:4px; border-radius:4px; diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs index c6a65f9a0..6e7621471 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Blogs { builder.Add("Blogs", "2", menu => menu .Add("Manage Blogs", "1.0", item => item.Action("ListForAdmin", "Blog", new { area = "Orchard.Blogs" })) - .Add("Add Blog", "1.1", item => item.Action("Create", "Blog", new { area = "Orchard.Blogs" }))); + .Add("Add New Blog", "1.1", item => item.Action("Create", "Blog", new { area = "Orchard.Blogs" }))); } } } 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 b443dcf97..2a1730459 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx @@ -3,18 +3,9 @@ <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> <% Html.Include("AdminHead"); %> -

Edit Blog Post

+

Edit Post

<% using (Html.BeginForm()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForModel() %> -
- <%foreach (var editor in Model.ItemView.Editors) { %> - <%-- TODO: why is Body in editors? --%> - <%-- TODO: because any content type using the body editor doesn't need - to re-implement the rich editor, media extensions, format filter chain selection, etc --%> - <% if (!String.Equals(editor.Prefix, "Body")) { %> - <%=Html.EditorFor(m=>editor.Model, editor.TemplateName, editor.Prefix) %> - <% } %> - <%} %> <% } %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/BlogPostEditViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/BlogPostEditViewModel.ascx index 58d3fbcb1..b2c5bc833 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/BlogPostEditViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/BlogPostEditViewModel.ascx @@ -3,11 +3,11 @@ <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-

Blog Post Content

+

Content

<%-- todo: (heskew) thin out the fieldsets if they become overkill --%>
- <%=Html.TextBoxFor(m => m.Title, new { id = "title", @class = "text" })%> + <%=Html.TextBoxFor(m => m.Title, new { id = "title", @class = "large text" })%>
@@ -19,19 +19,28 @@ <%=Html.TextAreaFor(m => m.Body, new { id = "body", @class = "html" })%>
+ <% foreach (var e in Model.ItemView.Editors) { + var editor = e; + // TODO: why is Body in editors? + // TODO: because any content type using the body editor doesn't need + // to re-implement the rich editor, media extensions, format filter chain selection, etc + if (!String.Equals(editor.Prefix, "Body")) { + %><%=Html.EditorFor(m=>editor.Model, editor.TemplateName, editor.Prefix) %> + <% } + } %>

Publish Settings

-
- -
<%--
+ +
+
<%=Html.EditorFor(m => m.Published) %> -
-
-
--%> +
+ +
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx index 396ad5d93..946f5f0e3 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx @@ -2,7 +2,7 @@ <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-

Blog Post Content

+

Content

<%-- todo: (heskew) thin out the fieldsets if they become overkill --%>
@@ -21,15 +21,15 @@

Publish Settings

-
+ <%--
<%=Html.EditorFor(m => m.Published) %> -
+
--%>
- +
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.CmsPages/AdminMenu.cs index bec506300..8d2ccf74f 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/AdminMenu.cs +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.CmsPages { builder.Add("Pages", "1", menu => menu .Add("Manage Pages", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.CmsPages" })) - .Add("Add a Page", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.CmsPages" }).Permission(Permissions.CreatePages)) + .Add("Add New Page", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.CmsPages" }).Permission(Permissions.CreatePages)) ); } } 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 914332eef..064b2eba2 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx @@ -3,97 +3,91 @@ <%@ Import Namespace="Orchard.Comments.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <% Html.Include("AdminHead"); %> +

Comments for <%= Model.DisplayNameForCommentedItem %>

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

Comments for <%= Model.DisplayNameForCommentedItem %>

- <%=Html.ValidationSummary() %> -
    -
  1. - - -
    2. -
  2. - -
    3. -
-
    -
  1. - - -
    2. -
  2. - -
    3. -
- - - - - - - - - - - - - - - - - - - - <% - int commentIndex = 0; - foreach (var commentEntry in Model.Comments) { - %> - - - - - - - - - <% - commentIndex++; - } %> -
<%----%>StatusAuthorCommentDate
- - - - - <% 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.ToLocalTime() %> - <%=Html.ActionLink("Edit", "Edit", new {commentEntry.Comment.Id}) %> | - <%=Html.ActionLink("Delete", "Delete", new {id = commentEntry.Comment.Id, redirectToAction = "Details"}) %> -
-
  • - <% if (Model.CommentsClosedOnItem) {%> - <%=Html.ActionLink("Enable Comments", "Enable", - new {commentedItemId = Model.CommentedItemId}, - new {@class="floatRight topSpacer"}) %> - <%} else {%> - <%=Html.ActionLink("Close Comments", "Close", - new {commentedItemId = Model.CommentedItemId}, - new {@class = "floatRight topSpacer"})%> -
    • - <% }%> -
    - + <%=Html.ValidationSummary() %> +
    + + + +
    +
    + + + +
    +
    + <% if (Model.CommentsClosedOnItem) { + %><%=Html.ActionLink("Enable Comments", "Enable", new { commentedItemId = Model.CommentedItemId }, new { @class = "button" })%><% + } else { + %><%=Html.ActionLink("Close Comments", "Close", new { commentedItemId = Model.CommentedItemId }, new { @class = "button remove" })%><% + } %> +
    +
    + + + + + + + + + + + + + + + + + + + + <% + int commentIndex = 0; + foreach (var commentEntry in Model.Comments) { + %> + + + + + + + + + <% + commentIndex++; + } %> +
     ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%>StatusAuthorCommentDate
    + + + + + <% 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.ToLocalTime() %> + <%=Html.ActionLink("Edit", "Edit", new {commentEntry.Comment.Id}) %> | + <%=Html.ActionLink("Delete", "Delete", new {id = commentEntry.Comment.Id, redirectToAction = "Details"}) %> +
    +
    +
    + <% if (Model.CommentsClosedOnItem) { + %><%=Html.ActionLink("Enable Comments", "Enable", new { commentedItemId = Model.CommentedItemId }, new { @class = "button" })%><% + } else { + %><%=Html.ActionLink("Close Comments", "Close", new { commentedItemId = Model.CommentedItemId }, new { @class = "button remove" })%><% + } %> +
    <% Html.EndForm(); %> <% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx index 209abdbfa..7439deab5 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx @@ -1,25 +1,37 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Comments.Models"%> <% if (Model.ContentItem.Id != 0) { %> -

    <%= Model.Comments.Count() %> Comments

    -
      +

      Comments

      +
      + <% var commentCount = Model.Comments.Count(); %> + <%=Html.ActionLink( + string.Format("{0} comment{1}", commentCount, commentCount == 1 ? "" : "s"), + "Details", + new { Area = "Orchard.Comments", Controller = "Admin", id = Model.ContentItem.Id, returnUrl = Context.Request.Url } + ) %> + / 0 pending +
      +
      + +
      +<%-- +todo: (heskew) would be better to have a ↑ checkbox ↑ instead of a ↓ button ↓ +
      + <% if (Model.Closed) { + %><%=Html.ActionLink("Enable Comments", "Enable", new { commentedItemId = Model.Closed }, new { @class = "button" })%><% + } else { + %><%=Html.ActionLink("Close Comments", "Close", new { commentedItemId = Model.Closed }, new { @class = "button remove" })%><% + } %> +
      +--%><%-- +todo: (heskew) shouldn't have comments when editing a content item. besides being noisy/distracting it throw other issues like paging into the mix +
        <% foreach (var comment in Model.Comments) {%>
      1. - <%= comment.CommentText %> +

        <%= comment.CommentText %>
        + Posted by <%= comment.UserName %> on <%= comment.CommentDate.ToLocalTime() %>
        + <%=Html.ActionLink("Delete", "Delete", new { Area = "Orchard.Comments", Controller = "Admin", id = comment.Id, returnUrl = Context.Request.Url }, new { @class = "ibutton remove" })%>

        2. -
      2. - Posted by <%= comment.UserName %> on <%= comment.CommentDate.ToLocalTime() %> -
        3. -
      3. - <%=Html.ActionLink("Delete", "Delete", new {Area="Orchard.Comments", Controller="Admin", id = comment.Id, returnUrl = Context.Request.Url}) %> -
        4. -
        <% } %> -
      -<% if (Model.Closed) { %> -

      Comments have been disabled for this content.

      -<%= Html.ActionLink("Enable Comments for this content", "Enable", new { Area="Orchard.Comments", Controller="Admin", returnUrl = Context.Request.Url, commentedItemId = Model.ContentItem.Id })%> -<% } else { %> -<%= Html.ActionLink("Close Comments for this content", "Close", new { Area="Orchard.Comments", Controller="Admin", returnUrl = Context.Request.Url, commentedItemId = Model.ContentItem.Id })%> -<% } %> | <%=Html.ActionLink("Go to comments management for this post", "Details", new {Area="Orchard.Comments", Controller="Admin", id = Model.ContentItem.Id, returnUrl = Context.Request.Url}) %> +
    --%> <% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/DisplayTemplates/ShowDebugLink.ascx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/DisplayTemplates/ShowDebugLink.ascx index ec7822ff0..99f3b4b0c 100644 --- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/DisplayTemplates/ShowDebugLink.ascx +++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/DisplayTemplates/ShowDebugLink.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.DevTools.Models" %> -
    +
    DevTools: showing <%= Html.ActionLink(Model.ContentItem.ContentType + " #" + Model.ContentItem.Id, "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id }, new { })%>
    diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx index f5bba40ce..77afe4cd5 100644 --- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx +++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.DevTools.Models" %> -
    +
    DevTools: editing <%= Html.ActionLink(Model.ContentItem.ContentType + " #" + Model.ContentItem.Id, "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id }, new { })%>
    diff --git a/src/Orchard.Web/Packages/Orchard.Roles/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.Roles/AdminMenu.cs index 46d4e6983..44c6c5010 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/AdminMenu.cs +++ b/src/Orchard.Web/Packages/Orchard.Roles/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Roles { builder.Add("Users", "5", menu => menu .Add("Manage Roles", "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Roles" })) - .Add("Create a Role", "2.1", item => item.Action("Create", "Admin", new { area = "Orchard.Roles" }))); + .Add("Add New Role", "2.1", item => item.Action("Create", "Admin", new { area = "Orchard.Roles" }))); } } } diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx index 6475e77c9..092769100 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx @@ -2,17 +2,8 @@ <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Tags.Models"%>

    Tags

    -<% Html.BeginForm("Update", "Home", new { area = "Orchard.Tags" }); %><%= Html.ValidationSummary() %>
    -

    Edit Tags

    - <% - string tags = ""; - foreach (var tag in Model.CurrentTags) { - tags += tag.TagName; - tags += ","; - } %> -
      -
    1. - -
      2. -
    -
    \ No newline at end of file + + + t.TagName).ToArray()) %>" /> + +<%--<% Html.BeginForm("Update", "Home", new { area = "Orchard.Tags" }); %>--%> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs index 8f912554b..0cd0b0209 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs +++ b/src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Users { builder.Add("Users", "5", menu => menu .Add("Manage Users", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Users" })) - .Add("Create a User", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.Users" }))); + .Add("Add New User", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.Users" }))); } } } diff --git a/src/Orchard.Web/Views/Shared/AdminHead.aspx b/src/Orchard.Web/Views/Shared/AdminHead.aspx index de6ff60ff..d1e981339 100644 --- a/src/Orchard.Web/Views/Shared/AdminHead.aspx +++ b/src/Orchard.Web/Views/Shared/AdminHead.aspx @@ -28,7 +28,7 @@ todo: (heskew) rework how/what pages are assembled when we get into theming --%> theme_advanced_buttons2: "", theme_advanced_buttons3: "" }); - +