lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-24 18:25:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replaced markup-embedded pipe | delimiters with CSS in admin theme.

Browse Source
This commit is contained in:
Daniel Stolt
2017-03-04 08:35:55 +01:00
parent 7fa189b4b8
commit 0ea2f30556
42 changed files with 807 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml
View File

@@ -19,7 +19,7 @@
@using (Html.BeginFormAntiForgeryPost()) {
<fieldset class="bulk-actions">
<label><input type="checkbox" class="check-all" />@T("Select all")</label>@T(" | ")
<label><input type="checkbox" class="check-all" />@T("Select all")</label>
<label for="publishActions">@T("Actions:")</label>
<select id="publishActions" name="Options.BulkAction">
@Html.SelectOption((ContentsBulkAction)Model.Options.BulkAction, ContentsBulkAction.None, T("Choose action...").ToString())

63
src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
View File

@@ -14,45 +14,60 @@
var authorizedToPublish = Authorizer.Authorize(Permissions.PublishContent, contentItem);
}
<div class="item-action-links">
<strong>@T("Item:")</strong>
<ul class="action-links action-links-item">
<li class="action-label">
@T("Item:")
</li>
@if (hasPublished) {
@Html.ItemDisplayLink(T("View").Text, contentItem);
<li class="action-link">
@Html.ItemDisplayLink(T("View").Text, contentItem)
</li>
}
@if (authorizedToEdit) {
if (hasPublished) {
@T(" | ")
<li class="action-link">
@Html.ItemEditLink(T("Edit").Text, contentItem)
</li>
<li class="action-link">
@Html.ActionLink(T(" Clone").Text, "Clone", "Admin", new { Id = contentItem.Id, ReturnUrl = Request.ToUrlString(), Area = "Contents" }, new { itemprop = "UnsafeUrl" })
</li>
}
@Html.ItemEditLink(T("Edit").Text, contentItem);
@T(" | ")
@Html.ActionLink(T(" Clone").Text, "Clone", "Admin", new { Id = contentItem.Id, ReturnUrl = Request.ToUrlString(), Area = "Contents" }, new { itemprop = "UnsafeUrl" });
}
@if (hasPublished && authorizedToPublish) {
@T(" | ")
@Html.ActionLink(T("Unpublish").Text, "Unpublish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }, new { itemprop = "UnsafeUrl" });
}
if (hasPublished && authorizedToPublish) {
<li class="action-link">
@Html.ActionLink(T("Unpublish").Text, "Unpublish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }, new { itemprop = "UnsafeUrl" })
</li>
}
@if (authorizedToDelete) {
@T(" | ")
@Html.Link(T("Remove").Text, Url.ItemRemoveUrl(contentItem, new { returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" });
if (authorizedToDelete) {
<li class="action-link">
@Html.Link(T("Remove").Text, Url.ItemRemoveUrl(contentItem, new { returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
}
}
</div>
</ul>
@if ((!isPublished || hasDraft) && authorizedToEdit) {
<div class="draft-action-links">
<strong>@T("Draft:")</strong>
<ul class="action-links action-links-draft">
<li class="action-label">
@T("Draft:")
</li>
@if (!isPublished && Authorizer.Authorize(Permissions.PreviewContent, contentItem)) {
@Html.ActionLink(T("View").Text, "Display", "Item", new { area = "Contents", id = contentItem.Id, version = contentItem.Version }, new { });
<li class="action-link">
@Html.ActionLink(T("View").Text, "Display", "Item", new { area = "Contents", id = contentItem.Id, version = contentItem.Version }, new { })
</li>
}
@if (hasDraft && authorizedToPublish) {
@T(" | ")
@Html.ActionLink(T("Publish").Text, "Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }, new { itemprop = "UnsafeUrl" });
<li class="action-link">
@Html.ActionLink(T("Publish").Text, "Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }, new { itemprop = "UnsafeUrl" })
</li>
}
@if (!isPublished && hasPublished && authorizedToDelete) {
@T(" | ")
@Html.ActionLink(T("Discard").Text, "DiscardDraft", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }, new { itemprop = "RemoveUrl UnsafeUrl" });
<li class="action-link">
@Html.ActionLink(T("Discard").Text, "DiscardDraft", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
}
</div>
</ul>
}

12
src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
View File

@@ -113,11 +113,15 @@
<h2>@menuPartEntry.Text</h2>
<span class="navigation-type">(@menuPartEntry.ContentItem.TypeDefinition.DisplayName)</span>
<span class="navigation-position"><input type="text" class="text" name="@Html.NameOf(m => m.MenuItemEntries[i].Position)" value="@menuPartEntry.Position" /></span>
<span class="navigation-actions">
<ul class="navigation-actions action-links">
<input type="hidden" name="@Html.NameOf(m => m.MenuItemEntries[i].MenuItemId)" value="@menuPartEntry.MenuItemId" />
@Html.ItemEditLink(T("Edit").Text, menuPartEntry.ContentItem, new { returnUrl = Request.RawUrl })@T(" | ")
@Html.ActionLink(T("Delete").Text, "Delete", new { id = menuPartEntry.MenuItemId }, new { @class = "remove", itemprop = "RemoveUrl UnsafeUrl" })
</span>
<li class="action-link">
@Html.ItemEditLink(T("Edit").Text, menuPartEntry.ContentItem, new { returnUrl = Request.RawUrl })
</li>
<li class="action-link">
@Html.ActionLink(T("Delete").Text, "Delete", new { id = menuPartEntry.MenuItemId }, new { @class = "remove", itemprop = "RemoveUrl UnsafeUrl" })
</li>
</ul>
</div>
continue;

10
src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexUnmanaged.cshtml
View File

@@ -79,8 +79,14 @@
@Html.Link(url, Href("~/" + urlPrefix + "/" + url))
</td>
<td>
@Html.ActionLink(T("Edit").Text, "Edit", new { path = alias.Path == String.Empty ? "/" : alias.Path })@T(" | ")
@Html.ActionLink(T("Delete").Text, "Delete", new { path = alias.Path }, new { itemprop = "UnsafeUrl RemoveUrl" })
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").Text, "Edit", new { path = alias.Path == String.Empty ? "/" : alias.Path })
</li>
<li class="action-link">
@Html.ActionLink(T("Delete").Text, "Delete", new { path = alias.Path }, new { itemprop = "UnsafeUrl RemoveUrl" })
</li>
</ul>
</td>
</tr>
}

2
src/Orchard.Web/Modules/Orchard.AntiSpam/Views/Parts/SpamFilter.Metadata.Actions.cshtml
View File

@@ -10,5 +10,3 @@
else {
@Html.Link(@T("Spam").Text, Url.Action("ReportSpam", "Admin", new {area = "Orchard.AntiSpam", part.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"})
}
@T(" | ")

19
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEventActions-Content-Published.SummaryAdmin.cshtml
View File

@@ -7,11 +7,16 @@
var versionNumber = eventData.Get<int>("VersionNumber");
var contentItem = (ContentItem) Model.ContentItem;
}
@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Id, area = "Orchard.AuditTrail" }, null)
@if (contentItem != null) {
var isLatest = contentItem.VersionRecord.Number == versionNumber;
if (!isLatest) {
@T(" | ")
@Html.ActionLink(T("Restore").Text, "Restore", "Content", new {id = contentItem.Id, version = versionNumber, area = "Orchard.AuditTrail"}, new { data_unsafe_url = T("Are you sure you want to restore to version {0}?", versionNumber) })
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Id, area = "Orchard.AuditTrail" }, null)
</li>
@if (contentItem != null) {
var isLatest = contentItem.VersionRecord.Number == versionNumber;
if (!isLatest) {
<li class="action-link">
@Html.ActionLink(T("Restore").Text, "Restore", "Content", new { id = contentItem.Id, version = versionNumber, area = "Orchard.AuditTrail" }, new { data_unsafe_url = T("Are you sure you want to restore to version {0}?", versionNumber) })
</li>
}
}
}
</ul>

15
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEventActions-Content-Removed.SummaryAdmin.cshtml
View File

@@ -7,8 +7,13 @@
var versionNumber = eventData.Get<int>("VersionNumber");
var contentItem = (ContentItem) Model.ContentItem;
}
@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Id, area = "Orchard.AuditTrail" }, null)
@if (contentItem != null) {
@T(" | ")
@Html.ActionLink(T("Restore").Text, "Restore", "Content", new {id = contentItem.Id, version = versionNumber, area = "Orchard.AuditTrail"}, new { data_unsafe_url = T("Are you sure you want to restore this content item?", versionNumber) })
}
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Id, area = "Orchard.AuditTrail" }, null)
</li>
@if (contentItem != null) {
<li class="action-link">
@Html.ActionLink(T("Restore").Text, "Restore", "Content", new { id = contentItem.Id, version = versionNumber, area = "Orchard.AuditTrail" }, new { data_unsafe_url = T("Are you sure you want to restore this content item?", versionNumber) })
</li>
}
</ul>

6
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Parts.Contents.AuditTrail.SummaryAdmin.cshtml
View File

@@ -1 +1,5 @@
<a href="@Url.Action("Index", "Admin", new { content = Model.ContentItem.Id, area = "Orchard.AuditTrail" })">@T("Audit Trail")</a>
<ul class="action-links">
<li class="action-link">
<a href="@Url.Action("Index", "Admin", new { content = Model.ContentItem.Id, area = "Orchard.AuditTrail" })">@T("Audit Trail")</a>
</li>
</ul>

14
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/RecycleBin/Index.cshtml
View File

@@ -59,9 +59,17 @@
<td class="content-column"><a href="@contentDisplayUrl">@contentDisplayText</a></td>
<td class="content-removed-column">@removedText</td>
<td class="actions-column">
<a href="@contentDisplayUrl">@T("View")</a> @T(" | ")
@Html.ActionLink(T("View Audit Trail").Text, "Index", "Admin", new {content = contentItem.Id, area = "Orchard.AuditTrail"}, null) @T(" | ")
<a href="@Url.Action("Restore", "RecycleBin", new {id = contentItem.Id, area = "Orchard.AuditTrail"})" data-unsafe-url="@T("Are you sure you want to restore this item?")">@T("Restore")</a>
<ul class="action-links">
<li class="action-link">
<a href="@contentDisplayUrl">@T("View")</a>
</li>
<li class="action-link">
@Html.ActionLink(T("View Audit Trail").Text, "Index", "Admin", new { content = contentItem.Id, area = "Orchard.AuditTrail" }, null)
</li>
<li class="action-link">
<a href="@Url.Action("Restore", "RecycleBin", new {id = contentItem.Id, area = "Orchard.AuditTrail"})" data-unsafe-url="@T("Are you sure you want to restore this item?")">@T("Restore")</a>
</li>
</ul>
</td>
</tr>
index++;

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml
View File

@@ -8,7 +8,7 @@
<div class="actions"><a class="add button primaryAction" href="@Url.BlogCreate()">@T("New Blog")</a></div>
using(Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) {
<fieldset class="bulk-actions">
<label><input type="checkbox" class="check-all" />@T("Select all")</label>@T(" | ")
<label><input type="checkbox" class="check-all" />@T("Select all")</label>
<label for="publishActions">@T("Actions:")</label>
<select id="publishActions" name="Options.BulkAction">
@Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.None, T("Choose action...").ToString())

87
src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-BlogPost.SummaryAdmin.cshtml
View File

@@ -7,60 +7,75 @@
var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
}
<div class="summary" itemscope="itemscope" itemid="@contentItem.Id" itemtype="http://orchardproject.net/data/ContentItem">
<div class="properties">
<input type="checkbox" value="@contentItem.Id" name="itemIds"/>
<input type="checkbox" value="@contentItem.Id" name="itemIds" />
<h3>@Html.ItemAdminLink(contentItem)</h3> - <div class="contentType">@contentItem.TypeDefinition.DisplayName</div>
@if (Model.Header != null) {
<div class="header">@Display(Model.Header)</div>
<div class="header">@Display(Model.Header)</div>
}
@if (Model.Meta != null) {
<div class="metadata">@Display(Model.Meta)</div>
<div class="metadata">@Display(Model.Meta)</div>
}
</div>
<div class="related">
@Display(Model.Actions)
<ul class="action-links">
@if (contentItem.HasPublished()) {
<li class="action-link">
@Html.ItemDisplayLink(T("View").Text, contentItem)
</li>
@if (contentItem.HasPublished()) {
@Html.ItemDisplayLink(T("View").Text, contentItem)
@T(" | ")
if (contentItem.HasDraft()) {
if (Authorizer.Authorize(Orchard.Blogs.Permissions.PublishBlogPost, contentItem)) {
<li class="action-link">
@Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
</li>
}
if (Authorizer.Authorize(Permissions.PreviewContent, contentItem)) {
<li class="action-link">
@Html.ActionLink(T("Preview").Text, "Preview", "Item", new { area = "Contents", id = contentItem.Id }, new { })
</li>
}
}
if (contentItem.HasDraft()) {
if (Authorizer.Authorize(Orchard.Blogs.Permissions.PublishBlogPost, contentItem)) {
@Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
}
if (Authorizer.Authorize(Permissions.PreviewContent, contentItem)) {
@Html.ActionLink(T("Preview").Text, "Preview", "Item", new { area = "Contents", id = contentItem.Id }, new { })
@T(" | ")
<li class="action-link">
@Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
</li>
}
}
else {
if (contentItem.HasDraft()) {
if (Authorizer.Authorize(Permissions.PreviewContent, contentItem)) {
<li class="action-link">
@Html.ActionLink(T("Preview").Text, "Preview", "Item", new { area = "Contents", id = contentItem.Id }, new { })
</li>
}
}
if (Authorizer.Authorize(Orchard.Blogs.Permissions.PublishBlogPost, contentItem)) {
@Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
}
} else {
if (contentItem.HasDraft()) {
if (Authorizer.Authorize(Permissions.PreviewContent, contentItem)) {
@Html.ActionLink(T("Preview").Text, "Preview", "Item", new { area = "Contents", id = contentItem.Id }, new { })
@T(" | ")
if (Authorizer.Authorize(Orchard.Blogs.Permissions.PublishBlogPost, contentItem)) {
<li class="action-link">
@Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
</li>
}
}
if (Authorizer.Authorize(Orchard.Blogs.Permissions.PublishBlogPost, contentItem)) {
@Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
@if (Authorizer.Authorize(Orchard.Blogs.Permissions.EditBlogPost, contentItem)) {
<li class="action-link">
@Html.ItemEditLink(T("Edit").Text, contentItem)
</li>
}
}
@if (Authorizer.Authorize(Orchard.Blogs.Permissions.EditBlogPost, contentItem)) {
@Html.ItemEditLink(T("Edit").Text, contentItem)@T(" | ")
}
@if (Authorizer.Authorize(Orchard.Blogs.Permissions.DeleteBlogPost, contentItem)) {
@Html.Link(T("Delete").Text, Url.ItemRemoveUrl(contentItem, new {returnUrl}), new {itemprop = "RemoveUrl UnsafeUrl"})
}
@if (Authorizer.Authorize(Orchard.Blogs.Permissions.DeleteBlogPost, contentItem)) {
<li class="action-link">
@Html.Link(T("Delete").Text, Url.ItemRemoveUrl(contentItem, new { returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
}
</ul>
@Display(Model.Actions)
</div>
@if (Model.Content != null) {
<div class="primary">@Display(Model.Content)</div>
<div class="primary">@Display(Model.Content)</div>
}
</div>

11
src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.SummaryAdmin.cshtml
View File

@@ -1,10 +1,15 @@
@using Orchard.Blogs.Extensions;
@using Orchard.Blogs.Models;
@using Orchard.ContentManagement;
@using Orchard.Utility.Extensions;
@{
ContentItem contentItem = Model.ContentItem;
BlogPart blog = (BlogPart)contentItem.Get(typeof(BlogPart));
}
<a href="@Url.BlogForAdmin(blog)" title="@T("List Posts")">@T("List Posts")</a>@T(" | ")
<a href="@Url.BlogPostCreate(blog)" title="@T("New Post")">@T("New Post")</a>@T(" | ")
<ul class="action-links">
<li class="action-link">
<a href="@Url.BlogForAdmin(blog)" title="@T("List Posts")">@T("List Posts")</a>
</li>
<li class="action-link">
<a href="@Url.BlogPostCreate(blog)" title="@T("New Post")">@T("New Post")</a>
</li>
</ul>

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml
View File

@@ -3,7 +3,7 @@
@if (Model.ContentItems.Items.Count > 0) {
using (Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) {
<fieldset class="bulk-actions">
<label><input type="checkbox" class="check-all" />@T("Select all")</label>@T(" | ")
<label><input type="checkbox" class="check-all" />@T("Select all")</label>
<label for="publishActions">@T("Actions:")</label>
<select id="publishActions" name="Options.BulkAction">
@Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.None, T("Choose action...").ToString())

83
src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
View File

@@ -11,7 +11,7 @@
Layout.Title = T("Comments").ToString();
}
@using(Html.BeginFormAntiForgeryPost()) {
@using (Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary()
<fieldset class="bulk-actions">
<label for="publishActions">@T("Actions:")</label>
@@ -44,7 +44,7 @@
</colgroup>
<thead>
<tr>
<th scope="col"><input type="checkbox" class="check-all"/></th>
<th scope="col"><input type="checkbox" class="check-all" /></th>
<th scope="col">@T("Status")</th>
<th scope="col">@T("Author")</th>
<th scope="col">@T("Comment")</th>
@@ -58,46 +58,55 @@
if (!HasText(commentEntry.Comment.UserName)) {
commentClass = "anonymous";
}
<tr itemscope="itemscope" itemid="@Model.Comments[commentIndex].Comment.Id" itemtype="http://orchardproject.net/data/Comment" class="@commentClass">
<td>
<input type="hidden" value="@Model.Comments[commentIndex].Comment.Id" name="@Html.NameOf(m => m.Comments[commentIndex].Comment.Id)"/>
<input type="checkbox" value="true" name="@Html.NameOf(m => m.Comments[commentIndex].IsChecked)"/>
</td>
<td>
@if (commentEntry.Comment.Status == CommentStatus.Pending) { @T("Pending") }
else { @T("Approved") }
</td>
<td>
<div>@commentEntry.Comment.Author</div>
@if (HasText(commentEntry.Comment.UserName) && commentEntry.Comment.Author != commentEntry.Comment.UserName) {
<div class="authenticated-commenter-id">@commentEntry.Comment.UserName</div>
}
</td>
<td>
<p><a href="@Url.ItemDisplayUrl(commentEntry.CommentedOn)#comment-@commentEntry.Comment.Id"><time>@Display.DateTime(DateTimeUtc: commentEntry.Comment.CommentDateUtc.GetValueOrDefault())</time></a></p>
@if (commentEntry.Comment.CommentText != null) {
<tr itemscope="itemscope" itemid="@Model.Comments[commentIndex].Comment.Id" itemtype="http://orchardproject.net/data/Comment" class="@commentClass">
<td>
<input type="hidden" value="@Model.Comments[commentIndex].Comment.Id" name="@Html.NameOf(m => m.Comments[commentIndex].Comment.Id)" />
<input type="checkbox" value="true" name="@Html.NameOf(m => m.Comments[commentIndex].IsChecked)" />
</td>
<td>
@if (commentEntry.Comment.Status == CommentStatus.Pending) { @T("Pending") }
else { @T("Approved") }
</td>
<td>
<div>@commentEntry.Comment.Author</div>
@if (HasText(commentEntry.Comment.UserName) && commentEntry.Comment.Author != commentEntry.Comment.UserName) {
<div class="authenticated-commenter-id">@commentEntry.Comment.UserName</div>
}
</td>
<td>
<p><a href="@Url.ItemDisplayUrl(commentEntry.CommentedOn)#comment-@commentEntry.Comment.Id"><time>@Display.DateTime(DateTimeUtc: commentEntry.Comment.CommentDateUtc.GetValueOrDefault())</time></a></p>
@if (commentEntry.Comment.CommentText != null) {
var ellipsized = Html.Ellipsize(commentEntry.Comment.CommentText, 500);
var paragraphed = new HtmlString(ellipsized.ToHtmlString().Replace("\r\n", "</p><p>"));
<p>@paragraphed</p>
}
else {
@T("[Empty]")
}
</td>
<td>@Html.ItemDisplayLink(commentEntry.CommentedOn)</td>
<td>
<div class="actions">
@if (commentEntry.Comment.Status != CommentStatus.Approved) {
<a href="@Url.Action("Approve", new {commentEntry.Comment.Id, returnUrl = Request.ToUrlString()})" itemprop="ApproveUrl UnsafeUrl">@T("Approve")</a>@T(" | ")
<p>@paragraphed</p>
}
else {
<a href="@Url.Action("Unapprove", new {commentEntry.Comment.Id, returnUrl = Request.ToUrlString()})" itemprop="UnapproveUrl UnsafeUrl">@T("Unapprove")</a>@T(" | ")
@T("[Empty]")
}
<a href="@Url.Action("Edit", new {commentEntry.Comment.Id})" title="@T("Edit")">@T("Edit")</a>@T(" | ")
<a href="@Url.Action("Delete", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Delete")</a>
</div>
</td> </tr>
commentIndex = commentIndex + 1;
</td>
<td>@Html.ItemDisplayLink(commentEntry.CommentedOn)</td>
<td>
<ul class="action-links">
@if (commentEntry.Comment.Status != CommentStatus.Approved) {
<li class="action-link">
<a href="@Url.Action("Approve", new {commentEntry.Comment.Id, returnUrl = Request.ToUrlString()})" itemprop="ApproveUrl UnsafeUrl">@T("Approve")</a>
</li>
}
else {
<li class="action-link">
<a href="@Url.Action("Unapprove", new {commentEntry.Comment.Id, returnUrl = Request.ToUrlString()})" itemprop="UnapproveUrl UnsafeUrl">@T("Unapprove")</a>
</li>
}
<li class="action-link">
<a href="@Url.Action("Edit", new {commentEntry.Comment.Id})" title="@T("Edit")">@T("Edit")</a>
</li>
<li class="action-link">
<a href="@Url.Action("Delete", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Delete")</a>
</li>
</ul>
</td>
</tr>
commentIndex = commentIndex + 1;
}
</table>
@Display(Model.Pager)

22
src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.SummaryAdmin.cshtml
View File

@@ -7,13 +7,17 @@
var settings = WorkContext.CurrentSite.As<CommentSettingsPart>();
}
@if(settings.ModerateComments) {
if (comment.Status != CommentStatus.Pending) {
@Html.Link(@T("Approve").Text, Url.Action("Approve", "Admin", new {area = "Orchard.Comments", comment.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"})
}
else {
@Html.Link(@T("Unapprove").Text, Url.Action("Unapprove", "Admin", new {area = "Orchard.Comments", comment.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"})
}
@T(" | ")
@if (settings.ModerateComments) {
<ul class="action-links">
@if (comment.Status != CommentStatus.Pending) {
<li class="action-link">
@Html.Link(@T("Approve").Text, Url.Action("Approve", "Admin", new { area = "Orchard.Comments", comment.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
</li>
}
else {
<li class="action-link">
@Html.Link(@T("Unapprove").Text, Url.Action("Unapprove", "Admin", new { area = "Orchard.Comments", comment.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
</li>
}
</ul>
}

2
src/Orchard.Web/Modules/Orchard.ContentPicker/Views/Fields/ContentPicker.SummaryAdmin.cshtml
View File

@@ -23,7 +23,7 @@
}
@if (unpublishedContentItems.Any()) {
<span>@T(" | ") @T("Not Published"):</span>
<span>@T("Not Published"):</span>
foreach (var contentItem in unpublishedContentItems) {
<span class="value">@Html.ItemEditLink(contentItem)</span>
if (contentItem != unpublishedContentItems.Last()) {

14
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml
View File

@@ -12,8 +12,16 @@
<p class="pageStatus">@Html.ActionLink(T("Create New {0}", Html.Raw(Model.DisplayName)).Text, "Create", new {area = "Contents", id = Model.Name})</p>
}
</div>
<div class="related">@if (creatable) {
@Html.ActionLink(T("List Items").ToString(), "List", new {area = "Contents", id = Model.Name})@T(" | ")}
@Html.ActionLink(T("Edit").ToString(), "Edit", new {area = "Orchard.ContentTypes", id = Model.Name})
<div class="related">
<ul class="action-links">
@if (creatable) {
<li class="action-link">
@Html.ActionLink(T("List Items").ToString(), "List", new { area = "Contents", id = Model.Name })
</li>
}
<li class="action-link">
@Html.ActionLink(T("Edit").ToString(), "Edit", new { area = "Orchard.ContentTypes", id = Model.Name })
</li>
</ul>
</div>
</div>

80
src/Orchard.Web/Modules/Orchard.CustomForms/Views/Admin/Index.cshtml
View File

@@ -5,11 +5,11 @@
@{
var formIndex = 0;
var pageSizes = new List<int?>() { 10, 50, 100 };
var defaultPageSize = WorkContext.CurrentSite.PageSize;
if(!pageSizes.Contains(defaultPageSize)) {
pageSizes.Add(defaultPageSize);
}
var pageSizes = new List<int?>() { 10, 50, 100 };
var defaultPageSize = WorkContext.CurrentSite.PageSize;
if (!pageSizes.Contains(defaultPageSize)) {
pageSizes.Add(defaultPageSize);
}
}
<h1>@Html.TitleForPage(T("Manage Custom Forms").ToString()) </h1>
@@ -28,54 +28,62 @@
<button type="submit" name="submit.BulkEdit" value="@T("Apply")">@T("Apply")</button>
</fieldset>
<fieldset class="bulk-actions">
<label for="filterResults">@T("Sort by:")</label>
<label for="filterResults">@T("Sort by:")</label>
<select id="filterResults" name="@Html.NameOf(m => m.Options.Order)">
@Html.SelectOption(Model.Options.Order, CustomFormOrder.Creation, T("Creation date").ToString())
</select>
<input type="hidden" name="Page" value="1" />
<label for="pageSize">@T("Show:")</label>
<select id="pageSize" name="PageSize">
@Html.SelectOption((int)Model.Pager.PageSize, 0, T("All").ToString())
@foreach(int size in pageSizes.OrderBy(p => p)) {
@Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
}
</select>
<input type="hidden" name="Page" value="1" />
<label for="pageSize">@T("Show:")</label>
<select id="pageSize" name="PageSize">
@Html.SelectOption((int)Model.Pager.PageSize, 0, T("All").ToString())
@foreach (int size in pageSizes.OrderBy(p => p)) {
@Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
}
</select>
<button type="submit" name="submit.Filter" value="@T("Filter")">@T("Filter")</button>
</fieldset>
<fieldset>
<table class="items">
<thead>
<tr>
<th scope="col"><input type="checkbox" class="check-all"/></th>
<th scope="col"><input type="checkbox" class="check-all" /></th>
<th scope="col">@T("Title")</th>
<th scope="col">@T("Content Type")</th>
<th scope="col">&nbsp;</th>
</tr>
</thead>
@foreach (var entry in Model.CustomForms) {
<tr>
<td>
<input type="hidden" value="@Model.CustomForms[formIndex].CustomForm.Id" name="@Html.NameOf(m => m.CustomForms[formIndex].CustomForm.Id)"/>
<input type="checkbox" value="true" name="@Html.NameOf(m => m.CustomForms[formIndex].IsChecked)"/>
</td>
<td>
@Html.ItemEditLink(entry.CustomForm.Title, entry.CustomForm.ContentItem)
@if (entry.CustomForm.ContentItem.ContentType == "CustomFormWidget") {
@T("-")<text> </text>@T("Widget")
}
</td>
<td>
@entry.CustomForm.ContentType.CamelFriendly()
</td>
<td>
@Html.ItemEditLink(T("Edit").Text, entry.CustomForm.ContentItem) @T(" | ")
@Html.Link(T("Delete").Text, Url.ItemRemoveUrl(entry.CustomForm.ContentItem, new { returnUrl = Request.RawUrl }), new { itemprop = "RemoveUrl UnsafeUrl" }) @T(" | ")
@Html.ActionLink(T("Submissions").Text, "Item", "Admin", new { area = "Orchard.CustomForms", id = entry.CustomForm.Id }, new { })
</td>
</tr>
<tr>
<td>
<input type="hidden" value="@Model.CustomForms[formIndex].CustomForm.Id" name="@Html.NameOf(m => m.CustomForms[formIndex].CustomForm.Id)" />
<input type="checkbox" value="true" name="@Html.NameOf(m => m.CustomForms[formIndex].IsChecked)" />
</td>
<td>
@Html.ItemEditLink(entry.CustomForm.Title, entry.CustomForm.ContentItem)
@if (entry.CustomForm.ContentItem.ContentType == "CustomFormWidget") {
@T("-")<text> </text>@T("Widget")
}
</td>
<td>
@entry.CustomForm.ContentType.CamelFriendly()
</td>
<td>
<ul class="action-links">
<li class="action-link">
@Html.ItemEditLink(T("Edit").Text, entry.CustomForm.ContentItem)
</li>
<li class="action-link">
@Html.Link(T("Delete").Text, Url.ItemRemoveUrl(entry.CustomForm.ContentItem, new { returnUrl = Request.RawUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
<li class="action-link">
@Html.ActionLink(T("Submissions").Text, "Item", "Admin", new { area = "Orchard.CustomForms", id = entry.CustomForm.Id }, new { })
</li>
</ul>
</td>
</tr>
formIndex++;
}
</table>
@Display(Model.Pager)
@Display(Model.Pager)
</fieldset>
}

10
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/BlueprintAdmin/Index.cshtml
View File

@@ -32,8 +32,14 @@
<td>@blueprint.ElementTypeName</td>
<td>@blueprint.BaseElementTypeName</td>
<td>
@Html.ActionLink(T("Edit").Text, "Edit", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, null) @T(" | ")
@Html.ActionLink(T("Remove").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").Text, "Edit", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, null)
</li>
<li class="action-link">
@Html.ActionLink(T("Remove").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
</ul>
</td>
</tr>
}

10
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Index.cshtml
View File

@@ -42,8 +42,14 @@
<td>@dataRow[dataColumn]</td>
}
<td>
@Html.ActionLink(T("Details").Text, "Details", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, null) @T(" | ")
@Html.ActionLink(T("Remove").Text, "Delete", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Details").Text, "Details", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, null)
</li>
<li class="action-link">
@Html.ActionLink(T("Remove").Text, "Delete", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
</ul>
</td>
</tr>
}

14
src/Orchard.Web/Modules/Orchard.Layouts/Views/BlueprintAdmin/Index.cshtml
View File

@@ -32,9 +32,17 @@
<td>@blueprint.ElementTypeName</td>
<td>@blueprint.BaseElementTypeName</td>
<td>
@Html.ActionLink(T("Edit").Text, "Edit", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, null) @T(" | ")
@Html.ActionLink(T("Properties").Text, "Properties", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, null) @T(" | ")
@Html.ActionLink(T("Remove").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, new { itemprop = "RemoveUrl UnsafeUrl" })
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").Text, "Edit", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, null)
</li>
<li class="action-link">
@Html.ActionLink(T("Properties").Text, "Properties", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, null)
</li>
<li class="action-link">
@Html.ActionLink(T("Remove").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
</ul>
</td>
</tr>
}

26
src/Orchard.Web/Modules/Orchard.Lists/Views/Content.SummaryAdminCondensed.cshtml
View File

@@ -7,22 +7,28 @@
}
<div class="summary-condensed" itemscope="itemscope" itemid="@contentItem.Id" itemtype="http://orchardproject.net/data/ContentItem">
<div class="properties">
<input type="checkbox" value="@contentItem.Id" name="itemIds"/>
<input type="checkbox" value="@contentItem.Id" name="itemIds" />
<h3>@Html.ItemAdminLink(contentItem)</h3> - <div class="contentType">@contentItem.TypeDefinition.DisplayName</div>
@if (Model.Header != null) {
<div class="header">@Display(Model.Header)</div>
<div class="header">@Display(Model.Header)</div>
}
</div>
<div class="related">
@Display(Model.Actions)
@if (Authorizer.Authorize(Permissions.EditContent, contentItem)) {
@Html.ItemEditLink(T("Edit").Text, contentItem)@T(" | ")
}
@if (Authorizer.Authorize(Permissions.DeleteContent, contentItem)) {
@Html.Link(T("Delete").Text, Url.ItemRemoveUrl(contentItem, new {returnUrl}), new {itemprop = "RemoveUrl UnsafeUrl"})
}
<ul class="action-links">
@Display(Model.Actions)
@if (Authorizer.Authorize(Permissions.EditContent, contentItem)) {
<li class="action-link">
@Html.ItemEditLink(T("Edit").Text, contentItem)
</li>
}
@if (Authorizer.Authorize(Permissions.DeleteContent, contentItem)) {
<li class="action-link">
@Html.Link(T("Delete").Text, Url.ItemRemoveUrl(contentItem, new { returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
}
</ul>
</div>
@if (Model.Content != null) {
<div class="primary">@Display(Model.Content)</div>
<div class="primary">@Display(Model.Content)</div>
}
</div>

2
src/Orchard.Web/Modules/Orchard.Lists/Views/Parts.Container.Contained.SummaryAdmin.cshtml
View File

@@ -4,5 +4,5 @@
ContentPart contentPart = Model.ContentPart;
}
@if (contentPart.Is<ContainerPart>()) {
@Html.Link(T("Contained Items ({0})", contentPart.As<ContainerPart>().ItemCount).Text, Url.Action("List", "Admin", new { area = "Orchard.Lists", containerId = contentPart.Id }))@T(" | ")
@Html.Link(T("Contained Items ({0})", contentPart.As<ContainerPart>().ItemCount).Text, Url.Action("List", "Admin", new { area = "Orchard.Lists", containerId = contentPart.Id }))
}

10
src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml
View File

@@ -49,8 +49,14 @@
</div>
</div>
</div>
<a href="#" data-id="@contentItem.Id" class="media-library-picker-remove">@T("Remove")</a>@T(" | ")
<a href="@editUrl">@T("Edit")</a>
<ul class="action-links">
<li class="action-link">
<a href="#" data-id="@contentItem.Id" class="media-library-picker-remove">@T("Remove")</a>
</li>
<li class="action-link">
<a href="@editUrl">@T("Edit")</a>
</li>
</ul>
</li>
}
</ul>

17
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml
View File

@@ -1,8 +1,13 @@
@model Orchard.Environment.Configuration.ShellSettings
@using Orchard.MultiTenancy.Extensions;
@using(Html.BeginFormAntiForgeryPost(Url.Action("Enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) {
@Html.HiddenFor(ss => ss.Name)
<button type="submit">@T("Resume")</button>
} @T(" | ")
@Html.ActionLink(T("Reset").ToString(), "Reset", new { name = Model.Name, area = "Orchard.MultiTenancy" })
<ul class="action-links">
<li class="action-link">
@using (Html.BeginFormAntiForgeryPost(Url.Action("Enable", new { area = "Orchard.MultiTenancy" }), FormMethod.Post, new { @class = "inline link" })) {
@Html.HiddenFor(ss => ss.Name)
<button type="submit">@T("Resume")</button>
}
</li>
<li class="action-link">
@Html.ActionLink(T("Reset").ToString(), "Reset", new { name = Model.Name, area = "Orchard.MultiTenancy" })
</li>
</ul>

21
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
View File

@@ -13,8 +13,9 @@
<li class="tenant @tenant.State">
<div class="summary">
<div class="properties">
<h3>@tenant.Name
@if (!String.IsNullOrEmpty(tenant.RequestUrlHost)) {
<h3>
@tenant.Name
@if (!String.IsNullOrEmpty(tenant.RequestUrlHost)) {
var tenantClone = new ShellSettings(tenant);
foreach (var t in tenant.RequestUrlHost.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) {
tenantClone.RequestUrlHost = t;
@@ -25,11 +26,17 @@
</h3>
</div>
<div class="related">
@if (!String.Equals(tenant.Name, "default", StringComparison.OrdinalIgnoreCase)) { //todo: (heskew) base this off the view model so logic on what can be removed and have its state changed stays in the controller
var t = tenant;
@Html.DisplayFor(m => t, String.Format("ActionsFor{0}", tenant.State.ToString()), "") @T(" | ")
}
@Html.ActionLink(T("Edit").ToString(), "Edit", new { name = tenant.Name, area = "Orchard.MultiTenancy" })
<ul class="action-links">
@if (!String.Equals(tenant.Name, "default", StringComparison.OrdinalIgnoreCase)) { //todo: (heskew) base this off the view model so logic on what can be removed and have its state changed stays in the controller
var t = tenant;
<li class="action-link">
@Html.DisplayFor(m => t, String.Format("ActionsFor{0}", tenant.State.ToString()), "")
</li>
}
<li class="action-link">
@Html.ActionLink(T("Edit").ToString(), "Edit", new { name = tenant.Name, area = "Orchard.MultiTenancy" })
</li>
</ul>
</div>
</div>
</li>

110
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml
View File

@@ -38,68 +38,76 @@
if (Model.Extensions.Any()) {
<ul class="contentItems">
@foreach (var item in Model.Extensions) {
<li>
@{
string iconUrl = item.IconUrl;
if (string.IsNullOrWhiteSpace(iconUrl)) {
iconUrl = Href("../../Content/Images/ModuleDefaultIcon.png");
}
}
@foreach (var item in Model.Extensions) {
<li>
@{
string iconUrl = item.IconUrl;
if (string.IsNullOrWhiteSpace(iconUrl)) {
iconUrl = Href("../../Content/Images/ModuleDefaultIcon.png");
}
}
<div class="summary">
@if (item.Notifications != null && item.Notifications.Count > 0) {
<div class="notifications">
<div class="summary">
@if (item.Notifications != null && item.Notifications.Count > 0) {
<div class="notifications">
@foreach (string notification in item.Notifications) {
<h5>@Html.Raw(notification)</h5>
}
</div>
}
</div>
<div class="iconThumbnail">
<div class="extensionDetails column">
<div class="extensionName @if (item.Installed) {<text>installed</text>}">
<h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2>
</div>
<div class="related">
@Html.ActionLink(T("Install").ToString(), "InstallGallery", "PackagingServices", new RouteValueDictionary { { "packageId", item.PackageId }, { "version", item.Version }, { "sourceId", item.Source.Id }, { "redirectUrl", HttpContext.Current.Request.RawUrl } }, null)@T(" | ")
<a href="@item.PackageStreamUri">@T("Download")</a>
</div>
<div class="properties">
@{
var description = item.Description ?? T("(No description").Text;
</div>
}
<p>@Html.Raw(Html.Encode(description).Replace("\n", "<br />"))</p>
<p>
@if (!string.IsNullOrWhiteSpace(item.GalleryDetailsUrl)) {
<a href="@item.GalleryDetailsUrl">@T("more...")</a>
}
</p>
</div>
<div class="iconThumbnail">
<div class="extensionDetails column">
<div class="extensionName @if (item.Installed) {<text>installed</text>}">
<h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2>
</div>
<ul class="pageStatus group">
<li>@T("Last Updated: {0}", item.LastUpdated)</li>
<li>&nbsp;&#124;&nbsp;@T("Author: {0}", !string.IsNullOrEmpty(item.Authors) ? item.Authors : T("Unknown").ToString())</li>
<li>&nbsp;&#124;&nbsp;@T("Downloads: {0}", item.DownloadCount)</li>
<li>&nbsp;&#124;&nbsp;@T("Website: ")
@if (!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> } else { @T("Unknown").ToString() }
</li>
<li class="rating">&nbsp;&#124;&nbsp;@T("Rating: ")
<div class="related">
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Install").ToString(), "InstallGallery", "PackagingServices", new RouteValueDictionary { { "packageId", item.PackageId }, { "version", item.Version }, { "sourceId", item.Source.Id }, { "redirectUrl", HttpContext.Current.Request.RawUrl } }, null)
</li>
<li class="action-link">
<a href="@item.PackageStreamUri">@T("Download")</a>
</li>
</ul>
</div>
<div class="properties">
@{
var description = item.Description ?? T("(No description").Text;
}
<p>@Html.Raw(Html.Encode(description).Replace("\n", "<br />"))</p>
<p>
@if (!string.IsNullOrWhiteSpace(item.GalleryDetailsUrl)) {
<a href="@item.GalleryDetailsUrl">@T("more...")</a>
}
</p>
<ul class="pageStatus group">
<li>@T("Last Updated: {0}", item.LastUpdated)</li>
<li>&nbsp;&#124;&nbsp;@T("Author: {0}", !string.IsNullOrEmpty(item.Authors) ? item.Authors : T("Unknown").ToString())</li>
<li>&nbsp;&#124;&nbsp;@T("Downloads: {0}", item.DownloadCount)</li>
<li>
&nbsp;&#124;&nbsp;@T("Website: ")
@if (!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> }
else { @T("Unknown").ToString() }
</li>
<li class="rating">
&nbsp;&#124;&nbsp;@T("Rating: ")
<div class="ratings" style="width:@(15 * 5)px" title="@T("Rating: {0} out of 5 ({1} total).", item.Rating, item.RatingsCount)">
<div class="score" style="width:@(15 * (item.Rating))px">&nbsp;</div>
</div>
</li>
</ul>
</li>
</ul>
</div>
</div>
<div class="extensionThumbnail column">
<img src="@iconUrl" class="thumbnail" alt="module" />
</div>
</div>
<div class="extensionThumbnail column">
<img src="@iconUrl" class="thumbnail" alt="module" />
</div>
</div>
</li>}
</li>}
</ul>
}

121
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
View File

@@ -38,73 +38,84 @@
if (Model.Extensions.Count() > 0) {
<ul class="contentItems theme">
@foreach (var item in Model.Extensions) {
<li>
@{
string extensionClass = "iconThumbnail";
string iconUrl = item.IconUrl;
if (!string.IsNullOrWhiteSpace(@item.FirstScreenshot)) {
iconUrl = @item.FirstScreenshot;
extensionClass = "screenshotThumbnail";
} else if (string.IsNullOrWhiteSpace(iconUrl)) {
iconUrl = Href("../../Content/Images/imagePlaceholder.png");
extensionClass = "screenshotThumbnail";
}
}
@foreach (var item in Model.Extensions) {
<li>
@{
string extensionClass = "iconThumbnail";
string iconUrl = item.IconUrl;
if (!string.IsNullOrWhiteSpace(@item.FirstScreenshot)) {
iconUrl = @item.FirstScreenshot;
extensionClass = "screenshotThumbnail";
}
else if (string.IsNullOrWhiteSpace(iconUrl)) {
iconUrl = Href("../../Content/Images/imagePlaceholder.png");
extensionClass = "screenshotThumbnail";
}
}
<div class="summary">
@if (item.Notifications != null && item.Notifications.Count > 0) {
<div class="notifications">
<div class="summary">
@if (item.Notifications != null && item.Notifications.Count > 0) {
<div class="notifications">
@foreach (string notification in item.Notifications) {
<h5>@Html.Raw(notification)</h5>
}
</div>
}
</div>
<div class="@extensionClass">
<div class="extensionDetails column">
<div class="extensionName @if (item.Installed) {<text>installed</text>}">
<h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2>
</div>
<div class="related">
@Html.ActionLink(T("Install").ToString(), "InstallGallery", "PackagingServices", new RouteValueDictionary { { "packageId", item.PackageId }, { "version", item.Version }, { "sourceId", item.Source.Id }, { "redirectUrl", HttpContext.Current.Request.RawUrl } }, null)@T(" | ")
<a href="@item.PackageStreamUri">@T("Download")</a>
</div>
<div class="properties">
@{
var description = item.Description ?? T("(No description)").Text;
</div>
}
<p>@Html.Raw(Html.Encode(description).Replace("\n", "<br />"))</p>
<p>
@if (!string.IsNullOrWhiteSpace(item.GalleryDetailsUrl)) {
<a href="@item.GalleryDetailsUrl">@T("more...")</a>
</div>
<div class="@extensionClass">
<div class="extensionDetails column">
<div class="extensionName @if (item.Installed) {<text>installed</text>}">
<h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2>
</div>
<div class="related">
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Install").ToString(), "InstallGallery", "PackagingServices", new RouteValueDictionary { { "packageId", item.PackageId }, { "version", item.Version }, { "sourceId", item.Source.Id }, { "redirectUrl", HttpContext.Current.Request.RawUrl } }, null)
</li>
<li class="action-link">
<a href="@item.PackageStreamUri">@T("Download")</a>
</li>
</ul>
</div>
<div class="properties">
@{
var description = item.Description ?? T("(No description)").Text;
}
</p>
<ul class="pageStatus group">
<li>@T("Last Updated: {0}", item.LastUpdated)</li>
<li>&nbsp;&#124;&nbsp;@T("Author: {0}", !string.IsNullOrEmpty(item.Authors) ? item.Authors : T("Unknown").ToString())</li>
<li>&nbsp;&#124;&nbsp;@T("Downloads: {0}", item.DownloadCount)</li>
<li>&nbsp;&#124;&nbsp;@T("Website: ")
@if (!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> } else { @T("Unknown").ToString() }
</li>
<li class="rating">&nbsp;&#124;&nbsp;@T("Rating: ")
<p>@Html.Raw(Html.Encode(description).Replace("\n", "<br />"))</p>
<p>
@if (!string.IsNullOrWhiteSpace(item.GalleryDetailsUrl)) {
<a href="@item.GalleryDetailsUrl">@T("more...")</a>
}
</p>
<ul class="pageStatus group">
<li>@T("Last Updated: {0}", item.LastUpdated)</li>
<li>&nbsp;&#124;&nbsp;@T("Author: {0}", !string.IsNullOrEmpty(item.Authors) ? item.Authors : T("Unknown").ToString())</li>
<li>&nbsp;&#124;&nbsp;@T("Downloads: {0}", item.DownloadCount)</li>
<li>
&nbsp;&#124;&nbsp;@T("Website: ")
@if (!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> }
else { @T("Unknown").ToString() }
</li>
<li class="rating">
&nbsp;&#124;&nbsp;@T("Rating: ")
<div class="ratings" style="width:@(15 * 5)px" title="@T("Rating: {0} out of 5 ({1} total).", item.Rating, item.RatingsCount)">
<div class="score" style="width:@(15 * (item.Rating))px">&nbsp;</div>
</div>
</li>
</ul>
</li>
</ul>
</div>
</div>
<div class="extensionThumbnail column">
<img src="@iconUrl" class="thumbnail" alt="theme" />
</div>
</div>
<div class="extensionThumbnail column">
<img src="@iconUrl" class="thumbnail" alt="theme" />
</div>
</div>
</li>}
</li>}
</ul>
} else {
}
else {
<p>@T("No themes available.").ToString()</p>
}

10
src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ModulesUpdates.cshtml
View File

@@ -55,8 +55,14 @@
</div>
<div class="related">
@Html.Link(T("Install Latest").Text, InstallAction(module.NewVersionToInstall))@T(" | ")
<a href="@module.NewVersionToInstall.PackageStreamUri">@T("Download")</a>
<ul class="action-links">
<li class="action-link">
@Html.Link(T("Install Latest").Text, InstallAction(module.NewVersionToInstall))
</li>
<li class="action-link">
<a href="@module.NewVersionToInstall.PackageStreamUri">@T("Download")</a>
</li>
</ul>
</div>
<div class="properties">

10
src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ThemesUpdates.cshtml
View File

@@ -60,8 +60,14 @@
</div>
<div class="related">
@Html.Link(T("Install Latest").Text, InstallAction(theme.NewVersionToInstall))@T(" | ")
<a href="@theme.NewVersionToInstall.PackageStreamUri">@T("Download")</a>
<ul class="action-links">
<li class="action-link">
@Html.Link(T("Install Latest").Text, InstallAction(theme.NewVersionToInstall))
</li>
<li class="action-link">
<a href="@theme.NewVersionToInstall.PackageStreamUri">@T("Download")</a>
</li>
</ul>
</div>
<div class="properties">

133
src/Orchard.Web/Modules/Orchard.Projections/Views/Admin/Edit.cshtml
View File

@@ -20,32 +20,43 @@
foreach (var group in Model.FilterGroups) {
bool isFirstGroup = group == Model.FilterGroups.First();
if (!isFirstGroup) {
<h2>@T("Or")</h2>
<h2>@T("Or")</h2>
}
<table class="items">
<thead>
<tr>
<th scope="col" >@T("Description")</th>
<th scope="col" class="actions">
@Html.ActionLink(T("+ Add a new Filter").Text, "Add", new { controller = "Filter", id = group.Id })
@if (Model.FilterGroups.Count() > 1) {
<text> | </text>@Html.ActionLink(T("Delete group").Text, "DeleteGroup", new { controller = "Filter", id = group.Id }, new { itemprop = "RemoveUrl UnsafeUrl" })
}
</th>
</tr>
</thead>
@foreach (var filter in group.Filters) {
<tr>
<td>@filter.DisplayText</td>
<td>
@Html.ActionLink(T("Edit").Text, "Edit", new { controller = "Filter", id = group.Id, category = filter.Category, type = filter.Type, filterId = filter.FilterRecordId }) |
@Html.ActionLink(T("Delete").Text, "Delete", new { controller = "Filter", id = Model.Id, filterId = filter.FilterRecordId }, new { itemprop = "RemoveUrl UnsafeUrl" })
</td>
</tr>
}
</table>
<table class="items">
<thead>
<tr>
<th scope="col">@T("Description")</th>
<th scope="col" class="actions">
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("+ Add a new Filter").Text, "Add", new { controller = "Filter", id = group.Id })
</li>
@if (Model.FilterGroups.Count() > 1) {
<li class="action-link">
@Html.ActionLink(T("Delete group").Text, "DeleteGroup", new { controller = "Filter", id = group.Id }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
}
</ul>
</th>
</tr>
</thead>
@foreach (var filter in group.Filters) {
<tr>
<td>@filter.DisplayText</td>
<td>
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").Text, "Edit", new { controller = "Filter", id = group.Id, category = filter.Category, type = filter.Type, filterId = filter.FilterRecordId })
</li>
<li class="action-link">
@Html.ActionLink(T("Delete").Text, "Delete", new { controller = "Filter", id = Model.Id, filterId = filter.FilterRecordId }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
</ul>
</td>
</tr>
}
</table>
}
<fieldset class="bulk-actions">
@@ -55,25 +66,34 @@
<table class="items">
<thead>
<tr>
<th scope="col" >@T("Description")</th>
<th scope="col">@T("Description")</th>
<th scope="col" class="actions">@Html.ActionLink(T("+ Add a new Sort Criteria").Text, "Add", new { controller = "SortCriterion", id = Model.Id })</th>
</tr>
</thead>
@foreach (var sortCriterion in Model.SortCriteria) {
<tr>
<td>@sortCriterion.DisplayText</td>
<td>
@Html.ActionLink(T("Edit").Text, "Edit", new { controller = "SortCriterion", id = Model.Id, category = sortCriterion.Category, type = sortCriterion.Type, sortCriterionId = sortCriterion.SortCriterionRecordId }) |
@Html.ActionLink(T("Delete").Text, "Delete", new { controller = "SortCriterion", id = Model.Id, sortCriterionId = sortCriterion.SortCriterionRecordId }, new { itemprop = "RemoveUrl UnsafeUrl" })
@if (sortCriterion != Model.SortCriteria.First()) {
<text>|</text> @Html.ActionLink(T("Up").Text, "Move", new { controller = "SortCriterion", id = sortCriterion.SortCriterionRecordId, direction = "up", queryId = Model.Id })
}
@if (sortCriterion != Model.SortCriteria.Last()) {
<text>|</text> @Html.ActionLink(T("Down").Text, "Move", new { controller = "SortCriterion", id = sortCriterion.SortCriterionRecordId, direction = "down", queryId = Model.Id })
}
</td>
</tr>
}
@foreach (var sortCriterion in Model.SortCriteria) {
<tr>
<td>@sortCriterion.DisplayText</td>
<td>
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").Text, "Edit", new { controller = "SortCriterion", id = Model.Id, category = sortCriterion.Category, type = sortCriterion.Type, sortCriterionId = sortCriterion.SortCriterionRecordId })
</li>
<li class="action-link">
@Html.ActionLink(T("Delete").Text, "Delete", new { controller = "SortCriterion", id = Model.Id, sortCriterionId = sortCriterion.SortCriterionRecordId }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
<li class="action-link">
@Html.ActionLink(T("Up").Text, "Move", new { controller = "SortCriterion", id = sortCriterion.SortCriterionRecordId, direction = "up", queryId = Model.Id })
</li>
}
@if (sortCriterion != Model.SortCriteria.Last()) {
<li class="action-link">
@Html.ActionLink(T("Down").Text, "Move", new { controller = "SortCriterion", id = sortCriterion.SortCriterionRecordId, direction = "down", queryId = Model.Id })
</li>
}
</ul>
</td>
</tr>
}
</table>
<fieldset class="bulk-actions">
@@ -83,35 +103,38 @@
<table class="items">
<thead>
<tr>
<th scope="col" >@T("Description")</th>
<th scope="col">@T("Description")</th>
<th scope="col" class="actions">@Html.ActionLink(T("+ Add a new Layout").Text, "Add", new { controller = "Layout", id = Model.Id })</th>
</tr>
</thead>
@foreach (var layout in Model.Layouts) {
<tr>
<td>@(layout.DisplayText)</td>
<td>
@Html.ActionLink(T("Edit").Text, "Edit", new { controller = "Layout", id = layout.LayoutRecordId }) |
@Html.ActionLink(T("Delete").Text, "Delete", new { controller = "Layout", id = layout.LayoutRecordId }, new { itemprop = "RemoveUrl UnsafeUrl" })
</td>
</tr>
}
@foreach (var layout in Model.Layouts) {
<tr>
<td>@(layout.DisplayText)</td>
<td>
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").Text, "Edit", new { controller = "Layout", id = layout.LayoutRecordId })
</li>
<li class="action-link">
@Html.ActionLink(T("Delete").Text, "Delete", new { controller = "Layout", id = layout.LayoutRecordId }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
</ul>
</td>
</tr>
}
</table>
@* Render a button at the bottom only if there are several layouts in the table *@
if (Model.Layouts.Count() > 5) {
<div class="manage">
@Html.ActionLink(T("Add a new Layout").Text, "Add", new { controller = "Layout", id = Model.Id }, new { @class = "button primaryAction" })
@Html.ActionLink(T("Add a new Layout").Text, "Add", new { controller = "Layout", id = Model.Id }, new { @class = "button primaryAction" })
</div>
}
<fieldset>
@if(Model.FilterGroups.SelectMany(x => x.Filters).Any()) {
@if (Model.FilterGroups.SelectMany(x => x.Filters).Any()) {
@Html.ActionLink(T("Preview").ToString(), "Preview", new { Model.Id }, new { @class = "button" });
}
@Html.ActionLink(T("Close").ToString(), "Index", new { }, new { @class = "button" })
</fieldset>
}

56
src/Orchard.Web/Modules/Orchard.Projections/Views/Admin/Index.cshtml
View File

@@ -4,14 +4,14 @@
@{
Style.Include("admin-projections.css");
Layout.Title = T("Manage Queries").ToString();
Layout.Title = T("Manage Queries").ToString();
var index = 0;
var pageSizes = new List<int?>() { 10, 50, 100 };
var defaultPageSize = WorkContext.CurrentSite.PageSize;
if(!pageSizes.Contains(defaultPageSize)) {
pageSizes.Add(defaultPageSize);
}
var pageSizes = new List<int?>() { 10, 50, 100 };
var defaultPageSize = WorkContext.CurrentSite.PageSize;
if(!pageSizes.Contains(defaultPageSize)) {
pageSizes.Add(defaultPageSize);
}
}
<h1>@Html.TitleForPage(T("Manage Queries").ToString()) </h1>
@@ -19,7 +19,7 @@
@Html.ValidationSummary()
<div class="manage">@Html.ActionLink(T("Add a new Query").ToString(), "Create", new { Area = "Contents", id = "Query", returnurl = HttpContext.Current.Request.RawUrl }, new { @class = "button primaryAction" })</div>
<fieldset class="bulk-actions">
<label><input type="checkbox" class="check-all" />@T("Select all")</label>@T(" | ")
<label><input type="checkbox" class="check-all" />@T("Select all")</label>
<label for="publishActions">@T("Actions:")</label>
<select id="publishActions" name="@Html.NameOf(m => m.Options.BulkAction)">
@Html.SelectOption(Model.Options.BulkAction, QueriesBulkAction.None, T("Choose action...").ToString())
@@ -28,18 +28,18 @@
<button type="submit" name="submit.BulkEdit" value="@T("Apply")">@T("Apply")</button>
</fieldset>
<fieldset class="bulk-actions">
<label for="filterResults">@T("Sort by:")</label>
<label for="filterResults">@T("Sort by:")</label>
<select id="filterResults" name="@Html.NameOf(m => m.Options.Order)">
@Html.SelectOption(Model.Options.Order, QueriesOrder.Name, T("Name").ToString())
</select>
<input type="hidden" name="Page" value="1" />
<label for="pageSize">@T("Show:")</label>
<select id="pageSize" name="PageSize">
@Html.SelectOption((int)Model.Pager.PageSize, 0, T("All").ToString())
@foreach(int size in pageSizes.OrderBy(p => p)) {
@Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
}
</select>
<input type="hidden" name="Page" value="1" />
<label for="pageSize">@T("Show:")</label>
<select id="pageSize" name="PageSize">
@Html.SelectOption((int)Model.Pager.PageSize, 0, T("All").ToString())
@foreach(int size in pageSizes.OrderBy(p => p)) {
@Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
}
</select>
<button type="submit" name="submit.Filter" value="@T("Filter")">@T("Filter")</button>
</fieldset>
<fieldset>
@@ -61,17 +61,27 @@
@Html.ActionLink(entry.Name, "Edit", new { id = entry.QueryId })
</td>
<td>
@Html.ActionLink(T("Properties").ToString(), "Edit", new { Area = "Contents", id = entry.QueryId, returnurl = HttpContext.Current.Request.RawUrl }) |
@Html.ActionLink(T("Edit").ToString(), "Edit", new { id = entry.QueryId }) |
@Html.ActionLink(T("Delete").ToString(), "Delete", new { id = entry.QueryId }, new { itemprop = "RemoveUrl UnsafeUrl" })
@if (entry.Query.FilterGroups.SelectMany(x => x.Filters).Any()) {
<text>| </text> @Html.ActionLink(T("Preview").ToString(), "Preview", new { id = entry.QueryId })
}
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Properties").ToString(), "Edit", new { Area = "Contents", id = entry.QueryId, returnurl = HttpContext.Current.Request.RawUrl })
</li>
<li class="action-link">
@Html.ActionLink(T("Edit").ToString(), "Edit", new { id = entry.QueryId })
</li>
<li class="action-link">
@Html.ActionLink(T("Delete").ToString(), "Delete", new { id = entry.QueryId }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
@if (entry.Query.FilterGroups.SelectMany(x => x.Filters).Any()) {
<li class="action-link">
@Html.ActionLink(T("Preview").ToString(), "Preview", new { id = entry.QueryId })
</li>
}
</ul>
</td>
</tr>
index++;
}
</table>
@Display(Model.Pager)
@Display(Model.Pager)
</fieldset>
}

76
src/Orchard.Web/Modules/Orchard.Projections/Views/Binding/Index.cshtml
View File

@@ -28,38 +28,38 @@
<button type="submit" name="submit.BulkEdit" value="@T("Apply")">@T("Apply")</button>
</fieldset>
<fieldset class="bulk-actions">
<label for="filterResults">@T("Sort by:")</label>
<label for="filterResults">@T("Sort by:")</label>
<select id="filterResults" name="@Html.NameOf(m => m.Options.Order)">
@Html.SelectOption(Model.Options.Order, BindingsOrder.Name, T("Name").ToString())
</select>
<input type="hidden" name="Page" value="1" />
<label for="pageSize">@T("Show:")</label>
<select id="pageSize" name="PageSize">
@Html.SelectOption((int)Model.Pager.PageSize, 0, T("All").ToString())
@foreach (int size in pageSizes.OrderBy(p => p)) {
@Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
}
</select>
<input type="hidden" name="Page" value="1" />
<label for="pageSize">@T("Show:")</label>
<select id="pageSize" name="PageSize">
@Html.SelectOption((int)Model.Pager.PageSize, 0, T("All").ToString())
@foreach (int size in pageSizes.OrderBy(p => p)) {
@Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
}
</select>
<button type="submit" name="submit.Filter" value="@T("Filter")">@T("Filter")</button>
</fieldset>
}
<fieldset>
<table class="items">
<thead>
<tr>
<th scope="col">&nbsp;&darr;</th>
<th scope="col">@T("Type")</th>
<th scope="col">@T("Member")</th>
<th scope="col">@T("Display")</th>
<th scope="col">@T("Description")</th>
<th scope="col">&nbsp;</th>
</tr>
</thead>
@foreach (var entry in Model.Bindings) {
<tr>
<fieldset>
<table class="items">
<thead>
<tr>
<th scope="col">&nbsp;&darr;</th>
<th scope="col">@T("Type")</th>
<th scope="col">@T("Member")</th>
<th scope="col">@T("Display")</th>
<th scope="col">@T("Description")</th>
<th scope="col">&nbsp;</th>
</tr>
</thead>
@foreach (var entry in Model.Bindings) {
<tr>
<td>
<input type="hidden" value="@Model.Bindings[index].Binding.Id" name="@Html.NameOf(m => m.Bindings[index].Binding.Id)"/>
<input type="checkbox" value="true" name="@Html.NameOf(m => m.Bindings[index].IsChecked)"/>
<input type="hidden" value="@Model.Bindings[index].Binding.Id" name="@Html.NameOf(m => m.Bindings[index].Binding.Id)" />
<input type="checkbox" value="true" name="@Html.NameOf(m => m.Bindings[index].IsChecked)" />
</td>
<td>
@entry.Binding.Type
@@ -74,18 +74,24 @@
@entry.Binding.Description
</td>
<td>
@Html.ActionLink(T("Edit").ToString(), "Edit", new { entry.Binding.Id }) |
@using (Html.BeginFormAntiForgeryPost(Url.Action("Delete"), FormMethod.Post, new { @class = "inline link" })) {
@Html.Hidden("id", entry.Binding.Id)
<button type="submit" itemprop="RemoveUrl">@T("Delete")</button>
}
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").ToString(), "Edit", new { entry.Binding.Id })
</li>
<li class="action-link">
@using (Html.BeginFormAntiForgeryPost(Url.Action("Delete"), FormMethod.Post, new { @class = "inline link" })) {
@Html.Hidden("id", entry.Binding.Id)
<button type="submit" itemprop="RemoveUrl">@T("Delete")</button>
}
</li>
</ul>
</td>
</tr>
index++;
}
</table>
</fieldset>
index++;
}
</table>
</fieldset>
@using (Html.BeginFormAntiForgeryPost()) {
@Display(Model.Pager)
@Display(Model.Pager)
}

2
src/Orchard.Web/Modules/Orchard.PublishLater/Views/Parts/PublishLater.Metadata.Summary.cshtml
View File

@@ -6,5 +6,5 @@
DateTime? publishedUtc = publishLaterPart.As<CommonPart>() == null ? null : publishLaterPart.As<CommonPart>().PublishedUtc;
}
@if (publishLaterPart.IsPublished() && publishedUtc.HasValue) {
@T("Published: {0}", Display.DateTimeRelative(DateTimeUtc: publishedUtc.Value)) @T(" | ")
@T("Published: {0}", Display.DateTimeRelative(DateTimeUtc: publishedUtc.Value))
}

21
src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
View File

@@ -7,7 +7,7 @@
Layout.Title = T("Roles").ToString();
}
@using(Html.BeginFormAntiForgeryPost()) {
@using (Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary();
<fieldset class="bulk-actions">
<label for="publishActions">@T("Actions:")</label>
@@ -26,21 +26,26 @@
</colgroup>
<thead>
<tr>
<th scope="col"><input type="checkbox" class="check-all"/></th>
<th scope="col"><input type="checkbox" class="check-all" /></th>
<th scope="col">@T("Name")</th>
<th scope="col"></th>
</tr>
</thead>
@foreach (var row in Model.Rows) {
<tr>
<td><input type="checkbox" value="true" name="@("Checkbox." + row.Id)"/></td>
<td><input type="checkbox" value="true" name="@("Checkbox." + row.Id)" /></td>
<td>@Html.ActionLink(row.Name, "Edit", new { row.Id })</td>
<td>
@Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })
@if (row.Name != "Administrator") {
@T(" | ")
<a href="@Url.Action("Delete", new {row.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Delete")</a>
}
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })
</li>
@if (row.Name != "Administrator") {
<li class="action-link">
<a href="@Url.Action("Delete", new {row.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Delete")</a>
</li>
}
</ul>
</td>
</tr>
}

10
src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
View File

@@ -43,8 +43,14 @@
@Html.ActionLink(tagEntry.Tag.TagName, "Edit", new {id = tagEntry.Tag.Id})
</td>
<td>
@Html.ActionLink(T("Edit").ToString(), "Edit", new {id = tagEntry.Tag.Id}) @T(" | ")
<a href="@Url.Action("Remove", new {tagEntry.Tag.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Delete")</a>
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").ToString(), "Edit", new { id = tagEntry.Tag.Id })
</li>
<li class="action-link">
<a href="@Url.Action("Remove", new {tagEntry.Tag.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Delete")</a>
</li>
</ul>
</td>
</tr>
tagIndex = tagIndex + 1;

2
src/Orchard.Web/Modules/Orchard.Templates/Views/Admin/List.cshtml
View File

@@ -16,7 +16,7 @@
</div>
@using (Html.BeginFormAntiForgeryPost()) {
<fieldset class="bulk-actions">
<label><input type="checkbox" class="check-all" />@T("Select all")</label>@T(" | ")
<label><input type="checkbox" class="check-all" />@T("Select all")</label>
<label for="publishActions">@T("Actions:")</label>
<select id="publishActions" name="Options.BulkAction">
@Html.SelectOption((ContentsBulkAction)Model.Options.BulkAction, ContentsBulkAction.None, T("Choose action...").ToString())

103
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml
View File

@@ -1,13 +1,8 @@
@model Orchard.Users.ViewModels.UsersIndexViewModel
@using Orchard.Core.Shapes;
@using Orchard.Users.Models;
@using Orchard.Users.ViewModels;
@{
var userIndex = 0;
Layout.Title = T("Users").ToString();
}
@@ -49,7 +44,7 @@
<table class="items">
<thead>
<tr>
<th scope="col"><input type="checkbox" class="check-all"/></th>
<th scope="col"><input type="checkbox" class="check-all" /></th>
<th scope="col">@T("Name")</th>
<th scope="col">@T("Email")</th>
<th scope="col">@T("Actions")</th>
@@ -58,50 +53,64 @@
</tr>
</thead>
@foreach (var entry in Model.Users) {
<tr>
<td>
<input type="hidden" value="@Model.Users[userIndex].User.Id" name="@Html.NameOf(m => m.Users[userIndex].User.Id)"/>
<input type="checkbox" value="true" name="@Html.NameOf(m => m.Users[userIndex].IsChecked)"/>
</td>
<td>
@if (entry.User.RegistrationStatus == UserStatus.Approved && entry.User.EmailStatus == UserStatus.Approved) {
<img class="icon" src="@Href("~/Modules/Orchard.Users/Content/Admin/images/online.gif") " alt="@T("Approved") " title="@T("User is approved") " />
} else {
<img class="icon" src="@Href("~/Modules/Orchard.Users/Content/Admin/images/offline.gif") " alt="@T("Moderated") " title="@if (entry.User.EmailStatus == UserStatus.Approved) { @T("User is moderated") } else { @T("E-mail validation is pending") }" />
}
@Html.ActionLink(entry.User.UserName, "Edit", new { entry.User.Id })
</td>
<td>
@entry.User.Email
</td>
<td>
@Html.ActionLink(T("Edit").ToString(), "Edit", new { entry.User.Id }) |
@Html.ActionLink(T("Delete").ToString(), "Delete", new { entry.User.Id}, new { itemprop = "RemoveUrl UnsafeUrl" }) |
@if (entry.User.RegistrationStatus == UserStatus.Pending) {
@Html.ActionLink(T("Approve").ToString(), "Approve", new { entry.User.Id }, new { itemprop = "UnsafeUrl" })
} else {
@Html.ActionLink(T("Disable").ToString(), "Moderate", new { entry.User.Id }, new { itemprop = "UnsafeUrl" })
}
@if (entry.User.EmailStatus == UserStatus.Pending) { <text>|</text>
@Html.ActionLink(T("Send challenge E-mail").ToString(), "SendChallengeEmail", new { entry.User.Id }, new { itemprop = "UnsafeUrl" })
}
</td>
<td>
@if (entry.User.CreatedUtc != null) {
@Display(New.DateTimeRelative(dateTimeUtc: entry.User.CreatedUtc))
}
</td>
<td>
@if (entry.User.LastLoginUtc != null) {
@Display(New.DateTimeRelative(dateTimeUtc: entry.User.LastLoginUtc))
}
</td>
</tr>
userIndex++;
<tr>
<td>
<input type="hidden" value="@Model.Users[userIndex].User.Id" name="@Html.NameOf(m => m.Users[userIndex].User.Id)" />
<input type="checkbox" value="true" name="@Html.NameOf(m => m.Users[userIndex].IsChecked)" />
</td>
<td>
@if (entry.User.RegistrationStatus == UserStatus.Approved && entry.User.EmailStatus == UserStatus.Approved) {
<img class="icon" src="@Href("~/Modules/Orchard.Users/Content/Admin/images/online.gif") " alt="@T("Approved") " title="@T("User is approved") " />
}
else {
<img class="icon" src="@Href("~/Modules/Orchard.Users/Content/Admin/images/offline.gif") " alt="@T("Moderated") " title="@if (entry.User.EmailStatus == UserStatus.Approved) { @T("User is moderated") } else { @T("E-mail validation is pending") }" />
}
@Html.ActionLink(entry.User.UserName, "Edit", new { entry.User.Id })
</td>
<td>
@entry.User.Email
</td>
<td>
<ul class="action-links">
<li class="action-link">
@Html.ActionLink(T("Edit").ToString(), "Edit", new { entry.User.Id })
</li>
<li class="action-link">
@Html.ActionLink(T("Delete").ToString(), "Delete", new { entry.User.Id }, new { itemprop = "RemoveUrl UnsafeUrl" })
</li>
@if (entry.User.RegistrationStatus == UserStatus.Pending) {
<li class="action-link">
@Html.ActionLink(T("Approve").ToString(), "Approve", new { entry.User.Id }, new { itemprop = "UnsafeUrl" })
</li>
}
else {
<li class="action-link">
@Html.ActionLink(T("Disable").ToString(), "Moderate", new { entry.User.Id }, new { itemprop = "UnsafeUrl" })
</li>
}
@if (entry.User.EmailStatus == UserStatus.Pending) {
<li class="action-link">
@Html.ActionLink(T("Send challenge E-mail").ToString(), "SendChallengeEmail", new { entry.User.Id }, new { itemprop = "UnsafeUrl" })
</li>
}
</ul>
</td>
<td>
@if (entry.User.CreatedUtc != null) {
@Display(New.DateTimeRelative(dateTimeUtc: entry.User.CreatedUtc))
}
</td>
<td>
@if (entry.User.LastLoginUtc != null) {
@Display(New.DateTimeRelative(dateTimeUtc: entry.User.LastLoginUtc))
}
</td>
</tr>
userIndex++;
}
</table>
@Display(Model.Pager)
@Display(Model.Pager)
</fieldset>
}

12
src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
View File

@@ -68,14 +68,12 @@
list-style:decimal inside;
}
*/
.widgets-listed ol {
}
#widgets-orphans ul {
margin-top: 10px;
}
.widgets-listed li, #widgets-available li {
.widgets-listed > ol > li, #widgets-available li {
background: #FFF;
color: #AEC3CE;
border: 1px solid #EAEAEA;
@@ -92,11 +90,11 @@ list-style:decimal inside;
margin: 5px 0;
}
.widgets-listed li.last {
.widgets-listed > ol > li.last {
margin: 0;
}
.widgets-listed li:hover, .widgets-listed li.on {
.widgets-listed > ol > li:hover, .widgets-listed > ol > li.on {
border-color: #487328;
}
@@ -104,11 +102,11 @@ list-style:decimal inside;
font-size: 1.231em;
}
.widgets-listed h2, .widgets-listed li li, #widgets-layer-visibility li {
.widgets-listed h2, .widgets-listed > ol > li > ul > li, #widgets-layer-visibility li {
color: #333;
}
.widgets-listed li li, #widgets-layer-visibility li {
.widgets-listed > ol > li > ul > li, #widgets-layer-visibility li {
background: #F3F4F5;
border: 0;
border-left: 3px solid #EAEAEA;

67
src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
View File

@@ -27,34 +27,41 @@
<li class="widgets-@(widget.LayerId == Model.CurrentLayer.Id ? "this" : "other")-layer widgets-layer-@widget.LayerId@(i == 0 ? " first" : (i == count ? " last" : ""))">
@using (Html.BeginFormAntiForgeryPost()) {
<h3>@Html.ActionLink(HasText(widget.Title) ? widget.Title : widget.TypeDefinition.DisplayName, "EditWidget", new { @widget.Id, returnUrl })</h3><div class="contentType"> - @widget.TypeDefinition.DisplayName</div>
<div class="widgets-actions">
<ul class="widgets-actions action-links">
@if (widget.HasPublished()) {
if (widget.HasDraft()) {
if (Authorizer.Authorize(Permissions.PublishContent, widget)) {
@Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
<li class="action-link">
@Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
</li>
}
}
if (Authorizer.Authorize(Permissions.PublishContent, widget)) {
@Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
<li class="action-link">
@Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
</li>
}
}
else {
if (Authorizer.Authorize(Permissions.PublishContent, widget)) {
@Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
<li class="action-link">
@Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
</li>
}
}
@if (widget.LayerId != Model.CurrentLayer.Id) {
<button name="moveHere" class="link" type="submit" value="1">@T("Move to current layer")</button>
<li class="action-link">
<button name="moveHere" class="link" type="submit" value="1">@T("Move to current layer")</button>
</li>
}
else { /* it could be useful to remove the widget regardless of the layer it's on but there's no place in the current UI for this and "Move to current layer" */
<button name="moveOut" class="link" type="submit" value="1" itemprop="RemoveUrl">@T("Remove")</button>
<li class="action-link">
<button name="moveOut" class="link" type="submit" value="1" itemprop="RemoveUrl">@T("Remove")</button>
</li>
}
</div>
</ul>
<div class="widgets-move-somewhere">
<button name="moveUp" @(new MvcHtmlString(i == 0 ? "disabled='disabled'" : "")) class="widgets-move widgets-move-up" type="submit" title="@T("Move up")" value="1">@T("Move up")</button>
<button name="moveDown" @(new MvcHtmlString(++i == count ? "disabled='disabled'" : "")) class="widgets-move widgets-move-down" type="submit" title="@T("Move down")" value="1">@T("Move down")</button>
@@ -66,44 +73,6 @@
}
}
</ul>
</li>
</li>
}
</ol>
@*
@{
Script.Require("ShapesBase");
ContentPart contentPart = Model.ContentPart;
}
@if (contentPart.HasPublished()) {
@Html.ItemDisplayLink(T("View").Text, (ContentItem)Model.ContentPart.ContentItem)
@T(" | ")
if (contentPart.HasDraft()) {
if (Authorizer.Authorize(Permissions.PublishContent, contentPart)) {
@Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
@Html.ActionLink(T("Preview").Text, "Preview", "Item", new { area = "Contents", id = ((ContentItem)Model.ContentPart.ContentItem).Id }, new { })
@T(" | ")
}
}
if (Authorizer.Authorize(Permissions.PublishContent, contentPart)) {
@Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
}
}
else {
if (contentPart.HasDraft()) {
@Html.ActionLink(T("Preview").Text, "Preview", "Item", new { area = "Contents", id = ((ContentItem)Model.ContentPart.ContentItem).Id }, new { })
@T(" | ")
}
if (Authorizer.Authorize(Permissions.PublishContent, contentPart)) {
@Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
@T(" | ")
}
}
*@

39
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -212,6 +212,27 @@ form.link button:hover, button.link:hover {
ol.decimal {list-style:decimal inside; margin:12px 0;}
ul.disc {list-style:disc inside; margin:12px 0;}
.action-links {
display: inline-flex;
list-style: none;
padding: 0;
}
.action-links + .action-links::before {
content: " ";
display: block;
}
.action-links > .action-label {
font-weight: bold;
margin: 0 6px;
}
.action-links > .action-link + .action-link::before {
content: "|";
margin: 0 2px 0 6px;
}
/* Header - Branding, Login and Culture Selection
***************************************************************/
#header {
@@ -955,26 +976,26 @@ table.items tr.internal *{
margin:1em 0;
padding:0;
}
.contentItems li {
.contentItems > ul > li, .contentItems > li {
margin:0;
overflow:hidden;
padding:0 1.4em .8em;
border-bottom:1px solid #eaeaea;
}
.contentItems.bulk-items li {
.contentItems.bulk-items > ul > li {
padding-bottom:.6em;
padding-left:.6em;
}
#main .contentItems li .actions {
#main .contentItems > ul > li .actions {
color:#EAE9D9;
height:auto;
margin:-1.3em 0 0;
padding:0 0 .1em;
}
#main .contentItems li .actions .ibutton {
#main .contentItems > ul > li .actions .ibutton {
margin-right:6px;
}
#main .contentItems li .actions .destruct .ibutton {
#main .contentItems > ul > li .actions .destruct .ibutton {
margin-left:8px;
margin-right:0;
}
@@ -989,6 +1010,7 @@ table.items tr.internal *{
.contentItems .summary {
clear:both;
padding:1.2em .4em .5em;
overflow: auto;
}
.contentItems .properties {
float:left;
@@ -1020,7 +1042,12 @@ table.items tr.internal *{
margin:0 .2em -.2em;
}
.contentItems .related {
text-align:right;
display: flex;
flex-direction: column;
align-items: flex-end;
width: auto;
float: right;
text-align: right;
}
.contentItems .comment-count {
line-height:2em;

16
src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
View File

@@ -1,2 +1,16 @@
@model dynamic
@if (Model.CurrentUser != null) {<div id="login">@T("User:") @Html.ItemDisplayText((Orchard.ContentManagement.IContent)Model.CurrentUser)@T(" | ")@Html.ActionLink(T("Change password").ToString(), "ChangePassword", new { area = "Orchard.Users", Controller = "Account" })@T(" | ")@Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account", ReturnUrl = Href("~/") })</div>}
@if (Model.CurrentUser != null) {
<div id="login">
<ul class="action-links">
<li class="action-link">
@T("User:") @Html.ItemDisplayText((Orchard.ContentManagement.IContent)Model.CurrentUser)
</li>
<li class="action-link">
@Html.ActionLink(T("Change password").ToString(), "ChangePassword", new { area = "Orchard.Users", Controller = "Account" })
</li>
<li class="action-link">
@Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account", ReturnUrl = Href("~/") })
</li>
</ul>
</div>
}