From 0d3be132995287c69597d0b4fc24ebd4678479b0 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 10 Sep 2010 14:26:04 -0700 Subject: [PATCH] Migrating Orchard.Roles --HG-- branch : theming --- .../Orchard.Roles/Orchard.Roles.csproj | 8 +-- .../Orchard.Roles/Views/Admin/Create.aspx | 40 ------------- .../Orchard.Roles/Views/Admin/Create.cshtml | 40 +++++++++++++ .../Orchard.Roles/Views/Admin/Edit.aspx | 56 ------------------- .../Orchard.Roles/Views/Admin/Edit.cshtml | 56 +++++++++++++++++++ .../Orchard.Roles/Views/Admin/Index.aspx | 37 ------------ .../Orchard.Roles/Views/Admin/Index.cshtml | 40 +++++++++++++ .../Parts/Roles.UserRoles.ascx | 23 -------- .../Parts/Roles.UserRoles.cshtml | 21 +++++++ 9 files changed, 161 insertions(+), 160 deletions(-) delete mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx create mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx create mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx create mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index eca352eef..848e1ff64 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -90,10 +90,10 @@ - - - - + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx deleted file mode 100644 index eb42b7975..000000000 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx +++ /dev/null @@ -1,40 +0,0 @@ -<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Roles.ViewModels"%> -

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

-<% using (Html.BeginFormAntiForgeryPost()) { %> - <%: Html.ValidationSummary()%> -
- <%: T("Information") %> - - -
-
- <%: T("Permissions") %> - <% foreach (var featureName in Model.FeaturePermissions.Keys) { %> -
- <%: T("{0} Module", featureName) %> - - - - - - - - - - - - <% foreach (var permission in Model.FeaturePermissions[featureName]) { %> - - - - - <% } %> -
<%: T("Permission") %><%: T("Allow") %>
<%: permission.Description %>"/>
-
- <% } %> -
-
- " /> -
-<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml new file mode 100644 index 000000000..75353742e --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml @@ -0,0 +1,40 @@ +@model RoleCreateViewModel +@using Orchard.Roles.ViewModels +

@Html.TitleForPage(T("Add Role").ToString())

+@using (Html.BeginFormAntiForgeryPost()) { + Html.ValidationSummary(); +
+ @T("Information") + + +
+
+ @T("Permissions") + @foreach (var featureName in Model.FeaturePermissions.Keys) { +
+ @T("{0} Module", featureName) + + + + + + + + + + + + @foreach (var permission in Model.FeaturePermissions[featureName]) { + + + + + } +
@T("Permission")@T("Allow")
@permission.Description
+
+ } +
+
+ +
+} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx deleted file mode 100644 index 242a7e28d..000000000 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx +++ /dev/null @@ -1,56 +0,0 @@ -<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.Roles.ViewModels"%> -

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

-<% using(Html.BeginFormAntiForgeryPost()) { %> - <%: Html.ValidationSummary() %> -
- <%: T("Information") %> - - - -
-
- <%: T("Permissions") %> - <% foreach (var featureName in Model.FeaturePermissions.Keys) { %> -
- <%: T("{0} Feature", featureName) %> - - - - - - - - - - - - - <% foreach (var permission in Model.FeaturePermissions[featureName]) { %> - - - - - - <% } %> -
<%: T("Permission") %><%: T("Allow") %><%: T("Effective") %>
<%: permission.Description %> - <% if (Model.CurrentPermissions.Contains(permission.Name)) { %> - " checked="checked"/> - <% } else {%> - "/> - <% }%> - - <% if (Model.EffectivePermissions.Contains(permission.Name)) { %> - " checked="checked"/> - <% } else {%> - "/> - <% }%> -
-
- <% } %> -
-
- " /> - " /> -
-<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml new file mode 100644 index 000000000..5e20fa4ec --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml @@ -0,0 +1,56 @@ +@model RoleEditViewModel +@using Orchard.Roles.ViewModels +

@Html.TitleForPage(T("Edit Role").ToString())

+@using(Html.BeginFormAntiForgeryPost()) { + Html.ValidationSummary(); +
+ @T("Information") + + + +
+
+ @T("Permissions") + @foreach (var featureName in Model.FeaturePermissions.Keys) { +
+ @T("{0} Feature", featureName) + + + + + + + + + + + + + @foreach (var permission in Model.FeaturePermissions[featureName]) { + + + + + + } +
@T("Permission")@T("Allow")@T("Effective")
@permission.Description + @if (Model.CurrentPermissions.Contains(permission.Name)) { + + } else { + + } + + @if (Model.EffectivePermissions.Contains(permission.Name)) { + + } else { + + } +
+
+ } +
+
+ + +
+} \ 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 deleted file mode 100644 index 8a7246027..000000000 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx +++ /dev/null @@ -1,37 +0,0 @@ -<%@ 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(T("Add a role").ToString(), "Create", new { }, new { @class = "button primaryAction" })%>
-
- "> - - - - - - - - - - - - - <%foreach (var row in Model.Rows) { %> - - - - - - <%}%> -
 ↓<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%><%: T("Name")%>
"/><%: row.Name %><%: Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })%>
-
-<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml new file mode 100644 index 000000000..fb40e7635 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml @@ -0,0 +1,40 @@ +@model RolesIndexViewModel +@using Orchard.Roles.ViewModels + +

@Html.TitleForPage(T("Manage Roles").ToString())

+@using(Html.BeginFormAntiForgeryPost()) { + Html.ValidationSummary(); +
+ + + +
+
@Html.ActionLink(T("Add a role").ToString(), "Create", new { }, new { @class = "button primaryAction" })
+
+ + + + + + + + + + + + + + @foreach (var row in Model.Rows) { + + + + + + } +
 ↓@T("Name")
@row.Name@Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })
+ +
+ +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx deleted file mode 100644 index 88dc7fbde..000000000 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx +++ /dev/null @@ -1,23 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Roles.ViewModels"%> -
- <%: T("Roles")%> - <% if (Model.Roles.Count > 0) { - var index = 0; - foreach (var entry in Model.Roles) { - if (string.Equals(entry.Name, "Authenticated", StringComparison.OrdinalIgnoreCase) || string.Equals(entry.Name, "Anonymous", StringComparison.OrdinalIgnoreCase)) { - continue; - }%> - <%: Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%> - <%: Html.Hidden("Roles[" + index + "].Name", entry.Name)%> -
- <%: Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%> - -
- <%++index; - } - } - else { - %>

<%: T("There are no roles.")%>

<% - } %> -
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml new file mode 100644 index 000000000..b8f8a28b8 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml @@ -0,0 +1,21 @@ +@model UserRolesViewModel +@using Orchard.Roles.ViewModels +
+ @T("Roles") + @if (Model.Roles.Count > 0) { + var index = 0; + foreach (var entry in Model.Roles) { + if (string.Equals(entry.Name, "Authenticated", StringComparison.OrdinalIgnoreCase) || string.Equals(entry.Name, "Anonymous", StringComparison.OrdinalIgnoreCase)) { + continue; + } + Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId); + Html.Hidden("Roles[" + index + "].Name", entry.Name); +
+ @Html.CheckBox("Roles[" + index + "].Granted", entry.Granted) + +
+ @++index; + } + } + else {

@T("There are no roles.")

} +