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

Fixed links in /@admin/configuration

Jens Pelzetter 2021-01-14 19:20:27 +01:00
parent 3fc39d71a8
commit fe52bfb1b8
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm" xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
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">

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

@ -21,7 +21,7 @@
<c:forEach items="#{configurationClasses}" <c:forEach items="#{configurationClasses}"
var="confClass"> var="confClass">
<a class="list-group-item list-group-item-action" <a class="list-group-item list-group-item-action"
href="#{mvc.uri('SettingsController#showSettings', { 'configurationClass': confClass.name })}"> href="#{mvc.basePath}/configuration/#{confClass.name}">
<h2 class="h3 mb-1"> <h2 class="h3 mb-1">
#{confClass.title} #{confClass.title}
</h2> </h2>

33
ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.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/ccm-admin.xhtml"> <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
<ui:param name="activePage" value="configuration" /> <ui:param name="activePage" value="configuration" />
@ -11,7 +10,8 @@
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="#{mvc.uri('ConfigurationController#getSettings')}">
<a href="#{mvc.basePath}/configuration">
#{AdminMessages['configuration.label']} #{AdminMessages['configuration.label']}
</a> </a>
</li> </li>
@ -70,12 +70,7 @@
data-target="#setting-info-#{setting.name}" data-target="#setting-info-#{setting.name}"
title="#{AdminMessages.getMessage('configuration.settings.table.actions.info.help', [setting.label])}" title="#{AdminMessages.getMessage('configuration.settings.table.actions.info.help', [setting.label])}"
type="button"> type="button">
<svg class="bi" <bootstrap:svgIcon icon="info-circle" />
width="1em"
height="1em"
fill="currentColor">
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle" />
</svg>
#{AdminMessages['configuration.settings.table.actions.info']} #{AdminMessages['configuration.settings.table.actions.info']}
</button> </button>
<div aria-hidden="true" <div aria-hidden="true"
@ -117,12 +112,7 @@
data-toggle="modal" data-toggle="modal"
data-target="#setting-#{setting.name}-edit-dialog" data-target="#setting-#{setting.name}-edit-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>
#{AdminMessages['configuration.settings.table.actions.edit']} #{AdminMessages['configuration.settings.table.actions.edit']}
</button> </button>
<div aria-hidden="true" <div aria-hidden="true"
@ -132,7 +122,7 @@
id="setting-#{setting.name}-edit-dialog" id="setting-#{setting.name}-edit-dialog"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('SettingsController#updateSettingValue', {'configurationClass': configurationClass, 'settingName': setting.name})}" <form action="#{mvc.basePath}/configuration/#{configurationClass}/#{settingName}"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">
@ -340,12 +330,7 @@
data-target="#setting-#{setting.name}-reset-dialog" data-target="#setting-#{setting.name}-reset-dialog"
title="#{AdminMessages.getMessage('configuration.settings.table.actions.reset.help', [setting.label, setting.defaultValue])}" title="#{AdminMessages.getMessage('configuration.settings.table.actions.reset.help', [setting.label, setting.defaultValue])}"
type="button"> type="button">
<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>
#{AdminMessages['configuration.settings.table.actions.reset']} #{AdminMessages['configuration.settings.table.actions.reset']}
</button> </button>
<div aria-hidden="true" <div aria-hidden="true"
@ -355,7 +340,7 @@
id="setting-#{setting.name}-reset-dialog" id="setting-#{setting.name}-reset-dialog"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.uri('SettingsController#resetSettingValue', {'configurationClass': configurationClass, 'settingName': setting.name })}" <form action="#{mvc.basePath}/configuration/#{configurationClass}/#{setting.name}/reset"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">