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

fix standardSuccess language-replacer parameter; if hide-incompatible-settings is activated, also hide settings-overview-panel if incompatible

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-13 11:24:58 +02:00
parent a1b5f57f99
commit 52857c208a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_autoupdate.php
View File

@@ -105,7 +105,7 @@ if ($page == 'overview') {
} }
} else { } else {
// no new version // no new version
Response::standardSuccess('update.noupdatesavail', [(Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') . ' ' : '')]); Response::standardSuccess('update.noupdatesavail', (Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') . ' ' : ''));
} }
} // download the new archive } // download the new archive
elseif ($page == 'getdownload') { elseif ($page == 'getdownload') {

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

@@ -31,6 +31,7 @@
{% block settings %} {% block settings %}
<div class="row row-cols-2 row-cols-md-2 row-cols-xl-4 g-3"> <div class="row row-cols-2 row-cols-md-2 row-cols-xl-4 g-3">
{% for field in fields %} {% for field in fields %}
{% if get_setting('system.hide_incompatible_settings') == 0 or (get_setting('system.hide_incompatible_settings') == 1 and (field.visible is not defined or (field.visible is defined and field.visible))) %}
<div class="col"> <div class="col">
<div class="card h-100 position-relative {% if not field.activated %}{% endif %}"> <div class="card h-100 position-relative {% if not field.activated %}{% endif %}">
<div class="card-body d-flex overflow-hidden align-items-center"> <div class="card-body d-flex overflow-hidden align-items-center">
@@ -51,6 +52,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% endblock %} {% endblock %}