diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx index 69f3256df..73ac3893c 100644 --- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx @@ -27,7 +27,7 @@ using (Html.BeginFormAntiForgeryPost()) { %> <% if (!menuPartEntry.IsMenuItem) { %><% } else { %><% } %> - " class="remove"><%=_Encoded(menuPartEntry.IsMenuItem ? "Delete" : "Remove") %> + " class="remove"><%=_Encoded("Remove") %> <% ++menuPartEntryIndex; } %> diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx index a26214f0b..eaa9c76b9 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx @@ -4,5 +4,5 @@ <% using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForItem(vm => vm.Blog) %> -
" />
<% +
" />
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx index e8a7a0d56..6438fd06e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx @@ -16,7 +16,7 @@ "><%=_Encoded("Settings") %><%=_Encoded(" | ")%> <%-- todo: (heskew) this is waaaaa too verbose. need template helpers for all ibuttons --%> <% using (Html.BeginFormAntiForgeryPost(Url.BlogDelete(Model.Item.Slug), FormMethod.Post, new { @class = "inline" })) { %> - <% + <% } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx index 17b5b16b2..e605d831c 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx @@ -52,7 +52,7 @@ "><%=_Encoded("Publish")%><%=_Encoded(" | ")%><% } %> "><%=_Encoded("Edit")%><%=_Encoded(" | ")%> - "><%=_Encoded("Delete")%> + "><%=_Encoded("Remove")%>
<%Html.Zone("meta");%>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx index ecb1a42b8..13d2a6aeb 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx @@ -26,7 +26,7 @@ <%=Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Approve, _Encoded("Approve").ToString())%> <%=Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Pend, _Encoded("Pend").ToString())%> <%=Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.MarkAsSpam, _Encoded("Mark as Spam").ToString())%> - <%=Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Delete, _Encoded("Delete").ToString())%> + <%=Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Delete, _Encoded("Remove").ToString())%> " /> diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx index 21edf4c08..62a851cae 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx @@ -11,7 +11,7 @@ <%=Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Approve, _Encoded("Approve").ToString()) %> <%=Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Pend, _Encoded("Pend").ToString()) %> <%=Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, _Encoded("Mark as Spam").ToString()) %> - <%=Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, _Encoded("Delete").ToString())%> + <%=Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, _Encoded("Remove").ToString())%> " /> diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx index 22701c26f..cd02356b8 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx @@ -26,7 +26,7 @@
" />
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx index c3727fbc7..9cea54772 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx @@ -52,7 +52,7 @@
" /> - <%--" />--%> + <%--" />--%>
<%--
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx index 3dd66a5d1..3741a936d 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx @@ -22,6 +22,6 @@
" /> - <%--" />--%> + <%--" />--%>
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx index 2b33d0d1f..f09e12323 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx @@ -6,7 +6,7 @@
" />
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx index d9626c7ba..6fb3f2092 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx +++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx @@ -15,7 +15,7 @@ using (Html.BeginFormAntiForgeryPost()) { %> <%=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())%> + <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Delete, _Encoded("Remove").ToString())%> " /> @@ -85,7 +85,7 @@ using (Html.BeginFormAntiForgeryPost()) { %> " title="<%=_Encoded("Publish Page")%>"><%=_Encoded("Publish")%><%=_Encoded(" | ")%><% } %> <%=Html.ActionLink(_Encoded("Edit").ToString(), "Edit", new {id = pageEntry.Page.Id}, new {title = _Encoded("Edit Page")})%><%=_Encoded(" | ")%> - " title="<%=_Encoded("Delete Page")%>"><%=_Encoded("Delete")%> + " title="<%=_Encoded("Remove Page")%>"><%=_Encoded("Remove")%>
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx index f39bc2c4f..b1e086cdf 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx @@ -51,6 +51,6 @@
" /> - " /> + " />
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx index 1424f4042..c4e598cbb 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx @@ -6,7 +6,7 @@
" />
diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Create.aspx b/src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Create.aspx index 9e55fc775..9b4e17c67 100644 --- a/src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Create.aspx +++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Create.aspx @@ -5,6 +5,6 @@
<%=Html.LabelFor(x => x.Name) %> <%=Html.EditorFor(x => x.Name) %> - " /> + " />
<% } %> diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Index.aspx b/src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Index.aspx index b129f242b..c4314c5cf 100644 --- a/src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Index.aspx @@ -1,5 +1,5 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>

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

-

<%=Html.ActionLink(T("Create new page").ToString(), "create") %>

+

<%=Html.ActionLink(T("Add new page").ToString(), "create") %>

<%=Html.UnorderedList(Model.Pages, (sp, i) => Html.DisplayForItem(sp).ToHtmlString(), "pages contentItems") %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx index fab40301d..9b20fc43f 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx @@ -7,7 +7,7 @@ " /> diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx index a8d80f094..30e387a30 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx @@ -9,6 +9,6 @@ <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %> <%=Html.EditorForItem(Model.User) %>
- " /> + " />
<% } %> diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx index bc0f16d14..3ebac9da5 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx @@ -29,7 +29,7 @@ <%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.User.Id })%> | - <%=Html.ActionLink(T("Delete").ToString(), "Delete", new { row.User.Id })%> + <%=Html.ActionLink(T("Remove").ToString(), "Delete", new { row.User.Id })%> <%}%>