maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

respect newsfeed-visibility-settings; fix typo for saving column-visibility in apikeys; added back-to-overview button in cronjobs-edit; strings fixes

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-17 08:52:58 +02:00
parent 71274f8f08
commit 2987ae5a05
5 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api_keys.php
View File

@@ -165,7 +165,7 @@ $collection = [
$tpl = 'user/table.html.twig'; $tpl = 'user/table.html.twig';
UI::view($tpl, [ UI::view($tpl, [
'listing' => Listing::formatFromArray($collection, $apikeys_list_data['apikeys_list'], 'apikyes_list'), 'listing' => Listing::formatFromArray($collection, $apikeys_list_data['apikeys_list'], 'apikeys_list'),
'actions_links' => (int)$userinfo['api_allowed'] == 1 ? [ 'actions_links' => (int)$userinfo['api_allowed'] == 1 ? [
[ [
'href' => $linker->getLink(['section' => 'index', 'page' => $page, 'action' => 'add']), 'href' => $linker->getLink(['section' => 'index', 'page' => $page, 'action' => 'add']),

1
lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php
View File

@@ -27,6 +27,7 @@ return [
'cronjobs_edit' => [ 'cronjobs_edit' => [
'title' => lng('admin.cronjob_edit'), 'title' => lng('admin.cronjob_edit'),
'image' => 'fa-solid fa-clock-rotate-left', 'image' => 'fa-solid fa-clock-rotate-left',
'self_overview' => ['section' => 'cronjobs', 'page' => 'overview'],
'sections' => [ 'sections' => [
'section_a' => [ 'section_a' => [
'title' => lng('cronjob.cronjobsettings'), 'title' => lng('cronjob.cronjobsettings'),

1
lng/de.lng.php
View File

@@ -2025,6 +2025,7 @@ Vielen Dank, Ihr Administrator',
], ],
'createstdsubdom_default' => [ 'createstdsubdom_default' => [
'title' => 'Standardwert für "Standardsubdomain anlegen" bei Erstellung eines Kunden', 'title' => 'Standardwert für "Standardsubdomain anlegen" bei Erstellung eines Kunden',
'description' => '',
], ],
'froxlorusergroup' => [ 'froxlorusergroup' => [
'title' => 'Benutzerdefinierte Gruppe für alle Kunden-Benutzer', 'title' => 'Benutzerdefinierte Gruppe für alle Kunden-Benutzer',

1
lng/en.lng.php
View File

@@ -2142,6 +2142,7 @@ Yours sincerely, your administrator',
], ],
'createstdsubdom_default' => [ 'createstdsubdom_default' => [
'title' => 'Preselected value for "Create standard subdomain" when creating a customer', 'title' => 'Preselected value for "Create standard subdomain" when creating a customer',
'description' => '',
], ],
'froxlorusergroup' => [ 'froxlorusergroup' => [
'title' => 'Custom system group for all customer users', 'title' => 'Custom system group for all customer users',

2
templates/Froxlor/user/index.html.twig
View File

@@ -279,6 +279,7 @@
</div> </div>
{% endif %} {% endif %}
{% if (get_setting('admin.show_news_feed') == 1 and userinfo.adminsession == 1) or (get_setting('customer.show_news_feed') == 1 and userinfo.adminsession == 0) %}
<div id="newsfeed" class="card"> <div id="newsfeed" class="card">
<div class="card-header"> <div class="card-header">
<i class="fa-solid fa-info-circle me-1"></i> <i class="fa-solid fa-info-circle me-1"></i>
@@ -295,6 +296,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endif %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}