From 1e0e5f6f65380419a86ee1c3b95f27cda17e7fbb Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Feb 2021 20:57:15 +0100
Subject: [PATCH] UI for managing roles in the CMS Admin UI

Former-commit-id: 84d3752b1f87758fda3226351ad5f4e0ce012019
---
 .../contentsection/configuration/role.xhtml   | 68 ++++++++++++++++++-
 .../contentsection/configuration/roles.xhtml  | 23 ++++++-
 .../org/librecms/CmsAdminMessages.properties  | 16 ++++-
 .../librecms/CmsAdminMessages_de.properties   | 16 ++++-
 4 files changed, 117 insertions(+), 6 deletions(-)

diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/configuration/role.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/configuration/role.xhtml
index 365450702..a782e3fb4 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/configuration/role.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/configuration/role.xhtml
@@ -36,7 +36,14 @@
                 <dl>
                     <div>
                         <dt>#{CmsAdminMessages['contentsection.configuration.roles.role_details.name']}</dt>
-                        <dd>#{SelectedRoleModel.name}</dd>
+                        <dd>
+                            #{SelectedRoleModel.name}
+                            <button class="btn btn-info btn-sm"
+                                    type="button">
+                                <bootstrap:svgIcon icon="pen" />
+                                <span class="sr-only">#{CmsAdminMessages['contentsection.configuration.roles.role_details.name.edit']}</span>
+                            </button>
+                        </dd>
                     </div>
                 </dl>
                 <libreccm:localizedStringEditor
@@ -50,6 +57,65 @@
                     unusedLocales="#{SelectedRoleModel.unusedDescriptionLocales}"
                     values="#{SelectedRoleModel.description}"
                     />
+
+                <h2>#{CmsAdminMessages['contentsection.configuration.roles.role_details.permissions']}</h2>
+                <div class="mb-2">
+                    <div class="text-right">
+                        <button class="btn btn-primary"
+                                data-toggle="modal"
+                                data-target="#modify-permissions-dialog"
+                                type="button">
+                            <bootstrap:svgIcon icon="plus-circle" />
+                            <span>#{CmsAdminMessages['contentsection.configuration.role_details.permissions.modify']}</span>
+                        </button>
+                    </div>
+                </div>
+                <ul>
+                    <c:forEach items="#{SelectedRoleModel.permissions}"
+                               var="permission">
+                        <li>
+                            #{permission}
+                        </li>
+                    </c:forEach>
+                </ul>
+                
+                <h2>#{CmsAdminMessages['contentsection.configuration.roles.role_details.members']}</h2>
+                <div class="mb-2">
+                    <div class="text-right">
+                        <button class="btn btn-primary"
+                                data-toggle="modal"
+                                data-target="#add-member-dialog"
+                                type="button">
+                            <bootstrap:svgIcon icon="plus-circle" />
+                            <span>#{CmsAdminMessages['contentsection.configuration.role_details.members.add']}</span>
+                        </button>
+                    </div>
+                </div>
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>#{CmsAdminMessages['contentsection.configuration.role_details.members.cols.name']}</th>
+                            <th>#{CmsAdminMessages['contentsection.configuration.role_details.members.cols.actions']}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach items="#{SelectedRoleModel.members}"
+                                   var="member">
+                            <tr>
+                                <td>#{member.memberName}</td>
+                                <td>
+                                    <libreccm:deleteDialog actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/configuration/roles/#{SelectedRoleModel.name}/members/#{member.memberUuid}"
+                                                           buttonText="#{CmsAdminMessages['contentsection.configuration.role_details.members.actions.remove']}"
+                                                           cancelLabel="#{CmsAdminMessages['contentsection.configuration.role_details.members.actions.remove.cancel']}"
+                                                           confirmLabel="#{CmsAdminMessages['contentsection.configuration.role_details.members.actions.remove.confirm']}"
+                                                           dialogId="remove-member-dialog"
+                                                           dialogTitle="#{CmsAdminMessages['contentsection.configuration.role_details.members.actions.remove.title']}"
+                                                           message="#{CmsAdminMessages.getMessage('contentsection.configuration.role_details.members.actions.remove.message', [member.memberName, SelectedRoleModel.name])}" />
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </table>
             </div>
         </ui:define>
     </ui:composition>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/configuration/roles.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/configuration/roles.xhtml
index 793b71ded..c0b0f2480 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/configuration/roles.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/configuration/roles.xhtml
@@ -38,8 +38,16 @@
                             <bootstrap:svgIcon icon="plus-circle" />
                             <span>#{CmsAdminMessages['contentsection.configuration.roles.add']}</span>
                         </button>
+                        <button class="btn btn-primary"
+                                data-toggle="modal"
+                                data-target="#create-role-dialog"
+                                type="button">
+                            <bootstrap:svgIcon icon="plus-circle" />
+                            <span>#{CmsAdminMessages['contentsection.configuration.roles.create']}</span>
+                        </button>
                     </div>
-                    <!-- Dialog for adding role -->
+                    <!-- Dialog for adding existing role -->
+                    <!-- Dialog for creating role -->
                 </div>
                 <table class="contentsection-roles-table table table-hover">
                     <thead>
@@ -50,7 +58,7 @@
                             <th scope="col">
                                 #{CmsAdminMessages['contentsection.configuration.roles.table.description']}
                             </th>
-                            <th class="text-center" colspan="2">
+                            <th class="text-center" colspan="3">
                                 #{CmsAdminMessages['contentsection.configuration.roles.table.actions']}
                             </th>
                         </tr>
@@ -71,7 +79,16 @@
                                     </a>
                                 </td>
                                 <td class="actions-delete-col">
-                                    <button class="btn btn-info"
+                                    <button class="btn btn-warning"
+                                            type="button">
+                                        <bootstrap:svgIcon icon="x-circle" />
+                                        <span>
+                                            #{CmsAdminMessages['contentsection.configuration.roles.table.actions.remove']}
+                                        </span>
+                                    </button>
+                                </td>
+                                <td class="actions-delete-col">
+                                    <button class="btn btn-danger"
                                             type="button">
                                         <bootstrap:svgIcon icon="x-circle" />
                                         <span>
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
index 8c3a4e97c..f30238232 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
@@ -293,4 +293,18 @@ contentsection.configuration.roles.role_details.title=Details Role {0}
 contentsection.configuration.roles.role_details.name=Name
 contentsection.configuration.roles.role_details.description.title=Description
 contentsection.configuration.roles.breadcrumbs=Role
-contentsection.configuration.roles.add=Add role
+contentsection.configuration.roles.add=Add existing role
+contentsection.configuration.roles.create=Create new role
+contentsection.configuration.roles.role_details.permissions=Permissions of the role for the content section
+contentsection.configuration.role_details.permissions.modify=Configure permissions
+contentsection.configuration.roles.role_details.members=Members
+contentsection.configuration.role_details.members.add=Add member
+contentsection.configuration.role_details.members.actions.remove=Remove
+contentsection.configuration.role_details.members.actions.remove.cancel=Cancel
+contentsection.configuration.role_details.members.actions.remove.confirm=Remove member from role
+contentsection.configuration.role_details.members.actions.remove.title=Are you sure to remove this member?
+contentsection.configuration.role_details.members.actions.remove.message=Are you sure to remove the member {0} from role {1}?
+contentsection.configuration.role_details.members.cols.name=Member Name
+contentsection.configuration.role_details.members.cols.actions=Actions
+contentsection.configuration.roles.table.actions.remove=Remove
+contentsection.configuration.roles.role_details.name.edit=Edit
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
index 780387bbe..c601845a4 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
@@ -294,4 +294,18 @@ contentsection.configuration.roles.role_details.title=Details Rolle {0}
 contentsection.configuration.roles.role_details.name=Name
 contentsection.configuration.roles.role_details.description.title=Beschreibung
 contentsection.configuration.roles.breadcrumbs=Rolle
-contentsection.configuration.roles.add=Rolle hinzuf\u00fcgen
+contentsection.configuration.roles.add=Vorhandene Rolle hinzuf\u00fcgen
+contentsection.configuration.roles.create=Neue Rolle anlegen
+contentsection.configuration.roles.role_details.permissions=Berechtigungen der Rolle f\u00fcr die Content Section
+contentsection.configuration.role_details.permissions.modify=Berechtigungen verwalten
+contentsection.configuration.roles.role_details.members=Mitglieder
+contentsection.configuration.role_details.members.add=Mitglied hinzuf\u00fcgen
+contentsection.configuration.role_details.members.actions.remove=Entfernen
+contentsection.configuration.role_details.members.actions.remove.cancel=Abbrechen
+contentsection.configuration.role_details.members.actions.remove.confirm=Mitglied aus Rolle entfernen
+contentsection.configuration.role_details.members.actions.remove.title=Sind Sie sicher, dass Sie das Mitglied entfernen wollen?
+contentsection.configuration.role_details.members.actions.remove.message=Sind Sie sicher, dass sie das Mitglied {0} aus der Rolle {1} entfernen wollen?
+contentsection.configuration.role_details.members.cols.name=Name des Mitglieds
+contentsection.configuration.role_details.members.cols.actions=Aktionen
+contentsection.configuration.roles.table.actions.remove=Entfernen
+contentsection.configuration.roles.role_details.name.edit=Bearbeiten