From adde3ef6eab7a6d327c106d254be44f27d7a8964 Mon Sep 17 00:00:00 2001 From: skewed Date: Tue, 12 Jan 2010 19:41:34 +0000 Subject: [PATCH] UI cleanup pass (progress - Orchard.Pages) --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045310 --- .../Parts/Blogs.BlogPost.Publish.ascx | 21 +++-- .../Orchard.Comments/Views/Admin/Details.aspx | 2 +- .../Orchard.Comments/Views/Admin/Index.aspx | 2 +- .../Orchard.Pages/Views/Admin/Create.ascx | 4 +- .../Orchard.Pages/Views/Admin/Edit.ascx | 4 +- .../Orchard.Pages/Views/Admin/List.aspx | 79 +++++++++---------- .../Items/Pages.Page.Summary.ascx | 8 +- .../DisplayTemplates/Items/Pages.Page.ascx | 13 ++- .../EditorTemplates/Items/Pages.Page.ascx | 13 ++- .../Parts/Pages.Page.Fields.ascx | 8 +- .../Parts/Pages.Page.Publish.ascx | 21 +++-- 11 files changed, 90 insertions(+), 85 deletions(-) diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogPost.Publish.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogPost.Publish.ascx index ad21a297a..5991958bf 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogPost.Publish.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogPost.Publish.ascx @@ -1,12 +1,17 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
<%=_Encoded("Publish Settings")%> -
-
-
- -
-
- - <%=Html.EditorFor(m => m.Published) %> +
+ <%=Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = "Command_SaveDraft" }) %> + +
+
+ <%=Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = "Command_PublishNow" })%> + +
+
+ <%=Html.RadioButton("Command", "PublishLater", Model.Published != null && Model.Published.Value > DateTime.UtcNow, new { id = "Command_PublishLater" }) %> + + <%=Html.EditorFor(m => m.Published) %> +
\ 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 87d9f42e1..fd42504d4 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx @@ -20,7 +20,7 @@ <%=Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Approved, _Encoded("Approved Comments").ToString())%> <%=Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Spam, _Encoded("Spam").ToString())%> - "/> + "/>
<% if (Model.CommentsClosedOnItem) { 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 2a0e6432c..35f4f3207 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx @@ -20,7 +20,7 @@ <%=Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Approved, _Encoded("Approved Comments").ToString()) %> <%=Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Spam, _Encoded("Spam").ToString())%> - "/> + "/>
"> diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.ascx index 721543263..13a0adfe5 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.ascx @@ -1,7 +1,7 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Pages.ViewModels"%> -

<%=Html.TitleForPage("Add Page") %>

+

<%=Html.TitleForPage(T("Add Page").ToString()) %>

<% using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForItem(m => m.Page) %><% diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.ascx index 39cbcc775..7fd90d4ed 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.ascx @@ -1,7 +1,7 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Pages.ViewModels"%> -

<%=Html.TitleForPage("Edit Page") %>

+

<%=Html.TitleForPage(T("Edit Page").ToString()) %>

<% using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForItem(m => m.Page) %><% diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx index 10c0243c1..d18051b46 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx @@ -1,34 +1,32 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.Html"%> -<%@ Import Namespace="Orchard.Utility"%> <%@ Import Namespace="Orchard.Pages.ViewModels"%> -<%-- todo: (heskew) localize --%> -

<%=Html.TitleForPage("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.

+

<%=Html.TitleForPage(T("Manage Pages").ToString()) %>

+

<%=_Encoded("Possible text about setting up a page goes here.")%>

<% using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %>
- + - + " />
- + - + "/>
-
<%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button" }) %>
+
<%=Html.ActionLink(T("Add a page").ToString(), "Create", new {}, new { @class = "button" }) %>
-
+
"> @@ -42,56 +40,57 @@ - - - - - - + + + + + + <% int pageIndex = 0; - foreach (var pageEntry in Model.PageEntries) { %> + foreach (var pageEntry in Model.PageEntries) { + var pi = pageIndex; %> - - + - + - + <% pageIndex++; } %>
 ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%>StatusTitleSlugAuthorDraftScheduled<%=_Encoded("Status") %><%=_Encoded("Title") %><%=_Encoded("Slug") %><%=_Encoded("Author") %><%=_Encoded("Draft") %><%=_Encoded("Scheduled") %>
- - + + - <% if (pageEntry.Page.HasPublished) {%> - " alt="Online" title="The page is currently online" /> + <% if (pageEntry.Page.HasPublished) { %> + " alt="<%=_Encoded("Online") %>" title="<%=_Encoded("The page is currently online") %>" /> <% } else { %> - " alt="Offline" title="The page is currently offline" /> + " alt="<%=_Encoded("Offline") %>" title="<%=_Encoded("The page is currently offline") %>" /> <% } %> <%=pageEntry.Page.Title ?? "(no title)" %><% if (pageEntry.Page.HasPublished) {%> - <%=Html.ActionLink(pageEntry.Page.Slug ?? "(no slug)", "Item", new {controller = "Page", slug = pageEntry.Page.PublishedSlug})%> + <%=Html.Encode(pageEntry.Page.Title ?? T("(no title)").ToString()) %><% if (pageEntry.Page.HasPublished) { %> + <%=Html.ActionLink(pageEntry.Page.Slug ?? T("(no slug)").ToString(), "Item", new {controller = "Page", slug = pageEntry.Page.PublishedSlug}) %> <% } else {%> - <%= pageEntry.Page.Slug ?? "(no slug)" %> + <%=Html.Encode(pageEntry.Page.Slug ?? T("(no slug)").ToString()) %> <% } %> By <%= pageEntry.Page.Creator.UserName %><%=_Encoded("By {0}", pageEntry.Page.Creator.UserName) %> <% if (pageEntry.Page.HasDraft) { %> - " alt="Draft" title="The page has a draft" /> + " alt="<%=_Encoded("Draft") %>" title="<%=_Encoded("The page has a draft") %>" /> <% } %> - <% if (!pageEntry.Page.IsPublished) {%> + <% if (!pageEntry.Page.IsPublished) { %> <%=pageEntry.Page.Published != null ? string.Format("{0:d}
{0:t}", pageEntry.Page.Published.Value) : "" %> - <% }%> + <% } %> 		<%=Html.ActionLink("Edit", "Edit", new { pageSlug = pageEntry.Page.Slug }) %><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { pageSlug = pageEntry.Page.Slug }) %>
-
<%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %>
+
<%=Html.ActionLink(T("Add a page").ToString(), "Create", new {}, new { @class = "button"}) %>
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx index 016b5c314..ef09d7a67 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx @@ -1,6 +1,6 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.ContentManagement"%> <%@ Import Namespace="Orchard.Core.Common.Models"%> -

"><%=Html.Encode(Model.Item.Title) %>

-
<%=Model.Item.As().Text ?? "

there's no content for this blog post

" %>
\ No newline at end of file +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +

"><%=Html.Encode(Model.Item.Title) %>

+
<%=Model.Item.As().Text ?? T("

there's no content for this blog post

").ToString() %>
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx index ee8096043..25d78d5f1 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx @@ -1,13 +1,10 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -
" class="ibutton edit">edit
+
" class="ibutton edit"><%=_Encoded("edit")%>

<%=Html.TitleForPage(Model.Item.Title)%>

- <% if (Model.Item.Creator != null) - { - %>
Published by <%=Html.Encode(Model.Item.Creator.UserName)%>
<% - } %> +
Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%>
-<% Html.Zone("primary"); %> -<% Html.ZonesAny(); %> \ No newline at end of file +<% Html.Zone("primary"); + Html.ZonesAny(); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Items/Pages.Page.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Items/Pages.Page.ascx index ab9f0b245..46374f610 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Items/Pages.Page.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Items/Pages.Page.ascx @@ -1,17 +1,16 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Pages.Models"%> <% Html.AddTitleParts(Model.Item.Title); %>
-
- <% Html.Zone("primary"); %> - <% Html.ZonesExcept("secondary"); %> +
<% + Html.Zone("primary"); + Html.ZonesExcept("secondary"); %>
<% Html.Zone("secondary");%>
- + "/>
-
+
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Fields.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Fields.ascx index b64d0f25b..5dc9208e0 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Fields.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Fields.ascx @@ -1,10 +1,10 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Pages.Extensions"%>
- - <%=Html.TextBoxFor(m => m.Title, new { @class = "large text" })%> + <%=Html.LabelFor(m => m.Title) %> + <%=Html.TextBoxFor(m => m.Title, new { @class = "large text" })%>
- + <%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%>
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Publish.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Publish.ascx index 550809ab5..0e0d92370 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Publish.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Publish.ascx @@ -1,12 +1,17 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
<%=_Encoded("Publish Settings")%> -
-
-
- -
-
- - <%=Html.EditorFor(m => m.Published) %> +
+ <%=Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = "Command_SaveDraft" }) %> + +
+
+ <%=Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = "Command_PublishNow" })%> + +
+
+ <%=Html.RadioButton("Command", "PublishLater", Model.Published != null && Model.Published.Value > DateTime.UtcNow, new { id = "Command_PublishLater" }) %> + + <%=Html.EditorFor(m => m.Published) %> +
\ No newline at end of file