Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions languages/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
<string name="SYS_CAPTION_SIZE_DESC">The size of the caption is proportional to the image size, calculated by the formula \"Image size / Devisor\". By increasing the devisor, the font size will be reduced. (Default: 40)</string>
<string name="SYS_CARBON_COPY">Carbon copy (CC)</string>
<string name="SYS_CAT_SELECTION">Category selection</string>
<string name="SYS_CAT_SELECTION_CONF_DESC">The category selection can be used to restrict a configuration to the members of roles of the selected categories.\n\n If no restriction is to be made, both fields (role selection and category selection) must be left blank.</string>
<string name="SYS_CAT_SELECTION_CONF_DESC">The category selection can be used to restrict a configuration to the members of roles of the selected categories. If no restriction is desired, both fields (role selection and category selection) must be left blank.</string>
<string name="SYS_CATEGORIES">Categories</string>
<string name="SYS_CATEGORIES_ADMINISTRATORS_DESC">Members of this role are administrators of the module and have access to everything. You can create, edit, delete data and edit categories and their rights. A role can be made an administrator by assigning it the right #VAR1_BOLD#.</string>
<string name="SYS_CATEGORIES_ALL_MODULE_ADMINISTRATORS_MOTHER_ORGA">All administrators of the module of the parent organization</string>
Expand Down Expand Up @@ -346,7 +346,7 @@
<string name="SYS_COLUMN">Column</string>
<string name="SYS_COLUMN_POS">Column #VAR1#</string>
<string name="SYS_COLUMN_SELECTION">Column selection</string>
<string name="SYS_COLUMN_SELECTION_DESC">Selects the columns to be displayed in the list.\n\n Inactive roles are marked with (*).</string>
<string name="SYS_COLUMN_SELECTION_DESC">Selects the columns to be displayed in the list. Inactive roles are marked with (*).</string>
<string name="SYS_COMMA">Comma (,)</string>
<string name="SYS_COMMA_SEPARATED_FILE">Comma-separated file (*.csv)</string>
<string name="SYS_COMMENT">Comment</string>
Expand Down Expand Up @@ -1328,7 +1328,7 @@
<string name="SYS_ROLE_RIGHTS">Role Rights</string>
<string name="SYS_ROLE_SELECT_RIGHT">You do not have permission to select role #VAR1#.\nPlease try to select another role.</string>
<string name="SYS_ROLE_SELECTION">Role selection</string>
<string name="SYS_ROLE_SELECTION_CONF_DESC">The role selection can be restricted a configuration to the members of the selected roles.\n\n If no restriction is to be made, both fields (role selection and category selection) must be left blank.</string>
<string name="SYS_ROLE_SELECTION_CONF_DESC">The role selection can be used to restrict a configuration to the members of the selected roles. If no restriction is desired, both fields (role selection and category selection) must be left blank.</string>
<string name="SYS_ROLE_TYPES">Role types</string>
<string name="SYS_ROLE_WITHOUT_LEADER">Role without leader</string>
<string name="SYS_ROLES">Roles</string>
Expand Down
6 changes: 5 additions & 1 deletion modules/category-report/preferences.php
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ function updateNumbering() {

$currentNumberConf = 0;
$categoryReports = array();
$key_to_open = ($getAdd) ? array_key_last($config) : array_key_first($config);



foreach ($config as $key => $value) {
$categoryReport = array(
Expand All @@ -191,7 +194,8 @@ function updateNumbering() {
'selection_cat' => 'selection_cat' . $key,
'number_col' => 'number_col' . $key,
'id' => 'id' . $key,
'default_conf' => 'default_conf' . $key
'default_conf' => 'default_conf' . $key,
'open' => ($key == $key_to_open),
);
$formConfigurations->addInput('name' . $key, $gL10n->get('SYS_DESIGNATION'), $value['name'],
array('property' => FormPresenter::FIELD_REQUIRED));
Expand Down
13 changes: 11 additions & 2 deletions themes/simple/templates/modules/category-report.config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@

{foreach $categoryReports as $categoryReport}
<div class="card admidio-field-group">
<div class="card-header">{$l10n->get('SYS_CONFIGURATION')}</div>
<div class="card-body">
<div class="card-header"><a id="{$categoryReport.key}_caret" class=" admidio-open-close-caret" data-target="{$categoryReport.key}_contents">
<i class="bi bi-caret-{if $categoryReport.open}down{else}right{/if}-fill" style="margin-right: 0"></i>

{$l10n->get('SYS_CONFIGURATION')} - {$elements[$categoryReport.name].value}</a></div>
<div class="card-body" id="{$categoryReport.key}_contents" {if $categoryReport.open}{else} style="display: none;"{/if}>
{include 'sys-template-parts/form.input.tpl' data=$elements[$categoryReport.name]}
<div class="admidio-form-group admidio-form-custom-content row mb-3">
<label class="col-sm-3 col-form-label">
Expand Down Expand Up @@ -69,3 +72,9 @@
<div class="form-alert" style="display: none;">&nbsp;</div>
{include 'sys-template-parts/form.button.tpl' data=$elements['adm_button_save_configurations']}
</form>

<script>
$(".admidio-open-close-caret").click(function() {
showHideBlock($(this));
});
</script>