From 73238e18e9e6b13df1f81a3b868ee51f491c1dc4 Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Sun, 2 Feb 2025 07:09:21 +0200 Subject: [PATCH] pikvm/pikvm#1462: relative root location --- web/base.pug | 6 +++-- web/index.html | 6 +++-- web/index.pug | 2 +- web/ipmi/index.html | 6 +++-- web/ipmi/index.pug | 2 +- web/kvm/index.html | 12 ++++++---- web/kvm/index.pug | 2 +- web/kvm/navbar-health.pug | 2 +- web/kvm/navbar.pug | 2 +- web/kvm/window-about.pug | 3 ++- web/login/index.html | 4 +++- web/login/index.pug | 2 +- web/share/js/bb.js | 8 +++++-- web/share/js/index/main.js | 16 ++++++++----- web/share/js/ipmi/main.js | 4 ++-- web/share/js/kvm/atx.js | 2 +- web/share/js/kvm/gpio.js | 7 +++--- web/share/js/kvm/hid.js | 8 +++---- web/share/js/kvm/main.js | 4 ++-- web/share/js/kvm/msd.js | 15 ++++++------ web/share/js/kvm/ocr.js | 2 +- web/share/js/kvm/paste.js | 2 +- web/share/js/kvm/recorder.js | 6 ++--- web/share/js/kvm/session.js | 18 ++++++++++----- web/share/js/kvm/stream.js | 11 +++------ web/share/js/kvm/stream_janus.js | 2 +- web/share/js/kvm/stream_media.js | 2 +- web/share/js/kvm/stream_mjpeg.js | 5 ++-- web/share/js/kvm/switch.js | 39 ++++++++++++++++---------------- web/share/js/login/main.js | 4 ++-- web/share/js/tools.js | 17 +++++++++++++- web/share/js/vars.js | 31 +++++++++++++++++++++++++ web/share/js/vnc/main.js | 4 ++-- web/start.pug | 2 +- web/vnc/index.html | 6 +++-- web/vnc/index.pug | 2 +- 36 files changed, 170 insertions(+), 96 deletions(-) create mode 100644 web/share/js/vars.js diff --git a/web/base.pug b/web/base.pug index 4dd5f04a..a1423aa6 100644 --- a/web/base.pug +++ b/web/base.pug @@ -23,7 +23,7 @@ doctype html ============================================================================== - - var prefix = "./" + var root_prefix = "./" title = "" main_js = "" @@ -36,7 +36,7 @@ block vars block _vars_dynamic - - share_dir = `${prefix}share` + share_dir = `${root_prefix}share` css_dir = `${share_dir}/css` js_dir = `${share_dir}/js` svg_dir = `${share_dir}/svg` @@ -61,6 +61,8 @@ html(lang="en") if main_js script(type="module") + | import {setRootPrefix} from "#{js_dir}/vars.js"; + | setRootPrefix("#{root_prefix}"); | import {main} from "#{js_dir}/#{main_js}.js"; | main(); diff --git a/web/index.html b/web/index.html index a1ad9c54..af565537 100644 --- a/web/index.html +++ b/web/index.html @@ -40,7 +40,9 @@ - @@ -66,7 +68,7 @@ - +
Server:

diff --git a/web/index.pug b/web/index.pug index 4543cf6c..b700a1db 100644 --- a/web/index.pug +++ b/web/index.pug @@ -25,7 +25,7 @@ block start table td(class="server") td Server: - td #[a#kvmd-meta-server-host(target="_blank" href="/api/info")] + td #[a#kvmd-meta-server-host(target="_blank" href=`${root_prefix}api/info`)] hr #apps-box diff --git a/web/ipmi/index.html b/web/ipmi/index.html index ca68ab56..20834cd6 100644 --- a/web/ipmi/index.html +++ b/web/ipmi/index.html @@ -37,13 +37,15 @@ -
-
  ←   [ PiKVM Index ] +
  ←   [ PiKVM Index ]

This PiKVM device has running kvmd-ipmi daemon and provides IPMI 2.0 interface for some basic BMC operations like on/off/reset the server. diff --git a/web/ipmi/index.pug b/web/ipmi/index.pug index 6fb6bb68..381ae63e 100644 --- a/web/ipmi/index.pug +++ b/web/ipmi/index.pug @@ -3,7 +3,7 @@ extends ../start.pug append vars - - prefix = "../" + root_prefix = "../" title = "PiKVM IPMI Info" main_js = "ipmi/main" index_link = true diff --git a/web/kvm/index.html b/web/kvm/index.html index 41529564..6458193f 100644 --- a/web/kvm/index.html +++ b/web/kvm/index.html @@ -52,13 +52,15 @@ -