From 95dedd2f38fe1051d149e6fea7ded79dc716d8c8 Mon Sep 17 00:00:00 2001 From: John Crisp Date: Wed, 23 Apr 2025 15:33:16 +0200 Subject: [PATCH] Sidebar scrolling --- .../AdminLTE/templates/common_css.html.ep | 8 +++-- .../AdminLTE/templates/common_js.html.ep | 11 +++--- .../templates/layouts/AdminLTE.html.ep | 34 +++++++++++-------- .../themes/AdminLTE/templates/login.html.ep | 2 +- smeserver-manager-AdminLTE.spec | 5 ++- 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep index 1fbaaa6..9a07318 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep @@ -1,7 +1,9 @@ - -%= stylesheet 'css/sme-jquery-overrides.css' -%= stylesheet 'dist/css/adminlte.min.css' %= stylesheet 'koozali/css/adminlte.koozali.css' %= stylesheet 'koozali/css/flag-icon.min.css' + +%#= stylesheet 'css/sme-jquery-overrides.css' + +%= stylesheet 'dist/css/adminlte.min.css' %= stylesheet 'dist/icons/font/bootstrap-icons.min.css' +%= stylesheet 'dist/css/overlayscrollbars.min.css' \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep index 5a0e508..3f3f9b7 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/common_js.html.ep @@ -1,6 +1,9 @@ - -%= javascript 'js/jquery.min.js' + +%= javascript 'dist/js/jquery.min.js' +%= javascript 'dist/js/bootstrap.min.js' +%= javascript 'dist/js/popper.min.js' %= javascript 'dist/js/adminlte.min.js' -%= javascript '/js/flag-by-locale.js' -%= javascript '/js/sme-password.js' +%= javascript 'koozali/js/flag-by-locale.js' +%= javascript 'koozali/js/sme-password.js' + diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep index 79b767e..54951a4 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep @@ -1,33 +1,39 @@ - + + + + + <%= $title %> + %= content_for 'head_contrib' + %= content_for 'refresh' + + %= include 'common_js' + %= include 'common_css' + + + + % if (config 'hasJquery') { %= include 'partials/_js_imports' - %= include 'common_js' + % } - %= content_for 'refresh' - - %= include 'common_css' - - - - -% if ($c->current_route eq 'nutups') { - %= include 'partials/_nutups_overrides' -% } + % if ($c->current_route eq 'nutups') { + %= include 'partials/_nutups_overrides' + % } @@ -108,7 +114,7 @@ -
+