lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-22 21:02:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UI cleanup pass (progress - Orchard.Pages)

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045310
This commit is contained in:
skewed
2010-01-12 19:41:34 +00:00
parent 8ec350ca2b
commit adde3ef6ea
11 changed files with 90 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogPost.Publish.ascx
View File

@@ -1,12 +1,17 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Blogs.Models.BlogPost>" %>
<fieldset>
<legend><%=_Encoded("Publish Settings")%></legend>
<label for="Command_SaveDraft"><%=Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = "Command_SaveDraft" }) %> <%=_Encoded("Save Draft")%></label><br />
</fieldset>
<fieldset>
<label for="Command_PublishNow"><%=Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = "Command_PublishNow" })%> <%=_Encoded("Publish Now")%></label>
</fieldset>
<fieldset>
<label for="Command_PublishLater"><%=Html.RadioButton("Command", "PublishLater", Model.Published != null && Model.Published.Value > DateTime.UtcNow, new { id = "Command_PublishLater" }) %> <%=_Encoded("Publish Later")%></label>
<%=Html.EditorFor(m => m.Published) %>
<div>
<%=Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = "Command_SaveDraft" }) %>
<label class="forcheckbox" for="Command_SaveDraft"><%=_Encoded("Save Draft")%></label>
</div>
<div>
<%=Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = "Command_PublishNow" })%>
<label class="forcheckbox" for="Command_PublishNow"><%=_Encoded("Publish Now")%></label>
</div>
<div>
<%=Html.RadioButton("Command", "PublishLater", Model.Published != null && Model.Published.Value > DateTime.UtcNow, new { id = "Command_PublishLater" }) %>
<label class="forcheckbox" for="Command_PublishLater"><%=_Encoded("Publish Later")%></label>
<%=Html.EditorFor(m => m.Published) %>
</div>
</fieldset>

2
src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx
View File

@@ -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())%>
</select>
<input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Filter") %>"/>
<input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Apply") %>"/>
</fieldset>
<div class="manage">
<% if (Model.CommentsClosedOnItem) {

2
src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx
View File

@@ -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())%>
</select>
<input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Filter") %>"/>
<input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Apply") %>"/>
</fieldset>
<fieldset>
<table class="items" summary="<%=_Encoded("This is a table of the comments in your application") %>">

4
src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<PageCreateViewModel>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<PageCreateViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Pages.ViewModels"%>
<h2><%=Html.TitleForPage("Add Page") %></h2>
<h1><%=Html.TitleForPage(T("Add Page").ToString()) %></h1>
<% using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %>
<%=Html.EditorForItem(m => m.Page) %><%

4
src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<PageEditViewModel>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<PageEditViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Pages.ViewModels"%>
<h2><%=Html.TitleForPage("Edit Page") %></h2>
<h1><%=Html.TitleForPage(T("Edit Page").ToString()) %></h1>
<% using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %>
<%=Html.EditorForItem(m => m.Page) %><%

79
src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx
View File

@@ -1,34 +1,32 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PagesViewModel>" %>
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PagesViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Utility"%>
<%@ Import Namespace="Orchard.Pages.ViewModels"%>
<%-- todo: (heskew) localize --%>
<h2><%=Html.TitleForPage("Manage Pages") %></h2>
<p>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.</p>
<h1><%=Html.TitleForPage(T("Manage Pages").ToString()) %></h1>
<p><%=_Encoded("Possible text about setting up a page goes here.")%></p>
<% using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %>
<fieldset class="actions bulk">
<label for="publishActions">Actions: </label>
<label for="publishActions"><%=_Encoded("Actions:") %></label>
<select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction) %>">
<%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.None, "Choose action...") %>
<%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.PublishNow, "Publish Now") %>
<%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Unpublish, "Unpublish") %>
<%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Delete, "Delete") %>
<%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.None, _Encoded("Choose action...").ToString()) %>
<%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.PublishNow, _Encoded("Publish Now").ToString()) %>
<%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Unpublish, _Encoded("Unpublish").ToString()) %>
<%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Delete, _Encoded("Delete").ToString()) %>
</select>
<input class="button" type="submit" name="submit.BulkEdit" value="Apply" />
<input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
</fieldset>
<fieldset class="actions bulk">
<label for="filterResults">Filter: </label>
<label for="filterResults"><%=_Encoded("Filter:") %></label>
<select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter) %>">
<%=Html.SelectOption(Model.Options.Filter, PagesFilter.All, "All Pages") %>
<%=Html.SelectOption(Model.Options.Filter, PagesFilter.Published, "Published Pages") %>
<%=Html.SelectOption(Model.Options.Filter, PagesFilter.Offline, "Offline Pages") %>
<%=Html.SelectOption(Model.Options.Filter, PagesFilter.All, _Encoded("All Pages").ToString()) %>
<%=Html.SelectOption(Model.Options.Filter, PagesFilter.Published, _Encoded("Published Pages").ToString()) %>
<%=Html.SelectOption(Model.Options.Filter, PagesFilter.Offline, _Encoded("Offline Pages").ToString()) %>
</select>
<input class="button" type="submit" name="submit.Filter" value="Apply"/>
<input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Apply") %>"/>
</fieldset>
<div class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button" }) %></div>
<div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new {}, new { @class = "button" }) %></div>
<fieldset>
<table class="items" summary="This is a table of the PageEntries currently available for use in your application.">
<table class="items" summary="<%=_Encoded("This is a table of the PageEntries currently available for use in your application.") %>">
<colgroup>
<col id="Actions" />
<col id="Status" />
@@ -42,56 +40,57 @@
<thead>
<tr>
<th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
<th scope="col">Status</th>
<th scope="col">Title</th>
<th scope="col">Slug</th>
<th scope="col">Author</th>
<th scope="col">Draft</th>
<th scope="col">Scheduled</th>
<th scope="col"><%=_Encoded("Status") %></th>
<th scope="col"><%=_Encoded("Title") %></th>
<th scope="col"><%=_Encoded("Slug") %></th>
<th scope="col"><%=_Encoded("Author") %></th>
<th scope="col"><%=_Encoded("Draft") %></th>
<th scope="col"><%=_Encoded("Scheduled") %></th>
<th scope="col"></th>
</tr>
</thead>
<%
int pageIndex = 0;
foreach (var pageEntry in Model.PageEntries) { %>
foreach (var pageEntry in Model.PageEntries) {
var pi = pageIndex; %>
<tr>
<td>
<input type="hidden" value="<%=Model.PageEntries[pageIndex].PageId %>" name="<%=Html.NameOf(m => m.PageEntries[pageIndex].PageId) %>"/>
<input type="checkbox" value="true" name="<%=Html.NameOf(m => m.PageEntries[pageIndex].IsChecked) %>"/>
<input type="hidden" value="<%=Model.PageEntries[pageIndex].PageId %>" name="<%=Html.NameOf(m => m.PageEntries[pi].PageId) %>"/>
<input type="checkbox" value="true" name="<%=Html.NameOf(m => m.PageEntries[pi].IsChecked) %>"/>
</td>
<td>
<% if (pageEntry.Page.HasPublished) {%>
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/online.gif")%>" alt="Online" title="The page is currently online" />
<% if (pageEntry.Page.HasPublished) { %>
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/online.gif") %>" alt="<%=_Encoded("Online") %>" title="<%=_Encoded("The page is currently online") %>" />
<% } else { %>
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/offline.gif")%>" alt="Offline" title="The page is currently offline" />
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/offline.gif") %>" alt="<%=_Encoded("Offline") %>" title="<%=_Encoded("The page is currently offline") %>" />
<% } %>
</td>
<td><%=pageEntry.Page.Title ?? "(no title)" %></td>
<td><% if (pageEntry.Page.HasPublished) {%>
<%=Html.ActionLink(pageEntry.Page.Slug ?? "(no slug)", "Item", new {controller = "Page", slug = pageEntry.Page.PublishedSlug})%>
<td><%=Html.Encode(pageEntry.Page.Title ?? T("(no title)").ToString()) %></td>
<td><% 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()) %>
<% } %>
</td>
<td>By <%= pageEntry.Page.Creator.UserName %></td>
<td><%=_Encoded("By {0}", pageEntry.Page.Creator.UserName) %></td>
<td>
<% if (pageEntry.Page.HasDraft) { %>
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/draft.gif") %>" alt="Draft" title="The page has a draft" />
<img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/draft.gif") %>" alt="<%=_Encoded("Draft") %>" title="<%=_Encoded("The page has a draft") %>" />
<% } %>
</td>
<td>
<% if (!pageEntry.Page.IsPublished) {%>
<% if (!pageEntry.Page.IsPublished) { %>
<%=pageEntry.Page.Published != null
? string.Format("{0:d}<br />{0:t}", pageEntry.Page.Published.Value)
: "" %>
<% }%>
<% } %>
</td>
<td><%=Html.ActionLink("Edit", "Edit", new { pageSlug = pageEntry.Page.Slug }) %></td>
<td><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { pageSlug = pageEntry.Page.Slug }) %></td>
</tr>
<%
pageIndex++;
} %>
</table>
</fieldset>
<div class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %></div>
<div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new {}, new { @class = "button"}) %></div>
<% } %>

8
src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
<%@ Import Namespace="Orchard.ContentManagement"%>
<%@ Import Namespace="Orchard.Core.Common.Models"%>
<h3><a href="<%=Url.Action("Item", "Page", new { slug = Model.Item.Slug }) %>"><%=Html.Encode(Model.Item.Title) %></a></h3>
<div class="content"><%=Model.Item.As<BodyAspect>().Text ?? "<p><em>there's no content for this blog post</em></p>" %></div>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<h3><a href="<%=Url.Action(T("Item").ToString(), "Page", new { slug = Model.Item.Slug }) %>"><%=Html.Encode(Model.Item.Title) %></a></h3>
<div class="content"><%=Model.Item.As<BodyAspect>().Text ?? T("<p><em>there's no content for this blog post</em></p>").ToString() %></div>

13
src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx
View File

@@ -1,13 +1,10 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<div class="manage"><a href="<%=Url.Action("Edit", "Admin", new {pageSlug = Model.Item.Slug}) %>" class="ibutton edit">edit</a></div>
<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {pageSlug = Model.Item.Slug}) %>" class="ibutton edit"><%=_Encoded("edit")%></a></div>
<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
<div class="metadata">
<% if (Model.Item.Creator != null)
{
%><div class="posted">Published by <%=Html.Encode(Model.Item.Creator.UserName)%> </div><%
} %>
<div class="posted">Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%></div>
</div>
<% Html.Zone("primary"); %>
<% Html.ZonesAny(); %>
<% Html.Zone("primary");
Html.ZonesAny(); %>

13
src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Items/Pages.Page.ascx
View File

@@ -1,17 +1,16 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Pages.Models"%>
<% Html.AddTitleParts(Model.Item.Title); %>
<div class="sections">
<div class="primary">
<% Html.Zone("primary"); %>
<% Html.ZonesExcept("secondary"); %>
<div class="primary"><%
Html.Zone("primary");
Html.ZonesExcept("secondary"); %>
</div>
<div class="secondary">
<% Html.Zone("secondary");%>
<fieldset>
<input class="button" type="submit" name="submit.Save" value="Save"/>
<input class="button" type="submit" name="submit.Save" value="<%=_Encoded("Save") %>"/>
</fieldset>
</div>
</div>
</div>

8
src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Fields.ascx
View File

@@ -1,10 +1,10 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %>
<%@ Import Namespace="Orchard.Pages.Extensions"%>
<fieldset>
<label for="Title">Title</label>
<span><%=Html.TextBoxFor(m => m.Title, new { @class = "large text" })%></span>
<%=Html.LabelFor(m => m.Title) %>
<%=Html.TextBoxFor(m => m.Title, new { @class = "large text" })%>
</fieldset>
<fieldset class="permalink">
<label class="sub" for="Slug">Permalink<br /><span><%=Request.Url.ToRootString() %>/</span></label>
<label class="sub" for="Slug"><%=_Encoded("Permalink")%><br /><span><%=Html.Encode(Request.Url.ToRootString()) %>/</span></label>
<span><%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%></span>
</fieldset>

21
src/Orchard.Web/Packages/Orchard.Pages/Views/EditorTemplates/Parts/Pages.Page.Publish.ascx
View File

@@ -1,12 +1,17 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %>
<fieldset>
<legend><%=_Encoded("Publish Settings")%></legend>
<label for="Command_SaveDraft"><%=Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = "Command_SaveDraft" })%> <%=_Encoded("Save Draft")%></label><br />
</fieldset>
<fieldset>
<label for="Command_PublishNow"><%=Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = "Command_PublishNow" })%> <%=_Encoded("Publish Now")%></label>
</fieldset>
<fieldset>
<label for="Command_PublishLater"><%=Html.RadioButton("Command", "PublishLater", Model.Published != null && Model.Published.Value > DateTime.UtcNow, new { id = "Command_PublishLater" })%> <%=_Encoded("Publish Later")%></label>
<%=Html.EditorFor(m => m.Published) %>
<div>
<%=Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = "Command_SaveDraft" }) %>
<label class="forcheckbox" for="Command_SaveDraft"><%=_Encoded("Save Draft")%></label>
</div>
<div>
<%=Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = "Command_PublishNow" })%>
<label class="forcheckbox" for="Command_PublishNow"><%=_Encoded("Publish Now")%></label>
</div>
<div>
<%=Html.RadioButton("Command", "PublishLater", Model.Published != null && Model.Published.Value > DateTime.UtcNow, new { id = "Command_PublishLater" }) %>
<label class="forcheckbox" for="Command_PublishLater"><%=_Encoded("Publish Later")%></label>
<%=Html.EditorFor(m => m.Published) %>
</div>
</fieldset>