diff --git a/lib/Froxlor/Ajax/Ajax.php b/lib/Froxlor/Ajax/Ajax.php index fc14738934..1a1ae2e5d0 100644 --- a/lib/Froxlor/Ajax/Ajax.php +++ b/lib/Froxlor/Ajax/Ajax.php @@ -193,7 +193,8 @@ private function getUpdateCheck() UI::initTwig(); try { - $json_result = \Froxlor\Api\Commands\Froxlor::getLocal($this->userinfo)->checkUpdate(); + $force = Request::get('force', 0); + $json_result = \Froxlor\Api\Commands\Froxlor::getLocal($this->userinfo, ['force' => $force])->checkUpdate(); $result = json_decode($json_result, true)['data']; $result['full_version'] = Froxlor::getFullVersion(); $result['dbversion'] = Froxlor::DBVERSION; diff --git a/templates/Froxlor/assets/js/jquery/updatecheck.js b/templates/Froxlor/assets/js/jquery/updatecheck.js index dcc5ef4096..1a8d686a34 100644 --- a/templates/Froxlor/assets/js/jquery/updatecheck.js +++ b/templates/Froxlor/assets/js/jquery/updatecheck.js @@ -4,8 +4,17 @@ export default function () { * updatecheck */ if (document.getElementById('updatecheck')) { + runCheck(); + } + + $('#forceUpdateCheck').on('click', function () { + runCheck(1); + }); + + function runCheck(force = 0) + { $.ajax({ - url: "lib/ajax.php?action=updatecheck&theme=" + window.$theme, + url: "lib/ajax.php?action=updatecheck&theme=" + window.$theme + "&force=" + force, type: "GET", success: function (data) { $("#updatecheck").html(data); diff --git a/templates/Froxlor/assets/scss/_variables.scss b/templates/Froxlor/assets/scss/_variables.scss index 8e1bef65e2..08a97dbf2d 100644 --- a/templates/Froxlor/assets/scss/_variables.scss +++ b/templates/Froxlor/assets/scss/_variables.scss @@ -86,3 +86,6 @@ $heading-border-color-dark: rgba(0,0,0,0.15); // Search $search-bg: $navbar-bg; + +// Popover size +$popover-max-width: 320px; diff --git a/templates/Froxlor/misc/version_popover.html.twig b/templates/Froxlor/misc/version_popover.html.twig index 554bc0ebfd..5f1c706b51 100644 --- a/templates/Froxlor/misc/version_popover.html.twig +++ b/templates/Froxlor/misc/version_popover.html.twig @@ -26,4 +26,7 @@ {{ call_static('\\Froxlor\\Froxlor', 'getInstallDir') }}bin/froxlor-cli froxlor:update {% endif %} {% endif %} +
+ +
{% endmacro %}