LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Fixed links for users-groups-roles 

Former-commit-id: 3fc39d71a8
pull/10/head
Jens Pelzetter 2021-01-14 18:50:39 +01:00
parent 86b924b5bc
commit f8838f37b4
23 changed files with 138 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml
View File

@ -25,7 +25,7 @@
<h1>#{ContentSectionAdminMessages['application_title']}</h1> <h1>#{ContentSectionAdminMessages['application_title']}</h1>
<div class="mb-2"> <div class="mb-2">
<bootstrap:modalForm actionTarget="#{mvc.uri('ContentSectionApplicationController#addContentSection')}" <bootstrap:modalForm actionTarget="#{mvc.basePath}/applications/content-sections/add"
buttonIcon="plus-circle" buttonIcon="plus-circle"
buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.add']}" buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.add']}"
buttonTextClass="text-right" buttonTextClass="text-right"
@ -66,7 +66,7 @@
<tr> <tr>
<td>#{section.label}</td> <td>#{section.label}</td>
<td class="text-center"> <td class="text-center">
<bootstrap:modalForm actionTarget="#{mvc.uri('ContentSectionApplicationController#updateContentSection', { 'sectionId': section.sectionId })}" <bootstrap:modalForm actionTarget="#{mvc.basePath}/applications/content-sections/#{section.sectionId}/update"
buttonIcon="plus-circle" buttonIcon="plus-circle"
buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.edit']}" buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.edit']}"
buttonTextClass="text-right" buttonTextClass="text-right"
@ -96,7 +96,7 @@
</bootstrap:modalForm> </bootstrap:modalForm>
</td> </td>
<td class="text-center"> <td class="text-center">
<libreccm:deleteDialog actionTarget="#{mvc.uri('ContentSectionApplicationController#deleteContentSection', { 'sectionId': section.sectionId })}" <libreccm:deleteDialog actionTarget="#{mvc.basePath}/applications/content-sections/#{section.sectionId}/delete"
buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.button_text']}" buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.button_text']}"
cancelLabel="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.cancel']}" cancelLabel="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.cancel']}"
confirmLabel="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.confirm']}" confirmLabel="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.confirm']}"

16
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
View File

@ -49,14 +49,14 @@
<dt>#{AdminMessages['categories.details.path']}</dt> <dt>#{AdminMessages['categories.details.path']}</dt>
<dd> <dd>
<c:if test="#{CategoryDetailsModel.categoryPath.domain != null}"> <c:if test="#{CategoryDetailsModel.categoryPath.domain != null}">
<a href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', {'categorySystemIdentifier': CategoryDetailsModel.categoryPath.domain.identifier})}"> <a href="#{mvc.basePath}/categorymanager/categorysystems/#{CategoryDetailsModel.categoryPath.domain.identifier}/details">
#{CategoryDetailsModel.categoryPath.domain.domainKey} #{CategoryDetailsModel.categoryPath.domain.domainKey}
</a> </a>
</c:if> </c:if>
<c:forEach items="#{CategoryDetailsModel.categoryPath.categories}" <c:forEach items="#{CategoryDetailsModel.categoryPath.categories}"
var="category" > var="category" >
<span>/</span> <span>/</span>
<a href="#{mvc.uri('CategoriesController#getCategory', {'categoryIdentifier': category.identifier})}"> <a href="#{mvc.basePath}/categorymanager/categories/#{category.identifier}">
#{category.name} #{category.name}
</a> </a>
</c:forEach> </c:forEach>
@ -105,7 +105,7 @@
<div class="mb-4"> <div class="mb-4">
<a class="btn btn-primary" <a class="btn btn-primary"
href="#{mvc.uri('CategoriesController#editCategory', {'categoryIdentifier': CategoryDetailsModel.identifier } )}"> href="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}/edit">
<bootstrap:svgIcon icon="pen" /> <bootstrap:svgIcon icon="pen" />
<span>#{AdminMessages['categories.details.edit']}</span> <span>#{AdminMessages['categories.details.edit']}</span>
</a> </a>
@ -182,7 +182,7 @@
<div class="mb-2"> <div class="mb-2">
<div class="text-right"> <div class="text-right">
<a class="btn btn-secondary" <a class="btn btn-secondary"
href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier})}"> href="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}/subcategories/new">
<bootstrap:svgIcon icon="plus-circle" /> <bootstrap:svgIcon icon="plus-circle" />
<span>#{AdminMessages['categories.details.subcategories.add']}</span> <span>#{AdminMessages['categories.details.subcategories.add']}</span>
</a> </a>
@ -218,7 +218,7 @@
var="category"> var="category">
<tr> <tr>
<td> <td>
<a href="#{mvc.uri('CategoriesController#getCategory', { 'categoryIdentifier': category.identifier})}"> <a href="#{mvc.basePath}/categorymanager/categories/#{category.identifier}">
#{category.name} #{category.name}
</a> </a>
</td> </td>
@ -254,7 +254,7 @@
</td> </td>
<td> <td>
<c:if test="#{category.categoryOrder != 1}"> <c:if test="#{category.categoryOrder != 1}">
<form action="#{mvc.uri('CategoriesController#reorderSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier, 'subCategoryIdentifier': category.identifier})}" <form action="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}/subcategories/#{category.identifier}/reorder"
method="post"> method="post">
<input name="direction" <input name="direction"
value="DECREASE" value="DECREASE"
@ -269,7 +269,7 @@
</td> </td>
<td> <td>
<c:if test="#{category.categoryOrder lt CategoryDetailsModel.subCategories.size()}"> <c:if test="#{category.categoryOrder lt CategoryDetailsModel.subCategories.size()}">
<form action="#{mvc.uri('CategoriesController#reorderSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier, 'subCategoryIdentifier': category.identifier})}" <form action="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}/subcategories/#{category.identifier}/reorder"
method="post"> method="post">
<input name="direction" <input name="direction"
value="INCREASE" value="INCREASE"
@ -284,7 +284,7 @@
</td> </td>
<td> <td>
<libreccm:deleteDialog <libreccm:deleteDialog
actionTarget="#{mvc.uri('CategoriesController#removeSubCategory', {'categoryIdentifier': category.identifier})}" actionTarget="#{mvc.basePath}/categorymanager/categories/#{category.identifier}/subcategories/remove"
buttonText="#{AdminMeesages['categories.details.subcategories.delete']}" buttonText="#{AdminMeesages['categories.details.subcategories.delete']}"
buttonTextClass="text-center" buttonTextClass="text-center"
cancelLabel="#{AdminMessages['categories.details.subcategories.delete.cancel']}" cancelLabel="#{AdminMessages['categories.details.subcategories.delete.cancel']}"

4
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
View File

@ -44,7 +44,7 @@
#{AdminMessages['categories.label']} #{AdminMessages['categories.label']}
</h1> </h1>
<form action="#{CategoryDetailsModel.new ? mvc.uri('CategoryFormController#createCategory', {'parentCategoryIdentifier': CategoryDetailsModel.parentCategory.identifier }) : mvc.uri('CategoryFormController#updateCategory', {'categoryIdentifier': CategoryDetailsModel.identifier })}" <form action="#{CategoryDetailsModel.new ? mvc.basePath += '/categorymanager/categories/' += CategoryDetailsModel.parentCategory.identifier += 'new' : mvc.basePath += '/catgorymanager/categories/' += CategoryDetailsModel.identifier += '/edit'}"
method="post"> method="post">
<bootstrap:formGroupText help="#{AdminMessages['categories.form.name.help']}" <bootstrap:formGroupText help="#{AdminMessages['categories.form.name.help']}"
inputId="name" inputId="name"
@ -72,7 +72,7 @@
name="abstractCategory" name="abstractCategory"
value="#{CategoryDetailsModel.new ? false : CategoryDetailsModel.abstractCategory}" /> value="#{CategoryDetailsModel.new ? false : CategoryDetailsModel.abstractCategory}" />
<a class="btn btn-warning" <a class="btn btn-warning"
href="#{mvc.uri('CategoriesController#getCategory', {'categoryIdentifier': CategoryDetailsModel.identifier })}"> href="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}">
#{AdminMessages['categories.form.buttons.cancel']} #{AdminMessages['categories.form.buttons.cancel']}
</a> </a>
<button class="btn btn-success" type="submit"> <button class="btn btn-success" type="submit">

8
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
View File

@ -260,7 +260,7 @@
id="categorysystem-owner-#{owner.uuid}-remove" id="categorysystem-owner-#{owner.uuid}-remove"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('CategorySystemsController#removeOwner', { 'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'applicationUuid': owner.uuid })}" <form action="#{mvc.basePath}/categorymanager/categorysystems/#{CategorySystemDetailsModel.identifier}/owners/#{owner.uuid}/remove"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">
@ -308,7 +308,7 @@
<div class="mb-2"> <div class="mb-2">
<div class="text-right"> <div class="text-right">
<a class="btn btn-secondary" <a class="btn btn-secondary"
href="#{mvc.basePath}/categorymanager/categories/#{CategorySystemsIdentifier.rootIdentifier}/subcategories/new"> href="#{mvc.basePath}/categorymanager/categories/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/new">
<bootstrap:svgIcon icon="plus-circle" /> <bootstrap:svgIcon icon="plus-circle" />
<span>#{AdminMessages['categorysystems.details.categories.add']}</span> <span>#{AdminMessages['categorysystems.details.categories.add']}</span>
</a> </a>
@ -382,7 +382,7 @@
</td> </td>
<td> <td>
<c:if test="#{category.categoryOrder != 0}"> <c:if test="#{category.categoryOrder != 0}">
<form action="#{mvc.basePath}/categorymanager/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/#{category.identifier}/reorder" <form action="#{mvc.basePath}/categorymanager/categories/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/#{category.identifier}/reorder"
method="post"> method="post">
<input name="direction" <input name="direction"
type="hidden" type="hidden"
@ -397,7 +397,7 @@
</td> </td>
<td> <td>
<c:if test="#{category.categoryOrder lt CategorySystemDetailsModel.categories.size()}"> <c:if test="#{category.categoryOrder lt CategorySystemDetailsModel.categories.size()}">
<form action="#{mvc.basePath}/categorymanager/categories/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/#{category.identifier/reorder}" <form action="#{mvc.basePath}/categorymanager/categories/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/#{category.identifier}/reorder"
method="post"> method="post">
<input name="direction" <input name="direction"
value="INCREASE" value="INCREASE"

6
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
View File

@ -13,7 +13,7 @@
#{AdminMessages['categorymanager.label']} #{AdminMessages['categorymanager.label']}
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('CategorySystemsController#getCategorySystems')}"> <a href="#{mvc.basePath}/categorymanager/categorysystems">
#{AdminMessages['categorysystems.label']} #{AdminMessages['categorysystems.label']}
</a> </a>
</li> </li>
@ -41,7 +41,7 @@
</div> </div>
</c:forEach> </c:forEach>
<form action="#{CategorySystemDetailsModel.new ? mvc.uri('CategorySystemFormController#createCategorySystem') : mvc.uri('CategorySystemFormController#updateCategorySystem', {'categorySystemIdentifier': CategorySystemDetailsModel.domainKey })}" <form action="#{CategorySystemDetailsModel.new ? mvc.basePath += '/categorymanager/categorysystems/new': mvc.basePath += '/categorymanager/categorysystems/' += CategorySystemDetailsModel.domainKey += '/edit'}"
method="post"> method="post">
<div class="form-group"> <div class="form-group">
<label for="domainKey"> <label for="domainKey">
@ -104,7 +104,7 @@
</small> </small>
</div> </div>
<a class="btn btn-warning" <a class="btn btn-warning"
href="#{mvc.uri('CategorySystemsController#getCategorySystems')}"> href="#{mvc.basePath}/categorymanager/categorysystems/">
#{AdminMessages['categorysystems.form.buttons.cancel']} #{AdminMessages['categorysystems.form.buttons.cancel']}
</a> </a>
<button class="btn btn-success" type="submit"> <button class="btn btn-success" type="submit">

6
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
View File

@ -27,7 +27,7 @@
<div class="text-right mb-2"> <div class="text-right mb-2">
<a class="btn btn-secondary" <a class="btn btn-secondary"
href="#{mvc.uri('CategorySystemsController#newCategorySystem')}"> href="#{mvc.basePath}/categorymanager/categorysystems/new">
<bootstrap:svgIcon icon="plus-circle" /> <bootstrap:svgIcon icon="plus-circle" />
<span>#{AdminMessages['categorysystems.add']}</span> <span>#{AdminMessages['categorysystems.add']}</span>
</a> </a>
@ -54,7 +54,7 @@
<td>#{categorySystem.released}</td> <td>#{categorySystem.released}</td>
<td> <td>
<a class="btn btn-info" <a class="btn btn-info"
href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', { 'categorySystemIdentifier': categorySystem.identifier })}"> href="#{mvc.basePath}/categorymanager/categorysystems/#{categorySystem.identifier}/details">
<bootstrap:svgIcon icon="pen"/> <bootstrap:svgIcon icon="pen"/>
#{AdminMessages['categorysystems.table.actions.edit']} #{AdminMessages['categorysystems.table.actions.edit']}
</a> </a>
@ -71,7 +71,7 @@
id="confirm-delete-#{categorySystem.identifier}" id="confirm-delete-#{categorySystem.identifier}"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('CategorySystemsController#deleteCategorySystem', {'categorySystemIdentifier': categorySystem.identifier })}" <form action="#{mvc.basePath}/categorymanager/categorysystems/#{categorySystem.identifier}/delete"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">

12
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
View File

@ -1,9 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:xlink="http://www.w3.org/1999/xlink"
> >
<head> <head>
<title>#{title} - LibreCCM Admin</title> <title>#{title} - LibreCCM Admin</title>
@ -31,12 +30,7 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link #{activePage == page.pageUri?'active':''}" <a class="nav-link #{activePage == page.pageUri?'active':''}"
href="#{mvc.basePath}#{page.pageUri}"> href="#{mvc.basePath}#{page.pageUri}">
<svg class="bi" <bootstrap:svgIcon icon="${page.icon}"/>
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg##{page.icon}" />
</svg>
<span>#{page.label}</span> <span>#{page.label}</span>
</a> </a>
</li> </li>
@ -47,7 +41,7 @@
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('DashboardController#getDashboard')}"> <a href="#{mvc.basePath}/">
#{AdminMessages['breadcrumbs.start']} #{AdminMessages['breadcrumbs.start']}
</a> </a>
</li> </li>

1
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
View File

@ -2,7 +2,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap" xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:xlink="http://www.w3.org/1999/xlink"> xmlns:xlink="http://www.w3.org/1999/xlink">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">

19
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
View File

@ -1,38 +1,27 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
<!-- <ui:param name="activePage" value="usersgroupsroles" />
<ui:param name="title" value="#{AdminMessages['usersgroupsroles.label']}" />
<ui:define name="breadcrumb">
<li class="breadcrumb-item active">
#{AdminMessages['usersgroupsroles.label']}
</li>
</ui:define>-->
<ui:define name="main"> <ui:define name="main">
<div class="container-fluid mx-1"> <div class="container-fluid mx-1">
<div class="row"> <div class="row">
<nav class="col-md-2 list-group"> <nav class="col-md-2 list-group">
<a class="list-group-item list-group-item-action #{activePanel == 'overview' ? 'active' : ''}" <a class="list-group-item list-group-item-action #{activePanel == 'overview' ? 'active' : ''}"
href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.overview.label']} #{AdminMessages['usersgroupsroles.overview.label']}
</a> </a>
<a class="list-group-item list-group-item-action #{activePanel == 'users' ? 'active' : ''}" <a class="list-group-item list-group-item-action #{activePanel == 'users' ? 'active' : ''}"
href="#{mvc.uri('UsersController#getUsers')}"> href="#{mvc.basePath}/users-groups-roles/users">
#{AdminMessages['usersgroupsroles.users.label']} #{AdminMessages['usersgroupsroles.users.label']}
</a> </a>
<a class="list-group-item list-group-item-action #{activePanel == 'groups' ? 'active' : ''}" <a class="list-group-item list-group-item-action #{activePanel == 'groups' ? 'active' : ''}"
href="#{mvc.uri('GroupsController#getGroups')}"> href="#{mvc.basePath}/users-groups-roles/groups">
#{AdminMessages['usersgroupsroles.groups.label']} #{AdminMessages['usersgroupsroles.groups.label']}
</a> </a>
<a class="list-group-item list-group-item-action #{activePanel == 'roles' ? 'active' : ''}" <a class="list-group-item list-group-item-action #{activePanel == 'roles' ? 'active' : ''}"
href="#{mvc.uri('RolesController#getRoles')}"> href="#{mvc.basePath}/users-groups-roles/roles">
#{AdminMessages['usersgroupsroles.roles.label']} #{AdminMessages['usersgroupsroles.roles.label']}
</a> </a>
</nav> </nav>

8
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
View File

@ -11,17 +11,17 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersController#getUsers')}"> <a href="#{mvc.basePath}/users-groups-roles/users">
#{AdminMessages['usersgroupsroles.users.label']} #{AdminMessages['usersgroupsroles.users.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvn.uri('UsersController#getUserDetails', { 'userIdentfier': user.name })}"> <a href="#{mvc.basePath}/users-groups-roles/users/#{user.name}">
#{UserDetailsModel.name} #{UserDetailsModel.name}
</a> </a>
</li> </li>
@ -41,7 +41,7 @@
#{AdminMessages[message]} #{AdminMessages[message]}
</div> </div>
</c:forEach> </c:forEach>
<form action="#{EmailFormModel.new ? mvc.uri('EmailFormController#saveEmailAddress', {'userIdentifier': EmailFormModel.userIdentifier, 'emailIdentifier': 'new' }) : mvc.uri('EmailFormController#saveEmailAddress', { 'userIdentifier': EmailFormController.userIdentifier, 'emailIdentifier': EmailFormModel.emailId })}" <form action="#{EmailFormModel.new ? mvc.basePath += '/users-groups-roles/users/' += EmailFormModel.userIdentifier += '/email-addresses/new/save' : mvc.basePath += '/users-groups-roles/users/' += EmailFormModel.userIdentifier += '/email-addresses/' += EmailFormModel.emailId += '/save'}"
method="post"> method="post">
<div class="form-group"> <div class="form-group">
<label for="address"> <label for="address">

5
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
View File

@ -1,7 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
@ -11,12 +10,12 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersController#getUsers')}"> <a href="#{mvc.basePath}/users-groups-roles/users">
#{AdminMessages['usersgroupsroles.users.label']} #{AdminMessages['usersgroupsroles.users.label']}
</a> </a>
</li> </li>

39
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
View File

@ -1,9 +1,9 @@
<!DOCTYPE html [<!ENTITY times '&#215;'>]> <!DOCTYPE html [<!ENTITY times '&#215;'>]>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
xmlns:xlink="http://www.w3.org/1999/xlink">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
<ui:param name="activePanel" value="groups" /> <ui:param name="activePanel" value="groups" />
@ -12,12 +12,12 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('GroupsController#getGroups')}"> <a href="#{mvc.basePath}/users-groups-roles/groups">
#{AdminMessages['usersgroupsroles.groups.label']} #{AdminMessages['usersgroupsroles.groups.label']}
</a> </a>
</li> </li>
@ -42,13 +42,8 @@
</div> </div>
</dl> </dl>
<a class="btn btn-primary" <a class="btn btn-primary"
href="#{mvc.uri('GroupsController#editGroup', {'groupIdentifier': GroupDetailsModel.groupName })}"> href="#{mvc.basePath}/users-groups-roles/groups/#{GroupDetailsModel.groupName}/edit">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.groups.group_details.edit_group']} #{AdminMessages['usersgroupsroles.groups.group_details.edit_group']}
</span> </span>
@ -62,12 +57,7 @@
data-toggle="modal" data-toggle="modal"
data-target="#group-members-dialog" data-target="#group-members-dialog"
type="button"> type="button">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span>#{AdminMessages['usersgroupsroles.groups.group_details.members.edit']}</span> <span>#{AdminMessages['usersgroupsroles.groups.group_details.members.edit']}</span>
</button> </button>
<div aria-labelledby="group-members-dialog-title" <div aria-labelledby="group-members-dialog-title"
@ -77,7 +67,7 @@
id="group-members-dialog" id="group-members-dialog"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('GroupMembersRolesController#updateGroupMemberships', {'groupIdentifier': GroupDetailsModel.groupName})}" <form action="#{mvc.basePath}/users-groups-roles/groups/#{GroupDetailsModel.groupName}/members"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">
@ -129,7 +119,7 @@
<c:forEach items="#{GroupDetailsModel.members}" <c:forEach items="#{GroupDetailsModel.members}"
var="member"> var="member">
<li class="list-group-item"> <li class="list-group-item">
<a href="#{mvc.uri('UsersController#getUserDetails', { 'userIdentifier': member.userName })}"> <a href="#{mvc.basePath}/users-groups-roles/users/#{member.userName}/details">
#{member.userName} #{member.userName}
</a> </a>
</li> </li>
@ -151,12 +141,7 @@
data-toggle="modal" data-toggle="modal"
data-target="#group-roles-dialog" data-target="#group-roles-dialog"
type="button"> type="button">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span>#{AdminMessages['usersgroupsroles.groups.group_details.roles.edit']}</span> <span>#{AdminMessages['usersgroupsroles.groups.group_details.roles.edit']}</span>
</button> </button>
<div aria-labelledby="group-roles-dialog-title" <div aria-labelledby="group-roles-dialog-title"
@ -166,7 +151,7 @@
id="group-roles-dialog" id="group-roles-dialog"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('GroupMembersRolesController#updateRoleMemberships', {'groupIdentifier': GroupDetailsModel.groupName })}" <form action="#{mvc.basePath}/users-groups-roles/groups/#{GroupDetailsModel.groupName}/members"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">
@ -218,7 +203,7 @@
<c:forEach items="#{GroupDetailsModel.roles}" <c:forEach items="#{GroupDetailsModel.roles}"
var="role"> var="role">
<li class="list-group-item"> <li class="list-group-item">
<a href="#{mvc.uri('RolesController#getRoleDetails', {'roleIdentifier': role.roleName})}"> <a href="#{mvc.basePath}/users-groups-roles/roles#{role.roleName}/details">
#{role.roleName} #{role.roleName}
</a> </a>
</li> </li>

11
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
View File

@ -1,7 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
@ -11,17 +10,17 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('GroupsController#getGroups')}"> <a href="#{mvc.basePath}/users-groups-roles/groups">
#{AdminMessages['usersgroupsroles.groups.label']} #{AdminMessages['usersgroupsroles.groups.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvn.uri('GroupsController#getGroupDetails', { 'groupIdentfier': GroupDetailsModel.groupName })}"> <a href="#{mvc.basePath}/users-groups-roles/groups/#{GroupDetailsModel.groupName}/details">
#{GroupDetailsModel.groupName} #{GroupDetailsModel.groupName}
</a> </a>
</li> </li>
@ -37,7 +36,7 @@
</div> </div>
</c:forEach> </c:forEach>
<form action="#{GroupDetailsModel.newGroup ? mvc.uri('GroupFormController#createGroup') : mvc.uri('GroupFormController#updateGroup', { 'groupIdentifier': GroupDetailsModel.groupName })}" <form action="#{GroupDetailsModel.newGroup ? mvc.basePath += '/users-groups-roles/groups/new' : mvc.basePath += '/users-groups-roles/groups/' += GroupDetailsModel.groupName += '/edit'}"
method="post"> method="post">
<div class="form-group"> <div class="form-group">
<label for="groupname"> <label for="groupname">
@ -57,7 +56,7 @@
</small> </small>
</div> </div>
<a class="btn btn-warning" <a class="btn btn-warning"
href="#{mvc.uri('GroupsController#getGroups')}"> href="#{mvc.basePath}/users-groups-roles/groups">
#{AdminMessages['usersgroupsroles.groups.form.buttons.cancel']} #{AdminMessages['usersgroupsroles.groups.form.buttons.cancel']}
</a> </a>
<button class="btn btn-success" type="submit"> <button class="btn btn-success" type="submit">

4
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
View File

@ -11,12 +11,12 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersController#getGroups')}"> <a href="#{mvc.basePath}/users-groups-roles/groups">
#{AdminMessages['usersgroupsroles.groups.label']} #{AdminMessages['usersgroupsroles.groups.label']}
</a> </a>
</li> </li>

33
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
View File

@ -1,9 +1,9 @@
<!DOCTYPE html [<!ENTITY times '&#215;'>]> <!DOCTYPE html [<!ENTITY times '&#215;'>]>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
xmlns:xlink="http://www.w3.org/1999/xlink">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
<ui:param name="activePanel" value="groups" /> <ui:param name="activePanel" value="groups" />
@ -12,7 +12,7 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
@ -28,13 +28,8 @@
</div> </div>
<div class="col-sm-3 text-right"> <div class="col-sm-3 text-right">
<a class="btn btn-secondary" <a class="btn btn-secondary"
href="#{mvc.uri('GroupsController#newGroup')}"> href="#{mvc.basePath}/users-groups-roles/groups/new">
<svg class="bi" <bootstrap:svgIcon icon="plus-circle" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
</svg>
<span>#{AdminMessages['usersgroupsroles.groups.add']}</span> <span>#{AdminMessages['usersgroupsroles.groups.add']}</span>
</a> </a>
</div> </div>
@ -52,13 +47,8 @@
<td>#{group.name}</td> <td>#{group.name}</td>
<td class="text-center action-col"> <td class="text-center action-col">
<a class="btn btn-info" <a class="btn btn-info"
href="#{mvc.uri('GroupsController#getGroupDetails', { 'groupIdentifier': group.name })}"> href="#{mvc.basePath}/users-groups-roles/groups/#{group.name}/details">
<svg class="bi" <bootstrap:svgIcon icon="eye" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.groups.detailslink.label']} #{AdminMessages['usersgroupsroles.groups.detailslink.label']}
</span> </span>
@ -68,12 +58,7 @@
<button class="btn btn-danger" <button class="btn btn-danger"
data-toggle="modal" data-toggle="modal"
data-target="#confirm-delete-#{group.name}"> data-target="#confirm-delete-#{group.name}">
<svg class="bi" <bootstrap:svgIcon icon="x-circle" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.groups.delete.button.label']} #{AdminMessages['usersgroupsroles.groups.delete.button.label']}
</span> </span>
@ -82,7 +67,7 @@
id="confirm-delete-#{group.name}" id="confirm-delete-#{group.name}"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('GroupsController#deleteGroup', {'groupIdentifier': group.name })}" <form action="#{mvc.basePath}/users-groups-roles/groups/#{group.name}/delete"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">

28
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml
View File

@ -1,24 +1,22 @@
<!DOCTYPE html [<!ENTITY times '&#215;'>]> <!DOCTYPE html [<!ENTITY times '&#215;'>]>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:xlink="http://www.w3.org/1999/xlink">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
<ui:param name="activePanel" value="roles" /> <ui:param name="activePanel" value="roles" />
<ui:param name="title" <ui:param name="title"
value="#{AdminMessages.getMessage('usersgroupsroles.roles.role_details.title', [RoleDetailsModel.roleName])}" /> value="#{AdminMessages.getMessage('usersgroupsroles.roles.role_details.title', [RoleDetailsModel.roleName])}" />
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles/">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('RolesController#getRoles')}"> <a href="#{mvc.basePath}/roles">
#{AdminMessages['usersgroupsroles.roles.label']} #{AdminMessages['usersgroupsroles.roles.label']}
</a> </a>
</li> </li>
@ -43,13 +41,8 @@
</div> </div>
</dl> </dl>
<a class="btn btn-primary" <a class="btn btn-primary"
href="#{mvc.uri('RolesController#editRole', {'roleIdentifier': RoleDetailsModel.roleName })}"> href="#{mvc.basePath}/users-groups-roles/roles/#{RoleDetailsModel.roleName}/edit">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.roles.role_details.edit_role']} #{AdminMessages['usersgroupsroles.roles.role_details.edit_role']}
</span> </span>
@ -63,12 +56,7 @@
data-toggle="modal" data-toggle="modal"
data-target="#role-members-dialog" data-target="#role-members-dialog"
type="button"> type="button">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span>#{AdminMessages['usersgroupsroles.roles.role_details.members.edit']}</span> <span>#{AdminMessages['usersgroupsroles.roles.role_details.members.edit']}</span>
</button> </button>
<div aria-labelledby="role-members-dialog-title" <div aria-labelledby="role-members-dialog-title"
@ -78,7 +66,7 @@
id="role-members-dialog" id="role-members-dialog"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('RoleMembersController#updateRoleMemberships', {'roleIdentifier': RoleDetailsModel.roleName } )}" <form action="#{mvc.basePath}/users-groups-roles/roles/#{RoleDetailsModel.roleName}/members"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">

10
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
View File

@ -11,17 +11,17 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('GroupsController#getGroups')}"> <a href="#{mvc.basePath}/users-groups-roles/roles">
#{AdminMessages['usersgroupsroles.roles.label']} #{AdminMessages['usersgroupsroles.roles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvn.uri('GroupsController#getGroupDetails', { 'roleIdentfier': RoleDetailsModel.roleName })}"> <a href="#{mvc.basePath}/users-groups-roles/roles/#{RoleDetailsModel.roleName}">
#{RoleDetailsModel.roleName} #{RoleDetailsModel.roleName}
</a> </a>
</li> </li>
@ -37,7 +37,7 @@
</div> </div>
</c:forEach> </c:forEach>
<form action="#{RoleDetailsModel.newRole ? mvc.uri('RoleFormController#createRole') : mvc.uri('RoleFormController#updateRole', {'roleIdentifier' : RoleDetailsModel.roleName })}" <form action="#{RoleDetailsModel.newRole ? mvc.basePath += '/users-groups-roles/roles/new' : mvc.basePath += '/users-groups-roles/roles/' += RoleDetailsModel.roleName += '/edit'}">
method="post"> method="post">
<div class="form-group"> <div class="form-group">
<label for="rolename"> <label for="rolename">
@ -57,7 +57,7 @@
</small> </small>
</div> </div>
<a class="btn btn-warning" <a class="btn btn-warning"
href="#{mvc.uri('RolesController#getRoles')}"> href="#{mvc.basePath}/users-groups-roles/roles">
#{AdminMessages['usersgroupsroles.roles.form.buttons.cancel']} #{AdminMessages['usersgroupsroles.roles.form.buttons.cancel']}
</a> </a>
<button class="btn btn-success" type="submit"> <button class="btn btn-success" type="submit">

4
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml
View File

@ -11,12 +11,12 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersController#getRoles')}"> <a href="#{mvc.basePath}/users-groups-roles/roles">
#{AdminMessages['usersgroupsroles.roles.label']} #{AdminMessages['usersgroupsroles.roles.label']}
</a> </a>
</li> </li>

34
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
View File

@ -1,9 +1,8 @@
<!DOCTYPE html [<!ENTITY times '&#215;'>]> <!DOCTYPE html [<!ENTITY times '&#215;'>]>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:xlink="http://www.w3.org/1999/xlink">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
<ui:param name="activePanel" value="roles" /> <ui:param name="activePanel" value="roles" />
@ -12,7 +11,7 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
@ -28,13 +27,8 @@
</div> </div>
<div class="col-sm-3 text-right"> <div class="col-sm-3 text-right">
<a class="btn btn-secondary" <a class="btn btn-secondary"
href="#{mvc.uri('RolesController#newRole')}"> href="#{mvc.basePath}/users-groups-roles/roles/new">
<svg class="bi" <bootstrap:svgIcon icon="plus-circle" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
</svg>
<span>#{AdminMessages['usersgroupsroles.roles.add']}</span> <span>#{AdminMessages['usersgroupsroles.roles.add']}</span>
</a> </a>
</div> </div>
@ -53,13 +47,8 @@
<td>#{role.name}</td> <td>#{role.name}</td>
<td class="text-center action-col"> <td class="text-center action-col">
<a class="btn btn-info" <a class="btn btn-info"
href="#{mvc.uri('RolesController#getRoleDetails', { 'roleIdentifier': role.name })}"> href="#{mvc.basePath}/users-groups-roles/roles/#{role.name}/details">
<svg class="bi" <bootstrap:svgIcon icon="eye" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.roles.detailslink.label']} #{AdminMessages['usersgroupsroles.roles.detailslink.label']}
</span> </span>
@ -70,12 +59,7 @@
data-toggle="modal" data-toggle="modal"
data-target="#confirm-delete-#{role.name}" data-target="#confirm-delete-#{role.name}"
href="#"> href="#">
<svg class="bi" <bootstrap:svgIcon icon="x-circle" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.roles.delete.button.label']} #{AdminMessages['usersgroupsroles.roles.delete.button.label']}
</span> </span>
@ -84,7 +68,7 @@
id="confirm-delete-#{role.name}" id="confirm-delete-#{role.name}"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('RolesController#deleteRole', { 'roleIdentifier': role.name })}" <form action="#{mvc.basePath}/users-groups-roles/roles/#{role.name}/delete"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">

65
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
View File

@ -1,9 +1,8 @@
<!DOCTYPE html [<!ENTITY times '&#215;'>]> <!DOCTYPE html [<!ENTITY times '&#215;'>]>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:xlink="http://www.w3.org/1999/xlink">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
<ui:param name="activePanel" value="users" /> <ui:param name="activePanel" value="users" />
@ -12,12 +11,12 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersController#getUsers')}"> <a href="#{mvc.basePath}/users-groups-roles/users">
#{AdminMessages['usersgroupsroles.users.label']} #{AdminMessages['usersgroupsroles.users.label']}
</a> </a>
</li> </li>
@ -119,13 +118,8 @@
</div> </div>
</dl> </dl>
<a class="btn btn-primary" <a class="btn btn-primary"
href="#{mvc.uri('UsersController#editUser', {'userIdentifier': UserDetailsModel.name })}"> href="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/edit">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.users.user_details.edit_user']} #{AdminMessages['usersgroupsroles.users.user_details.edit_user']}
</span> </span>
@ -137,13 +131,8 @@
</h2> </h2>
<div> <div>
<a class="btn btn-primary" <a class="btn btn-primary"
href="#{mvc.uri('UsersController#getNewEmailAddressForm', {'userIdentifier': UserDetailsModel.name })}"> href="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/email-addresses/new">
<svg class="bi" <bootstrap:svgIcon icon="plus-circle" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
</svg>
<span>#{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.add']}</span> <span>#{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.add']}</span>
</a> </a>
</div> </div>
@ -195,13 +184,8 @@
</td> </td>
<td> <td>
<a class="btn btn-info" <a class="btn btn-info"
href="#{mvc.uri('UsersController#getEditEmailAddressForm', { 'userIdentifier': UserDetailsModel.name, 'emailId': status.index })}"> href="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/email-addresses/#{status.index}">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.users.user_details.email_addresses.edit']} #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.edit']}
</span> </span>
@ -211,12 +195,7 @@
<button class="btn btn-danger" <button class="btn btn-danger"
data-toggle="modal" data-toggle="modal"
data-target="#confirm-remove-#{status.index}"> data-target="#confirm-remove-#{status.index}">
<svg class="bi" <bootstrap:svgIcon icon="x-circle" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.users.user_details.email_addresses.remove']} #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.remove']}
</span> </span>
@ -281,12 +260,7 @@
data-toggle="modal" data-toggle="modal"
data-target="#user-groups-dialog" data-target="#user-groups-dialog"
type="button"> type="button">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span>#{AdminMessages['usersgroupsroles.users.user_details.groups.edit']}</span> <span>#{AdminMessages['usersgroupsroles.users.user_details.groups.edit']}</span>
</button> </button>
<div aria-labelledby="user-groups-dialog-title" <div aria-labelledby="user-groups-dialog-title"
@ -296,7 +270,7 @@
id="user-groups-dialog" id="user-groups-dialog"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('UserGroupsRolesController#updateGroupMemberships', {'userIdentifier': UserDetailsModel.name})}" <form action="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/groups"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">
@ -348,7 +322,7 @@
<c:forEach items="#{UserDetailsModel.groupMemberships}" <c:forEach items="#{UserDetailsModel.groupMemberships}"
var="group"> var="group">
<li class="list-group-item"> <li class="list-group-item">
<a href="#{mvc.uri('GroupsController#getGroupDetails', {'groupIdentifier': group.groupName})}"> <a href="#{mvc.basePath}/users-groups-roles/groups/#{group.groupName}/details">
#{group.groupName} #{group.groupName}
</a> </a>
</li> </li>
@ -370,12 +344,7 @@
data-toggle="modal" data-toggle="modal"
data-target="#user-roles-dialog" data-target="#user-roles-dialog"
type="button"> type="button">
<svg class="bi" <bootstrap:svgIcon icon="pen" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
</svg>
<span>#{AdminMessages['usersgroupsroles.users.user_details.roles.edit']}</span> <span>#{AdminMessages['usersgroupsroles.users.user_details.roles.edit']}</span>
</button> </button>
<div aria-labelledby="user-roles-dialog-title" <div aria-labelledby="user-roles-dialog-title"
@ -385,7 +354,7 @@
id="user-roles-dialog" id="user-roles-dialog"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('UserGroupsRolesController#updateRoleMemberships', {'userIdentifier': UserDetailsModel.name })}" <form action="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/roles"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">
@ -436,7 +405,7 @@
<ul class="list-group mt-1 mb-4"> <ul class="list-group mt-1 mb-4">
<c:forEach items="#{UserDetailsModel.roles}" var="role"> <c:forEach items="#{UserDetailsModel.roles}" var="role">
<li class="list-group-item"> <li class="list-group-item">
<a href="#{mvc.uri('RolesController#getRoleDetails', {'roleIdentifier': role.roleName })}"> <a href="#{mvc.basePath}/users-groups-roles/roles/#{role.roleName}/details">
#{role.roleName} #{role.roleName}
</a> </a>
</li> </li>

11
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
View File

@ -1,7 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
@ -11,17 +10,17 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersController#getUsers')}"> <a href="#{mvc.basePath}/users-groups-roles/users">
#{AdminMessages['usersgroupsroles.users.label']} #{AdminMessages['usersgroupsroles.users.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvn.uri('UsersController#getUserDetails', { 'userIdentfier': user.name })}"> <a href="#{mvc.basePath}/users-groups-roles/users/#{user.name}/details">
#{UserDetailsModel.name} #{UserDetailsModel.name}
</a> </a>
</li> </li>
@ -37,7 +36,7 @@
#{error} #{error}
</div> </div>
</c:forEach> </c:forEach>
<form action="#{UserDetailsModel.newUser ? mvc.uri('UserFormController#createUser') : mvc.uri('UserFormController#updateUser', { 'userIdentifier': UserDetailsModel.name })}" <form action="#{UserDetailsModel.newUser ? mvc.basePath += '/users-groups-roles/users/new': mvc.basePath += '/users-groups-roles/users/' += UserDetailsModel.name += '/edit'}"
method="post"> method="post">
<div class="form-group"> <div class="form-group">
<label for="username"> <label for="username">
@ -176,7 +175,7 @@
</label> </label>
</div> </div>
<a class="btn btn-warning" <a class="btn btn-warning"
href="#{mvc.uri('UsersController#getUsers')}"> href="#{mvc.basePath}/users-groups-roles/users">
#{AdminMessages['usersgroupsroles.users.form.buttons.cancel']} #{AdminMessages['usersgroupsroles.users.form.buttons.cancel']}
</a> </a>
<button class="btn btn-success" type="submit"> <button class="btn btn-success" type="submit">

4
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
View File

@ -11,12 +11,12 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersController#getUsers')}"> <a href="#{mvc.basePath}/users-groups-roles/users">
#{AdminMessages['usersgroupsroles.users.label']} #{AdminMessages['usersgroupsroles.users.label']}
</a> </a>
</li> </li>

35
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
View File

@ -1,8 +1,8 @@
<!DOCTYPE html [<!ENTITY times '&#215;'>]> <!DOCTYPE html [<!ENTITY times '&#215;'>]>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
xmlns:xlink="http://www.w3.org/1999/xlink">
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
<ui:param name="activePage" value="usersgroupsroles" /> <ui:param name="activePage" value="usersgroupsroles" />
<ui:param name="activePanel" value="users" /> <ui:param name="activePanel" value="users" />
@ -11,7 +11,7 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}"> <a href="#{mvc.basePath}/users-groups-roles">
#{AdminMessages['usersgroupsroles.label']} #{AdminMessages['usersgroupsroles.label']}
</a> </a>
</li> </li>
@ -23,7 +23,7 @@
<ui:define name="panel"> <ui:define name="panel">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-sm-9"> <div class="col-sm-9">
<form action="#{mvc.uri('UsersController#getUsers')}" <form action="#{mvc.basePath}/users-groups-roles/users"
class="form-inline" class="form-inline"
method="get"> method="get">
<div class="form-group"> <div class="form-group">
@ -43,13 +43,8 @@
</div> </div>
<div class="col-sm-3 text-right"> <div class="col-sm-3 text-right">
<a class="btn btn-secondary" <a class="btn btn-secondary"
href="#{mvc.uri('UsersController#newUser')}"> href="#{mvc.basePath}/users-groups-roles/users/new">
<svg class="bi" <bootstrap:svgIcon icon="person-plus" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-plus" />
</svg>
<span>#{AdminMessages['usersgroupsroles.users.add']}</span> <span>#{AdminMessages['usersgroupsroles.users.add']}</span>
</a> </a>
</div> </div>
@ -80,13 +75,8 @@
</td> </td>
<td class="text-center action-col"> <td class="text-center action-col">
<a class="btn btn-info" <a class="btn btn-info"
href="#{mvc.uri('UsersController#getUserDetails', { 'userIdentifier': user.name })}"> href="#{mvc.basePath}/users-groups-roles/users/#{user.name}/details">
<svg class="bi" <bootstrap:svgIcon icon="eye" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.users.detailslink.label']} #{AdminMessages['usersgroupsroles.users.detailslink.label']}
</span> </span>
@ -97,12 +87,7 @@
<button class="btn btn-danger" <button class="btn btn-danger"
data-toggle="modal" data-toggle="modal"
data-target="#confirm-disable-#{user.name}"> data-target="#confirm-disable-#{user.name}">
<svg class="bi" <bootstrap:svgIcon icon="person-x" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-x" />
</svg>
<span> <span>
#{AdminMessages['usersgroupsroles.users.disablebutton.label']} #{AdminMessages['usersgroupsroles.users.disablebutton.label']}
</span> </span>
@ -111,7 +96,7 @@
id="confirm-disable-#{user.name}" id="confirm-disable-#{user.name}"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('UsersController#disableUser', { 'userIdentifier': user.name })}" <form action="#{mvc.basePath}/users-groups-roles/users/#{user.name}/disable"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">