summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/kvm/index.html18
-rw-r--r--web/kvm/navbar-atx.pug2
-rw-r--r--web/kvm/navbar-gpio.pug2
-rw-r--r--web/kvm/navbar-health.pug1
-rw-r--r--web/kvm/navbar-macro.pug2
-rw-r--r--web/kvm/navbar-msd.pug2
-rw-r--r--web/kvm/navbar-shortcuts.pug2
-rw-r--r--web/kvm/navbar-system.pug2
-rw-r--r--web/kvm/window-about.pug4
-rw-r--r--web/share/css/navbar.css11
-rw-r--r--web/share/js/kvm/gpio.js2
-rw-r--r--web/share/js/wm.js2
12 files changed, 34 insertions, 16 deletions
diff --git a/web/kvm/index.html b/web/kvm/index.html
index a5670b0f..43b33df0 100644
--- a/web/kvm/index.html
+++ b/web/kvm/index.html
@@ -58,7 +58,7 @@
<ul id="navbar">
<li class="left"><a id="logo" href="/">&larr;&nbsp;&nbsp;<img class="svg-gray" src="/share/svg/logo.svg" alt="&amp;pi;-kvm"></a></li>
<div class="hidden" id="hw-health-dropdown">
- <li class="left"><a class="menu-button" href="#"><img class="hidden" data-dont-hide-menu id="hw-health-undervoltage-led" src="/share/svg/led-undervoltage.svg"><img class="hidden" data-dont-hide-menu id="hw-health-overheating-led" src="/share/svg/led-overheating.svg">&#8628;</a>
+ <li class="left"><a class="menu-button" href="#"><img class="hidden" data-dont-hide-menu id="hw-health-undervoltage-led" src="/share/svg/led-undervoltage.svg"><img class="hidden" data-dont-hide-menu id="hw-health-overheating-led" src="/share/svg/led-overheating.svg"></a>
<div class="menu" data-dont-hide-menu>
<div class="text">
<table>
@@ -105,7 +105,7 @@
</div>
</li>
</div>
- <li class="right"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="link-led" src="/share/svg/led-link.svg"><img class="led-gray" data-dont-hide-menu id="stream-led" src="/share/svg/led-stream.svg"><img class="led-gray" data-dont-hide-menu id="hid-keyboard-led" src="/share/svg/led-hid-keyboard.svg"><img class="led-gray" data-dont-hide-menu id="hid-mouse-led" src="/share/svg/led-hid-mouse.svg">System &#8628;</a>
+ <li class="right"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="link-led" src="/share/svg/led-link.svg"><img class="led-gray" data-dont-hide-menu id="stream-led" src="/share/svg/led-stream.svg"><img class="led-gray" data-dont-hide-menu id="hid-keyboard-led" src="/share/svg/led-hid-keyboard.svg"><img class="led-gray" data-dont-hide-menu id="hid-mouse-led" src="/share/svg/led-hid-mouse.svg">System</a>
<div class="menu" data-dont-hide-menu>
<div class="buttons">
<button disabled data-force-hide-menu id="stream-screenshot-button">&bull; Take a screenshot</button>
@@ -170,7 +170,7 @@
</div>
</div>
</li>
- <li class="right feature-disabled" id="atx-dropdown"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="atx-power-led" src="/share/svg/led-atx-power.svg"><img class="led-gray" data-dont-hide-menu id="atx-hdd-led" src="/share/svg/led-atx-hdd.svg">ATX &#8628;</a>
+ <li class="right feature-disabled" id="atx-dropdown"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="atx-power-led" src="/share/svg/led-atx-power.svg"><img class="led-gray" data-dont-hide-menu id="atx-hdd-led" src="/share/svg/led-atx-hdd.svg">ATX</a>
<div class="menu">
<div class="buttons">
<button disabled id="atx-power-button">&bull; Click Power <sup><i>short</i></sup></button>
@@ -180,7 +180,7 @@
</div>
</div>
</li>
- <li class="right feature-disabled" id="msd-dropdown"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="msd-led" src="/share/svg/led-msd.svg">Drive &#8628;</a>
+ <li class="right feature-disabled" id="msd-dropdown"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="msd-led" src="/share/svg/led-msd.svg">Drive</a>
<div class="menu" data-dont-hide-menu id="msd-menu">
<div class="hidden" id="msd-message-offline">
<div class="text">
@@ -328,10 +328,10 @@
</div>
</div>
</li>
- <li class="right feature-disabled" id="gpio-dropdown"><a class="menu-button" id="gpio-menu-button" href="#">GPIO &#8628;</a>
+ <li class="right feature-disabled" id="gpio-dropdown"><a class="menu-button" id="gpio-menu-button" href="#">GPIO</a>
<div class="menu" data-dont-hide-menu id="gpio-menu"></div>
</li>
- <li class="right"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="hid-recorder-led" src="/share/svg/led-gear.svg">Macro &#8628;</a>
+ <li class="right"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="hid-recorder-led" src="/share/svg/led-gear.svg">Macro</a>
<div class="menu" data-dont-hide-menu>
<div class="text"><b>Record and play keyboard &amp; mouse actions<br></b><sub>For security reasons, the record will not be saved on the Pi-KVM</sub></div>
<hr>
@@ -373,7 +373,7 @@
</div>
</div>
</li>
- <li class="right"><a class="menu-button" href="#">Shortcuts &#8628;</a>
+ <li class="right"><a class="menu-button" href="#">Shortcuts</a>
<div class="menu" data-dont-hide-menu>
<div class="buttons">
<textarea id="hid-pak-text" placeholder="Paste your text here"></textarea>
@@ -1382,6 +1382,8 @@
<li>Jason Toland</li>
<li>Jeff Bowman</li>
<li>Jennifer Rowlett</li>
+ <li>Joachim Bruening</li>
+ <li>John Kelley</li>
<li>John McGovern</li>
<li>Jonathan Vaughn</li>
<li>Jordi Pakey-Rodriguez</li>
@@ -1393,6 +1395,7 @@
<li>Malcolm Cameron</li>
<li>Mark Gilbert</li>
<li>Mark Robinson</li>
+ <li>Markus Sobczack</li>
<li>Martin Gasser</li>
<li>Mauricio Allende</li>
<li>Mehmet Aydoğdu</li>
@@ -1411,6 +1414,7 @@
<li>Scott</li>
<li>Scott Spicola</li>
<li>Sergey Lukjanov</li>
+ <li>Stefan Müller</li>
<li>Steve Ovens</li>
<li>Steven Richter</li>
<li>Tejun Heo</li>
diff --git a/web/kvm/navbar-atx.pug b/web/kvm/navbar-atx.pug
index 27c16f5d..374e466a 100644
--- a/web/kvm/navbar-atx.pug
+++ b/web/kvm/navbar-atx.pug
@@ -2,7 +2,7 @@ li(id="atx-dropdown" class="right feature-disabled")
a(class="menu-button" href="#")
+navbar_led("atx-power-led", "led-atx-power")
+navbar_led("atx-hdd-led", "led-atx-hdd")
- | ATX &#8628;
+ | ATX
div(class="menu")
div(class="buttons")
button(disabled id="atx-power-button") &bull; Click Power #[sup #[i short]]
diff --git a/web/kvm/navbar-gpio.pug b/web/kvm/navbar-gpio.pug
index 280ba3fd..ed5000ac 100644
--- a/web/kvm/navbar-gpio.pug
+++ b/web/kvm/navbar-gpio.pug
@@ -1,4 +1,4 @@
li(id="gpio-dropdown" class="right feature-disabled")
a(class="menu-button" id="gpio-menu-button" href="#")
- | GPIO &#8628;
+ | GPIO
div(data-dont-hide-menu id="gpio-menu" class="menu")
diff --git a/web/kvm/navbar-health.pug b/web/kvm/navbar-health.pug
index 277c45de..91003bab 100644
--- a/web/kvm/navbar-health.pug
+++ b/web/kvm/navbar-health.pug
@@ -3,7 +3,6 @@ div(id="hw-health-dropdown" class="hidden")
a(class="menu-button" href="#")
+navbar_led("hw-health-undervoltage-led", "led-undervoltage", "hidden")
+navbar_led("hw-health-overheating-led", "led-overheating", "hidden")
- | &#8628;
div(data-dont-hide-menu class="menu")
+menu_message("warning", "Raspberry Pi's health is at risk")
| This is not a drill! A red icon indicates a current issue,#[br]
diff --git a/web/kvm/navbar-macro.pug b/web/kvm/navbar-macro.pug
index 2a17f4c4..bc7743ed 100644
--- a/web/kvm/navbar-macro.pug
+++ b/web/kvm/navbar-macro.pug
@@ -1,7 +1,7 @@
li(class="right")
a(class="menu-button" href="#")
+navbar_led("hid-recorder-led", "led-gear")
- | Macro &#8628;
+ | Macro
div(data-dont-hide-menu class="menu")
div(class="text")
b Record and play keyboard &amp; mouse actions#[br]
diff --git a/web/kvm/navbar-msd.pug b/web/kvm/navbar-msd.pug
index 739128b4..31a91d6a 100644
--- a/web/kvm/navbar-msd.pug
+++ b/web/kvm/navbar-msd.pug
@@ -1,7 +1,7 @@
li(id="msd-dropdown" class="right feature-disabled")
a(class="menu-button" href="#")
+navbar_led("msd-led", "led-msd")
- | Drive &#8628;
+ | Drive
div(data-dont-hide-menu id="msd-menu" class="menu")
div(id="msd-message-offline" class="hidden")
+menu_message("warning", "Mass Storage Drive is offline")
diff --git a/web/kvm/navbar-shortcuts.pug b/web/kvm/navbar-shortcuts.pug
index fe12da64..9f3a94b0 100644
--- a/web/kvm/navbar-shortcuts.pug
+++ b/web/kvm/navbar-shortcuts.pug
@@ -1,5 +1,5 @@
li(class="right")
- a(class="menu-button" href="#") Shortcuts &#8628;
+ a(class="menu-button" href="#") Shortcuts
div(data-dont-hide-menu class="menu")
div(class="buttons")
textarea(id="hid-pak-text" placeholder="Paste your text here")
diff --git a/web/kvm/navbar-system.pug b/web/kvm/navbar-system.pug
index 346dcd91..d6e76156 100644
--- a/web/kvm/navbar-system.pug
+++ b/web/kvm/navbar-system.pug
@@ -4,7 +4,7 @@ li(class="right")
+navbar_led("stream-led", "led-stream")
+navbar_led("hid-keyboard-led", "led-hid-keyboard")
+navbar_led("hid-mouse-led", "led-hid-mouse")
- | System &#8628;
+ | System
div(data-dont-hide-menu class="menu")
div(class="buttons")
button(disabled data-force-hide-menu id="stream-screenshot-button") &bull; Take a screenshot
diff --git a/web/kvm/window-about.pug b/web/kvm/window-about.pug
index 8239400a..770c4287 100644
--- a/web/kvm/window-about.pug
+++ b/web/kvm/window-about.pug
@@ -79,6 +79,8 @@ mixin about_tab(name, title, checked=false)
li Jason Toland
li Jeff Bowman
li Jennifer Rowlett
+ li Joachim Bruening
+ li John Kelley
li John McGovern
li Jonathan Vaughn
li Jordi Pakey-Rodriguez
@@ -90,6 +92,7 @@ mixin about_tab(name, title, checked=false)
li Malcolm Cameron
li Mark Gilbert
li Mark Robinson
+ li Markus Sobczack
li Martin Gasser
li Mauricio Allende
li Mehmet Aydoğdu
@@ -108,6 +111,7 @@ mixin about_tab(name, title, checked=false)
li Scott
li Scott Spicola
li Sergey Lukjanov
+ li Stefan Müller
li Steve Ovens
li Steven Richter
li Tejun Heo
diff --git a/web/share/css/navbar.css b/web/share/css/navbar.css
index 79d2b930..47e5810d 100644
--- a/web/share/css/navbar.css
+++ b/web/share/css/navbar.css
@@ -63,8 +63,19 @@ ul#navbar li a.menu-button {
padding-left: 16px;
padding-right: 16px;
text-decoration: none;
+ position: relative;
}
+/*ul#navbar li a.menu-button:before {
+ content: "";
+ position: absolute;
+ top: calc(100% - 10px);
+ right: 0;
+ width: 0;
+ border-bottom: 10px solid var(--cs-navbar-item-pressed-bg);
+ border-left: 10px solid transparent;
+}*/
+
ul#navbar li a#logo:hover:not(.active),
ul#navbar li a.menu-button:hover:not(.active) {
background-color: var(--cs-navbar-item-hovered-bg);
diff --git a/web/share/js/kvm/gpio.js b/web/share/js/kvm/gpio.js
index 946e51c1..f357236b 100644
--- a/web/share/js/kvm/gpio.js
+++ b/web/share/js/kvm/gpio.js
@@ -72,7 +72,7 @@ export function Gpio() {
self.setModel = function(model) {
tools.featureSetEnabled($("gpio-dropdown"), model.view.table.length);
if (model.view.table.length) {
- $("gpio-menu-button").innerHTML = `${model.view.header.title} &#8628;`;
+ $("gpio-menu-button").innerHTML = `${model.view.header.title}`;
}
let content = "<table class=\"kv\">";
diff --git a/web/share/js/wm.js b/web/share/js/wm.js
index fb4b30a1..d9b0ee94 100644
--- a/web/share/js/wm.js
+++ b/web/share/js/wm.js
@@ -241,7 +241,6 @@ function __WindowManager() {
} else {
el_button.classList.remove("menu-button-pressed");
el_menu.style.visibility = "hidden";
-
el_menu.style.removeProperty("right");
}
}
@@ -266,6 +265,7 @@ function __WindowManager() {
let el_menu = el_button.parentElement.querySelector(".menu");
el_button.classList.remove("menu-button-pressed");
el_menu.style.visibility = "hidden";
+ el_menu.style.removeProperty("right");
}
};