Ensuring that usage of "Add/Edit/Remove" for actions is consistent across modules

--HG--
branch : dev

src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx

@@ -27,7 +27,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
             <td><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Text) %>" value="<%=menuPartEntry.MenuItem.Text %>" /></td>
             <td><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Position) %>" value="<%=menuPartEntry.MenuItem.Position %>" /></td>
             <td><% if (!menuPartEntry.IsMenuItem) { %><input type="text" class="text-box disabled" disabled="disabled" value="<%=menuPartEntry.MenuItem.Url %>" /><% } else { %><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Url) %>" value="<%=menuPartEntry.MenuItem.Url %>" /><% } %></td>
-            <td><input type="hidden" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItemId) %>" value="<%=menuPartEntry.MenuItemId %>" /><a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Delete", new {id = menuPartEntry.MenuItemId})) %>" class="remove"><%=_Encoded(menuPartEntry.IsMenuItem ? "Delete" : "Remove") %></a></td>
+            <td><input type="hidden" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItemId) %>" value="<%=menuPartEntry.MenuItemId %>" /><a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Delete", new {id = menuPartEntry.MenuItemId})) %>" class="remove"><%=_Encoded("Remove") %></a></td>
         </tr><%
         ++menuPartEntryIndex;
     } %>

src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx

@@ -4,5 +4,5 @@
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
     <%=Html.EditorForItem(vm => vm.Blog) %>
-    <fieldset><input class="button primaryAction" type="submit" value="<%=_Encoded("Create") %>" /></fieldset><%
+    <fieldset><input class="button primaryAction" type="submit" value="<%=_Encoded("Add") %>" /></fieldset><%
    } %>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx

@@ -16,7 +16,7 @@
         <a href="<%=Url.BlogEdit(Model.Item.Slug) %>" title="<%=_Encoded("Settings") %>"><%=_Encoded("Settings") %></a><%=_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" })) { %>
-        <button type="submit" class="linkButton" title="<%=_Encoded("Delete") %>"><%=_Encoded("Delete") %></button><%
+        <button type="submit" class="linkButton" title="<%=_Encoded("Remove") %>"><%=_Encoded("Remove") %></button><%
         } %>
     </div>
     <div style="clear:both;"></div>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx

@@ -52,7 +52,7 @@
         <a href="<%=Html.AntiForgeryTokenGetUrl(Url.BlogPostPublish(Model.Item)) %>" title="<%=_Encoded("Publish Post")%>"><%=_Encoded("Publish")%></a><%=_Encoded(" | ")%><%
         } %>
         <a href="<%=Url.BlogPostEdit(Model.Item) %>" title="<%=_Encoded("Edit Post")%>"><%=_Encoded("Edit")%></a><%=_Encoded(" | ")%>
-        <a href="<%=Html.AntiForgeryTokenGetUrl(Url.BlogPostDelete(Model.Item)) %>" title="<%=_Encoded("Delete Post")%>"><%=_Encoded("Delete")%></a>
+        <a href="<%=Html.AntiForgeryTokenGetUrl(Url.BlogPostDelete(Model.Item)) %>" title="<%=_Encoded("Remove Post")%>"><%=_Encoded("Remove")%></a>
         <br /><%Html.Zone("meta");%>
     </div>
     <div style="clear:both;"></div>

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())%>
         </select>
         <input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
     </fieldset>

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())%>
         </select>
         <input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
     </fieldset>

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx

@@ -26,7 +26,7 @@
     <fieldset class="actions bulk">
         <label for="publishActions"><%=_Encoded("Actions:")%></label>
 		<select id="Select1" name="publishActions">
-		    <option value="1"><%=_Encoded("Delete")%></option>
+		    <option value="1"><%=_Encoded("Remove")%></option>
 		</select>
 		<input class="button" type="submit" value="<%=_Encoded("Apply") %>" />
 	</fieldset>

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx

@@ -52,7 +52,7 @@
 		    </fieldset>
 		    <fieldset>
 			    <input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" />
-			    <%--<input type="submit" class="button" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
+			    <%--<input type="submit" class="button" name="submit.Delete" value="<%=_Encoded("Remove") %>" />--%>
             </fieldset>
 	    </div>
 	    <%--<div class="secondary" style="border:1px solid #ff0000;">

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx

@@ -22,6 +22,6 @@
     </fieldset>
     <fieldset>		
 		<input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" />
-		<%--<input type="submit" class="button buttonFocus roundCorners" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
+		<%--<input type="submit" class="button buttonFocus roundCorners" name="submit.Delete" value="<%=_Encoded("Remove") %>" />--%>
     </fieldset>
 <% } %>

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx

@@ -6,7 +6,7 @@
     <fieldset class="actions bulk">
         <label for="publishActions"><%=_Encoded("Actions:") %></label>
 		<select id="Select1" name="publishActions">
-		    <option value="1"><%=_Encoded("Delete")%></option>
+		    <option value="1"><%=_Encoded("Remove")%></option>
 		</select>
 		<input class="button roundCorners" type="submit" value="<%=_Encoded("Apply") %>" />
     </fieldset>

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())%>
         </select>
         <input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
     </fieldset>
@@ -85,7 +85,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
                         <a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Publish", new {id = pageEntry.Page.Id})) %>" title="<%=_Encoded("Publish Page")%>"><%=_Encoded("Publish")%></a><%=_Encoded(" | ")%><%
                         } %>
                         <%=Html.ActionLink(_Encoded("Edit").ToString(), "Edit", new {id = pageEntry.Page.Id}, new {title = _Encoded("Edit Page")})%><%=_Encoded(" | ")%>
-                        <a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Delete", new {id = pageEntry.Page.Id})) %>" title="<%=_Encoded("Delete Page")%>"><%=_Encoded("Delete")%></a>
+                        <a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Delete", new {id = pageEntry.Page.Id})) %>" title="<%=_Encoded("Remove Page")%>"><%=_Encoded("Remove")%></a>
                     </div>
                     <div style="clear:both;"></div>
                 </div>

src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx

@@ -51,6 +51,6 @@
     </fieldset>
     <fieldset>
 	    <input type="submit" class="button" name="submit.Save" value="<%=_Encoded("Save") %>" />
-	    <input type="submit" class="button remove" name="submit.Delete" value="<%=_Encoded("Delete") %>" />
+	    <input type="submit" class="button remove" name="submit.Delete" value="<%=_Encoded("Remove") %>" />
 	</fieldset>
 <% } %>

src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx

@@ -6,7 +6,7 @@
     <fieldset class="actions bulk">
         <label for="publishActions"><%=_Encoded("Actions:") %></label>
         <select id="Select1" name="roleActions">
-            <option value="1"><%=_Encoded("Delete") %></option>
+            <option value="1"><%=_Encoded("Remove") %></option>
         </select>
 		<input class="button" type="submit" value="<%=_Encoded("Apply") %>" />
 	</fieldset>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Create.aspx

@@ -5,6 +5,6 @@
     <fieldset>
         <%=Html.LabelFor(x => x.Name) %>
         <%=Html.EditorFor(x => x.Name) %>
-        <input type="submit" name="submit" value="<%=_Encoded("Create") %>" />
+        <input type="submit" name="submit" value="<%=_Encoded("Add") %>" />
     </fieldset>
 <% } %>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Index.aspx

@@ -1,5 +1,5 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PageIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
 <h1><%=Html.TitleForPage(T("Sandbox Pages").ToString()) %></h1>
-<p><%=Html.ActionLink(T("Create new page").ToString(), "create") %></p>
+<p><%=Html.ActionLink(T("Add new page").ToString(), "create") %></p>
 <%=Html.UnorderedList(Model.Pages, (sp, i) => Html.DisplayForItem(sp).ToHtmlString(), "pages contentItems") %>

src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx

@@ -7,7 +7,7 @@
         <label for="publishActions"><%=_Encoded("Actions:") %></label>
         <select id="publishActions" name="<%=Html.NameOf(m => m.BulkAction)%>">
             <%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, _Encoded("Choose action...").ToString())%>
-            <%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.Delete, _Encoded("Delete").ToString())%>
+            <%=Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.Delete, _Encoded("Remove").ToString())%>
         </select>
         <input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
     </fieldset>

src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx

@@ -9,6 +9,6 @@
     <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
     <%=Html.EditorForItem(Model.User) %>
     <fieldset>
-        <input class="button primaryAction" type="submit" value="<%=_Encoded("Create") %>" />
+        <input class="button primaryAction" type="submit" value="<%=_Encoded("Add") %>" />
     </fieldset>
 <% } %>

src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx

@@ -29,7 +29,7 @@
                 </td>
                 <td>
                     <%=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 })%> 
                 </td>
             </tr>
             <%}%>