From ea4e4008099d8a84e8ff36be1a34777d8ad7355b Mon Sep 17 00:00:00 2001 From: skewed Date: Fri, 8 Jan 2010 08:38:07 +0000 Subject: [PATCH] UI cleanup pass (progress - Orchard.Roles and Orchard.Media) --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045138 --- .../Controllers/AdminController.cs | 14 ++-- .../Orchard.Media/Views/Admin/Add.aspx | 27 ++++---- .../Orchard.Media/Views/Admin/Create.aspx | 20 +++--- .../Orchard.Media/Views/Admin/Edit.aspx | 65 +++++++++---------- .../Orchard.Media/Views/Admin/EditMedia.aspx | 57 ++++++++-------- .../Views/Admin/EditProperties.aspx | 20 +++--- .../Orchard.Media/Views/Admin/Index.aspx | 37 ++++++----- .../Parts/Media.SiteSettings.ascx | 18 ++--- .../Orchard.Roles/Views/Admin/Create.aspx | 26 ++++---- .../Orchard.Roles/Views/Admin/Edit.aspx | 34 +++++----- .../Orchard.Roles/Views/Admin/Index.aspx | 21 +++--- .../Parts/Roles.UserRoles.ascx | 12 ++-- .../Controllers/AdminController.cs | 6 +- src/Orchard/Mvc/ViewPage.cs | 2 +- 14 files changed, 182 insertions(+), 177 deletions(-) diff --git a/src/Orchard.Web/Packages/Orchard.Media/Controllers/AdminController.cs b/src/Orchard.Web/Packages/Orchard.Media/Controllers/AdminController.cs index 5884cd734..15fa4def6 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Controllers/AdminController.cs +++ b/src/Orchard.Web/Packages/Orchard.Media/Controllers/AdminController.cs @@ -54,10 +54,10 @@ namespace Orchard.Media.Controllers { } [AcceptVerbs(HttpVerbs.Post)] - public ActionResult Create(FormCollection input) { + public ActionResult Create() { var viewModel = new MediaFolderCreateViewModel(); try { - UpdateModel(viewModel, input.ToValueProvider()); + UpdateModel(viewModel); if (!_authorizer.Authorize(Permissions.CreateMediaFolder, T("Couldn't create media folder"))) return new HttpUnauthorizedResult(); _mediaService.CreateFolder(viewModel.MediaPath, viewModel.Name); @@ -109,10 +109,10 @@ namespace Orchard.Media.Controllers { } [AcceptVerbs(HttpVerbs.Post)] - public ActionResult EditProperties(FormCollection input) { + public ActionResult EditProperties() { var viewModel = new MediaFolderEditPropertiesViewModel(); try { - UpdateModel(viewModel, input.ToValueProvider()); + UpdateModel(viewModel); //TODO: There may be better ways to do this. // Delete if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) { @@ -141,10 +141,10 @@ namespace Orchard.Media.Controllers { } [AcceptVerbs(HttpVerbs.Post)] - public ActionResult Add(FormCollection input) { + public ActionResult Add() { var viewModel = new MediaItemAddViewModel(); try { - UpdateModel(viewModel, input.ToValueProvider()); + UpdateModel(viewModel); if (!_authorizer.Authorize(Permissions.UploadMedia, T("Couldn't upload media file"))) return new HttpUnauthorizedResult(); @@ -176,7 +176,7 @@ namespace Orchard.Media.Controllers { public ActionResult EditMedia(FormCollection input) { var viewModel = new MediaItemEditViewModel(); try { - UpdateModel(viewModel, input.ToValueProvider()); + UpdateModel(viewModel); if (!_authorizer.Authorize(Permissions.ModifyMedia, T("Couldn't modify media file"))) return new HttpUnauthorizedResult(); // Delete diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx index 8f13df3f6..58151a6f3 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx @@ -1,25 +1,26 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Helpers"%> <%@ Import Namespace="Orchard.Media.Models"%> <%@ Import Namespace="Orchard.Media.ViewModels"%> -

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

-

- <%=Html.ActionLink("Media Folders", "Index")%> > - <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> +

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

+

<%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> > + <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %> <%=Html.ActionLink(navigation.FolderName, "Edit", new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > <% } %> - Add Media

-<% using (Html.BeginForm("Add", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%> + <%=_Encoded("Add Media") %>

+<% using (Html.BeginForm("Add", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) { %> <%= Html.ValidationSummary() %>
- - - - -
- After your files have been uploaded, you can edit the titles and descriptions. + + " size="64"/> + <%=_Encoded("After your files have been uploaded, you can edit the titles and descriptions.")%> + + +
+
+ " /> <%=Html.AntiForgeryTokenOrchard() %>
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx index 085b4fe12..d92a212fc 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx @@ -1,20 +1,20 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Media.Models"%> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Helpers"%> +<%@ Import Namespace="Orchard.Media.Models"%> <%@ Import Namespace="Orchard.Media.ViewModels"%> -

<%=Html.TitleForPage("Add a Folder")%>

-

<%=Html.ActionLink("Media Folders", "Index")%> > - <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> +

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

+

<%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> > + <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %> <%=Html.ActionLink(navigation.FolderName, "Edit", - new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > + new {name = navigation.FolderName, mediaPath = navigation.FolderPath}) %> > <% } %> - Add a Folder

+ <%=_Encoded("Add a Folder") %>

<%using (Html.BeginFormAntiForgeryPost()) { %> <%= Html.ValidationSummary() %>
- + - - + + " />
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx index 0a7329519..30ec63842 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx @@ -1,30 +1,30 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Models"%> <%@ Import Namespace="Orchard.Media.Helpers"%> <%@ Import Namespace="Orchard.Media.ViewModels"%> -

<%=Html.TitleForPage("Manage Folder")%>

-
<%=Html.ActionLink("Folder Properties", "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%>
-

<%=Html.ActionLink("Media Folders", "Index")%> > +

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

+
<%=Html.ActionLink(T("Folder Properties").ToString(), "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%>
+

<%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> > <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> <%=Html.ActionLink(navigation.FolderName, "Edit", new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > <% } %> - Manage Folder

+ <%=_Encoded("Manage Folder")%>

<% using(Html.BeginFormAntiForgeryPost()) { %>
- + - + " />
- <%=Html.ActionLink("Add media", "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%> - <%=Html.ActionLink("Add a folder", "Create", new { Model.MediaPath }, new { @class = "button" })%> + <%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%> + <%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
- +
"> @@ -36,19 +36,19 @@ - - - - - + + + + + <%foreach (var mediaFile in Model.MediaFiles) { %> - - - - + + + + <%}%> <%foreach (var mediaFolder in Model.MediaFolders) { %> - - - - + + + + <%}%>
 ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%>NameAuthorLast UpdatedTypeSize<%=_Encoded("Name") %><%=_Encoded("Author") %><%=_Encoded("Last Updated") %><%=_Encoded("Type") %><%=_Encoded("Size") %>
- "/> - + "/> + " name="<%=_Encoded("mediaFile.Name") %>" /> <%=Html.ActionLink(mediaFile.Name, "EditMedia", new { name = mediaFile.Name, @@ -57,34 +57,33 @@ folderName = mediaFile.FolderName, mediaPath = Model.MediaPath })%> Orchard User<%= mediaFile.LastUpdated %><%= mediaFile.Type %><%= mediaFile.Size %><%=_Encoded("Orchard User")%><%=mediaFile.LastUpdated %><%=Html.Encode(mediaFile.Type) %><%=mediaFile.Size %>
- "/> - + "/> + - " height="16px" width="16px" class="mediaTypeIcon" alt="Folder" /> - <%=Html.ActionLink(mediaFolder.Name, "Edit", new { name = mediaFolder.Name, - mediaPath = mediaFolder.MediaPath})%> + " height="16" width="16" class="mediaTypeIcon" alt="<%=_Encoded("Folder") %>" /> + <%=Html.ActionLink(mediaFolder.Name, "Edit", new { name = mediaFolder.Name, mediaPath = mediaFolder.MediaPath})%> Orchard User<%= mediaFolder.LastUpdated %>Folder<%= mediaFolder.Size %><%=_Encoded("Orchard User")%><%=mediaFolder.LastUpdated %><%=_Encoded("Folder")%><%=mediaFolder.Size %>
- <%=Html.ActionLink("Add media", "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%> - <%=Html.ActionLink("Add a folder", "Create", new { Model.MediaPath }, new { @class = "button" })%> + <%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%> + <%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx index f10617a79..4b91106c0 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx @@ -1,49 +1,52 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Models"%> <%@ Import Namespace="Orchard.Media.Helpers"%> <%@ Import Namespace="Orchard.Media.ViewModels"%> -

<%=Html.TitleForPage("Edit Media - {0}", Model.Name)%>

-

- <%=Html.ActionLink("Media Folders", "Index")%> > +

<%=Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())%>

+

<%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> > <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> <%=Html.ActionLink(navigation.FolderName, "Edit", new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > - <% } %> - Edit Media

+ <%=_Encoded("Edit Media")%>

<%using (Html.BeginFormAntiForgeryPost()) { %> <%= Html.ValidationSummary() %>
-

About this media

+

<%=_Encoded("About this media")%>

- - - - - - - - - - This will be used for the image alt tag. +
+ + + +
+
+ + + <%=_Encoded("This will be used for the image alt tag.")%> + + + + +
- - <%----%> + " /> + <%--" />--%>
-

Preview

-
" class="previewImage" alt="<%= Model.Caption %>" />
+

<%=_Encoded("Preview")%>

+
" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" />
    -
  • Dimensions: 500 x 375 pixels
    • -
  • Size: <%= Model.Size %>
    • -
  • Added on: <%= Model.LastUpdated %> by Orchard User
    • + <%-- todo: make these real (including markup) --%> +
    • +
    • +
  • - - " width="500" height="375" alt="<%= Model.Caption %>" />" /> -

    Copy this html to add this image to your site.

    + + ", ResolveUrl("~/Media/" + Model.RelativePath + "/" + Model.Name), 500, 375, Model.Caption) %>" /> + <%=_Encoded("Copy this html to add this image to your site.") %>

diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx index 38b865463..be605be30 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx @@ -1,22 +1,22 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Media.Models"%> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Helpers"%> +<%@ Import Namespace="Orchard.Media.Models"%> <%@ Import Namespace="Orchard.Media.ViewModels"%> -

<%=Html.TitleForPage("Folder Properties")%>

-

<%=Html.ActionLink("Media Folders", "Index")%> > +

<%=Html.TitleForPage(T("Folder Properties").ToString())%>

+

<%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> > <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> <%=Html.ActionLink(navigation.FolderName, "Edit", new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > <% } %> - Folder Properties

+ <%=_Encoded("Folder Properties")%>

<% using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %>
- - - - - <%----%> + + + + " /> + <%--" />--%>
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx index 46c26c587..45a2048ce 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx @@ -1,19 +1,18 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.ViewModels"%> -

<%=Html.TitleForPage("Manage Media Folders")%>

-

<%=Html.ActionLink("Media Folders", "Index")%> > Manage Media Folders

+

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

<% using(Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %>
- + - + " />
-
<%=Html.ActionLink("Add a folder", "Create", new {}, new { @class = "button"}) %>
+
<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new {}, new { @class = "button"}) %>
- +
"> @@ -25,27 +24,29 @@ - - - - - + + + + + <%foreach (var mediaFolder in Model.MediaFolders) { %> - - + <%-- todo: (heskew) this URL needs to be determined from current package location --%> + - + - + <%}%>
 ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%>NameAuthorLast UpdatedTypeSize<%=_Encoded("Name")%><%=_Encoded("Author") %><%=_Encoded("Last Updated") %><%=_Encoded("Type") %><%=_Encoded("Size") %>
"/>" height="16px" width="16px" class="mediaTypeIcon" alt="Folder" /> + "/> + " height="16" width="16" class="mediaTypeIcon" alt="<%=_Encoded("Folder") %>" /> <%=Html.ActionLink(mediaFolder.Name, "Edit", new { name = mediaFolder.Name, mediaPath = mediaFolder.MediaPath })%> Orchard User<%=_Encoded("Orchard User")%> <%=mediaFolder.LastUpdated %>Folder<%=_Encoded("Folder")%> <%=mediaFolder.Size %>
-
<%=Html.ActionLink("Add a folder", "Create", new {}, new { @class = "button"}) %>
+
<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new {}, new { @class = "button"}) %>
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx b/src/Orchard.Web/Packages/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx index 39dd69138..8177c2ec2 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx @@ -1,10 +1,10 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Media.Models"%> -

Media

-
    -
  1. - <%= Html.LabelFor(x=>x.RootMediaFolder) %> - <%= Html.EditorFor(x=>x.RootMediaFolder) %> - <%= Html.ValidationMessage("RootMediaFolder", "*")%> -
    2. -
+
+ <%=_Encoded("Media")%> +
+ + <%=Html.EditorFor(x=>x.RootMediaFolder) %> + <%=Html.ValidationMessage("RootMediaFolder", "*")%> +
+
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx index 41825c4ff..efd2c23ce 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx @@ -1,18 +1,18 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Roles.ViewModels"%> -

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

+

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

<% using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary()%>
- Information - - + <%=_Encoded("Information") %> + +
- Permissions + <%=_Encoded("Permissions") %> <% foreach (var packageName in Model.PackagePermissions.Keys) { %>
- <%=packageName%> Module + <%=_Encoded("{0} Module", packageName) %> @@ -20,14 +20,14 @@ - - + + - <% foreach (var permission in Model.PackagePermissions[packageName]) {%> + <% foreach (var permission in Model.PackagePermissions[packageName]) { %> - - + + <% } %>
PermissionAllow<%=_Encoded("Permission") %><%=_Encoded("Allow") %>
<%=permission.Description%>"/><%=Html.Encode(permission.Description) %>"/>
@@ -35,6 +35,6 @@ <% } %>
- + " />
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx index ad0f13c41..e55258c62 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx @@ -1,19 +1,19 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Roles.ViewModels"%> -

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

+

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

<% using(Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %>
- Information - - - + <%=_Encoded("Information") %> + + +
- Permissions + <%=_Encoded("Permissions") %> <% foreach (var packageName in Model.PackagePermissions.Keys) { %>
- <%=packageName%> Module + <%=_Encoded("{0} Module", packageName) %> @@ -21,18 +21,18 @@ - - + + - <% foreach (var permission in Model.PackagePermissions[packageName]) {%> + <% foreach (var permission in Model.PackagePermissions[packageName]) { %> - + @@ -42,7 +42,7 @@ <% } %>
- - + " /> + " />
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx index c9f0f1473..135878a1e 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx @@ -1,17 +1,18 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -

<%=Html.TitleForPage("Manage Roles")%>

+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Roles.ViewModels"%> +

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

<% using(Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %>
- + - + " />
-
<%=Html.ActionLink("Add a role", "Create", new {}, new { @class = "button" }) %>
+
<%=Html.ActionLink(T("Add a role").ToString(), "Create", new {}, new { @class = "button" }) %>
-
PermissionAllow<%=_Encoded("Permission") %><%=_Encoded("Allow") %>
<%=permission.Description%><%=Html.Encode(permission.Description) %> - <% if (Model.CurrentPermissions.Contains(permission.Name)) {%> - " checked="checked"/> + <% if (Model.CurrentPermissions.Contains(permission.Name)) { %> + " checked="checked"/> <% } else {%> - "/> + "/> <% }%>
+
"> @@ -20,15 +21,15 @@ - + <%foreach (var row in Model.Rows) { %> - + - + <%}%>
 ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%>Name<%=_Encoded("Name")%>
"/>"/> <%=Html.Encode(row.Name) %><%=Html.ActionLink("Edit", "Edit", new { row.Id })%><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })%>
diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx b/src/Orchard.Web/Packages/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx index 8a4ce8e23..0bc3fbd50 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx +++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx @@ -1,18 +1,18 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Roles.ViewModels"%>
- Roles + <%=_Encoded("Roles")%> <% if (Model.Roles.Count > 0) { var index = 0; foreach (var entry in Model.Roles) {%> <%=Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%> <%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%> - + <%=Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%> + <%++index; } } else { - %>

There are no roles

<% + %>

<%=_Encoded("There are no roles.")%>

<% } %>
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/AdminController.cs b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/AdminController.cs index 7cf1cb91d..5a623b35c 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/AdminController.cs +++ b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/AdminController.cs @@ -52,7 +52,7 @@ namespace Orchard.Tags.Controllers { [HttpPost] public ActionResult Index(FormCollection input) { var viewModel = new TagsAdminIndexViewModel { Tags = new List(), BulkAction = new TagAdminIndexBulkAction() }; - UpdateModel(viewModel, input.ToValueProvider()); + UpdateModel(viewModel); try { IEnumerable checkedEntries = viewModel.Tags.Where(t => t.IsChecked); @@ -88,7 +88,7 @@ namespace Orchard.Tags.Controllers { public ActionResult Create(FormCollection input) { var viewModel = new TagsAdminCreateViewModel(); try { - UpdateModel(viewModel, input.ToValueProvider()); + UpdateModel(viewModel); if (!_authorizer.Authorize(Permissions.CreateTag, T("Couldn't create tag"))) return new HttpUnauthorizedResult(); _tagService.CreateTag(viewModel.TagName); @@ -120,7 +120,7 @@ namespace Orchard.Tags.Controllers { public ActionResult Edit(FormCollection input) { var viewModel = new TagsAdminEditViewModel(); try { - UpdateModel(viewModel, input.ToValueProvider()); + UpdateModel(viewModel); if (!_authorizer.Authorize(Permissions.RenameTag, T("Couldn't edit tag"))) return new HttpUnauthorizedResult(); diff --git a/src/Orchard/Mvc/ViewPage.cs b/src/Orchard/Mvc/ViewPage.cs index 033a48e80..1301a1439 100644 --- a/src/Orchard/Mvc/ViewPage.cs +++ b/src/Orchard/Mvc/ViewPage.cs @@ -21,7 +21,7 @@ namespace Orchard.Mvc { public MvcHtmlString _Encoded(string textHint) { return MvcHtmlString.Create(Html.Encode(T(textHint))); } - public MvcHtmlString _Encoded(string textHint, params string[] formatTokens) { + public MvcHtmlString _Encoded(string textHint, params object[] formatTokens) { return MvcHtmlString.Create(Html.Encode(T(textHint, formatTokens))); } }