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

enhance version-check and beautify displayed information

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-11-27 15:33:25 +01:00
parent 685b6076a0
commit ae8cd3dc8a
7 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
templates/Froxlor/misc/version_popover.html.twig Normal file
View File

@@ -0,0 +1,26 @@
{% macro vpopover(isnewerversion, additional_info, full_version, dbversion, channel, last_update_check, message) %}
{% if isnewerversion == 0 %}
<p>{{ additional_info }}</p>
<div class='d-flex justify-content-between'>
<div class='fw-bold'>Version:</div>
<div>{{ full_version }}</div>
</div>
<div class='d-flex justify-content-between'>
<div class='fw-bold'>Database version:</div>
<div>{{ dbversion }}</div>
</div>
<div class='d-flex justify-content-between'>
<div class='fw-bold'>Channel:</div>
<div>{{ channel }}</div>
</div>
<div class='d-flex justify-content-between'>
<div class='fw-bold'>Last checked:</div>
<div>{{ last_update_check|date('d.m.Y H:i') }}</div>
</div>
{% else %}
<p>{{ message }}</p>
{% if get_config('enable_webupdate') %}
<a class='btn d-block btn-outline-warning' href='admin_autoupdate.php?page=overview'>Open updater</a>
{% endif %}
{% endif %}
{% endmacro %}

12
templates/Froxlor/misc/version_top.html.twig
View File

@@ -1,8 +1,12 @@
<a class="nav-link {% if isnewerversion == 0 %}text-success{% else %}text-warning{% endif %}" {% if isnewerversion == 0 %} href="#" {% else %} href="admin_autoupdate.php?page=overview" {% endif %} title="{% if isnewerversion == 0 %}{{ additional_info }}{% else %}{{ message }}{% endif %}">
{% if isnewerversion == 0 %}
{% import "Froxlor/misc/version_popover.html.twig" as vc %}
<span id="ucheck" class="nav-link {% if isnewerversion == 0 and aucheck < 0 %}text-muted{% elseif isnewerversion == 0 %}text-success{% else %}text-warning{% endif %}"
data-bs-container="body" data-bs-toggle="popover" data-bs-placement="bottom" data-bs-trigger="hover focus click" data-bs-html="true"
data-bs-content="{{ vc.vpopover(isnewerversion, additional_info, full_version, dbversion, channel, last_update_check, message) }}"
>
{% if isnewerversion == 0 and aucheck == 0 %}
<i class="fa-solid fa-circle-check me-1"></i>
{% else %}
<i class="fa-solid fa-circle-exclamation me-1"></i>
{% endif %}
<span class="d-md-none d-xl-inline">{{ version }}</span>
</a>
<span class="d-none d-xl-inline">{{ version }}</span>
</span>

4
templates/Froxlor/src/js/components/updatecheck.js
View File

@@ -8,11 +8,13 @@ $(function() {
type: "GET",
success: function (data) {
$("#updatecheck").html(data);
new bootstrap.Popover(document.getElementById('ucheck'));
},
error: function (request, status, error) {
console.log(request, status, error)
let message = 'Can\'t check version';
$("#updatecheck").html('<span class="text-decoration-none badge bg-warning mt-2 me-2" data-bs-toggle="tooltip" data-bs-placement="left" title="' + message + '"><i class="fa-solid fa-exclamation-triangle"></i> <span class="d-md-none d-xl-inline">' + message + '</span></span>');
$("#updatecheck").html('<span id="ucheck" class="text-decoration-none badge bg-warning mt-2 me-2" data-bs-toggle="tooltip" data-bs-placement="left" title="' + message + '"><i class="fa-solid fa-exclamation-triangle"></i> <span class="d-md-none d-xl-inline">' + message + '</span></span>');
new bootstrap.Tooltip(document.getElementById('ucheck'));
}
});
}