GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-31 10:01:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
mofeng-git
2025-02-01 09:12:03 +00:00
parent 9da06d3f58 15dbe6265f
commit c6a5ffa0cf
3 changed files with 82 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
web/kvm/index.html
View File

@@ -240,6 +240,11 @@
<label for="stream-mode-radio-media">H.264</label> <label for="stream-mode-radio-media">H.264</label>
<input checked type="radio" id="stream-mode-radio-mjpeg" name="stream-mode-radio" value="mjpeg"> <input checked type="radio" id="stream-mode-radio-mjpeg" name="stream-mode-radio" value="mjpeg">
<label for="stream-mode-radio-mjpeg">MJPEG</label> <label for="stream-mode-radio-mjpeg">MJPEG</label>
<label for="stream-mode-radio-janus">WebRTC</label>
<input type="radio" id="stream-mode-radio-media" name="stream-mode-radio" value="media">
<label for="stream-mode-radio-media">H.264</label>
<input checked type="radio" id="stream-mode-radio-mjpeg" name="stream-mode-radio" value="mjpeg">
<label for="stream-mode-radio-mjpeg">MJPEG</label>
</div> </div>
</td> </td>
</tr> </tr>
@@ -274,6 +279,15 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="feature-disabled" id="stream-mic">
<td>Microphone:</td>
<td align="right">
<div class="switch-box">
<input disabled type="checkbox" id="stream-mic-switch">
<label for="stream-mic-switch"><span class="switch-inner"></span><span class="switch"></span></label>
</div>
</td>
</tr>
</table> </table>
<hr> <hr>
<div class="buttons buttons-row"> <div class="buttons buttons-row">
@@ -418,6 +432,15 @@
</div> </div>
</details> </details>
<table class="kv"> <table class="kv">
<tr>
<td>Bad link mode (release keys immediately):</td>
<td align="right">
<div class="switch-box">
<input type="checkbox" id="hid-keyboard-bad-link-switch">
<label for="hid-keyboard-bad-link-switch"><span class="switch-inner"></span><span class="switch"></span></label>
</div>
</td>
</tr>
<tr> <tr>
<td>Bad link mode (release keys immediately):</td> <td>Bad link mode (release keys immediately):</td>
<td align="right"> <td align="right">
@@ -533,6 +556,7 @@
</div> </div>
<hr> <hr>
</div> </div>
<div class="hidden" id="msd-message-too-big-for-dvd">
<div class="hidden" id="msd-message-too-big-for-dvd"> <div class="hidden" id="msd-message-too-big-for-dvd">
<div class="text"> <div class="text">
<table> <table>
@@ -542,6 +566,7 @@
</tr> </tr>
<tr> <tr>
<td><sup style="line-height:1">The maximum is 31.6GiB. Please switch to the Flash mode.</sup></td> <td><sup style="line-height:1">The maximum is 31.6GiB. Please switch to the Flash mode.</sup></td>
<td><sup style="line-height:1">The maximum is 31.6GiB. Please switch to the Flash mode.</sup></td>
</tr> </tr>
</table> </table>
</div> </div>
@@ -612,6 +637,7 @@
<div class="radio-box"> <div class="radio-box">
<input checked type="radio" id="msd-mode-radio-cdrom" name="msd-mode-radio" value="1"> <input checked type="radio" id="msd-mode-radio-cdrom" name="msd-mode-radio" value="1">
<label for="msd-mode-radio-cdrom">CD/DVD</label> <label for="msd-mode-radio-cdrom">CD/DVD</label>
<label for="msd-mode-radio-cdrom">CD/DVD</label>
<input type="radio" id="msd-mode-radio-flash" name="msd-mode-radio" value="0"> <input type="radio" id="msd-mode-radio-flash" name="msd-mode-radio" value="0">
<label for="msd-mode-radio-flash">Flash</label> <label for="msd-mode-radio-flash">Flash</label>
</div> </div>
@@ -790,6 +816,8 @@
<div class="switch-box"> <div class="switch-box">
<input type="checkbox" id="hid-pak-slow-switch"> <input type="checkbox" id="hid-pak-slow-switch">
<label for="hid-pak-slow-switch"><span class="switch-inner"></span><span class="switch"></span></label> <label for="hid-pak-slow-switch"><span class="switch-inner"></span><span class="switch"></span></label>
<input type="checkbox" id="hid-pak-slow-switch">
<label for="hid-pak-slow-switch"><span class="switch-inner"></span><span class="switch"></span></label>
</div> </div>
</td> </td>
</tr> </tr>
@@ -849,6 +877,7 @@
<hr> <hr>
<div class="buttons"> <div class="buttons">
<div class="buttons-row"> <div class="buttons-row">
<button class="row50" data-force-hide-menu data-shortcut="CapsLock">&bull; Caps Lock &nbsp;<img class="inline-lamp-small hid-keyboard-caps-led led-gray" src="/share/svg/led-square.svg"></button>
<button class="row50" data-force-hide-menu data-shortcut="CapsLock">&bull; Caps Lock &nbsp;<img class="inline-lamp-small hid-keyboard-caps-led led-gray" src="/share/svg/led-square.svg"></button> <button class="row50" data-force-hide-menu data-shortcut="CapsLock">&bull; Caps Lock &nbsp;<img class="inline-lamp-small hid-keyboard-caps-led led-gray" src="/share/svg/led-square.svg"></button>
<button class="row50" data-force-hide-menu data-shortcut="MetaLeft">&bull; Left Win</button> <button class="row50" data-force-hide-menu data-shortcut="MetaLeft">&bull; Left Win</button>
</div> </div>
@@ -968,6 +997,50 @@
<table class="kv" id="switch-chain"></table> <table class="kv" id="switch-chain"></table>
</div> </div>
</li> </li>
<li class="right feature-disabled" id="switch-dropdown"><a class="menu-button" id="switch-menu-button" href="#"><img class="led-gray" id="switch-atx-power-led" src="/share/svg/led-atx-power.svg"><img class="led-gray" id="switch-atx-hdd-led" src="/share/svg/led-atx-hdd.svg"><span>Switch <i><sub id="switch-active-port"></sub></i></span></a>
<div class="menu" id="switch-menu">
<table style="border-spacing: 0px;">
<tr>
<td>
<div class="text"><b><a target="_blank" href="https://docs.pikvm.org/switch">PiKVM Switch</a> is attached<br></b><sub>Select a port or perform any available action like ATX click</sub></div>
</td>
<td>
<div class="text">
<button class="small" data-force-hide-menu data-show-window="switch-window">&bull; Settings</button>
</div>
</td>
</tr>
</table>
<hr>
<div class="hidden" id="switch-message-update">
<div class="text">
<table>
<tr>
<td rowspan="2"><img class="sign " src="/share/svg/info.svg"></td>
<td style="line-height:1.5"><b>Good news! Your switch is ready to get the firmware update</b></td>
</tr>
<tr>
<td><sup style="line-height:1">Please <a target="_blank" href="https://docs.pikvm.org/switch/#firmware-updating">follow the instructions</a> when you decide to install it.</sup></td>
</tr>
</table>
</div>
<hr>
</div>
<table class="kv">
<tr>
<td>Ask ATX click confirmation:</td>
<td align="right">
<div class="switch-box">
<input checked type="checkbox" id="switch-atx-ask-switch">
<label for="switch-atx-ask-switch"><span class="switch-inner"></span><span class="switch"></span></label>
</div>
</td>
</tr>
</table>
<hr>
<table class="kv" id="switch-chain"></table>
</div>
</li>
</ul> </ul>
<div class="window" id="stream-ocr-window"> <div class="window" id="stream-ocr-window">
<div class="hidden" id="stream-ocr-selection"></div> <div class="hidden" id="stream-ocr-selection"></div>
@@ -986,6 +1059,7 @@
<div class="stream-box-offline" id="stream-box"><img id="stream-image" src="/share/png/blank-stream.png"> <div class="stream-box-offline" id="stream-box"><img id="stream-image" src="/share/png/blank-stream.png">
<video class="hidden" id="stream-video" disablePictureInPicture="true" autoplay playsinline muted></video> <video class="hidden" id="stream-video" disablePictureInPicture="true" autoplay playsinline muted></video>
<canvas class="hidden" id="stream-canvas"></canvas> <canvas class="hidden" id="stream-canvas"></canvas>
<canvas class="hidden" id="stream-canvas"></canvas>
<div id="stream-fullscreen-active"></div> <div id="stream-fullscreen-active"></div>
</div> </div>
<div class="keypad" id="stream-mouse-buttons" align="center"> <div class="keypad" id="stream-mouse-buttons" align="center">

7
web/kvm/navbar-system.pug
View File

@@ -2,6 +2,7 @@ li(id="system-dropdown" class="right")
a(class="menu-button" href="#") a(class="menu-button" href="#")
+navbar_led("link-led", "led-link") +navbar_led("link-led", "led-link")
+navbar_led("stream-led", "led-video") +navbar_led("stream-led", "led-video")
+navbar_led("stream-led", "led-video")
+navbar_led("hid-keyboard-led", "led-hid-keyboard") +navbar_led("hid-keyboard-led", "led-hid-keyboard")
+navbar_led("hid-mouse-led", "led-hid-mouse") +navbar_led("hid-mouse-led", "led-hid-mouse")
span(i18n="kvm_text3") System span(i18n="kvm_text3") System
@@ -17,7 +18,7 @@ li(id="system-dropdown" class="right")
data-confirm="Are you sure to send Wake-on-LAN packet to the server?" i18n="kvm_text8") &bull; WoL data-confirm="Are you sure to send Wake-on-LAN packet to the server?" i18n="kvm_text8") &bull; WoL
hr hr
div(id="stream-message-no-webrtc" class="hidden") div(id="stream-message-no-webrtc" class="hidden")
+menu_message("warning", "WebRTC is not supported by this browser", "stream-message-no-webrtc") +menu_message("warning", "WebRTC is not supported by this browser")
hr hr
div(id="stream-message-no-vd" class="hidden") div(id="stream-message-no-vd" class="hidden")
+menu_message("warning", "Direct HTTP H.264 streaming is not supported") +menu_message("warning", "Direct HTTP H.264 streaming is not supported")
@@ -67,8 +68,8 @@ li(id="system-dropdown" class="right")
label(for="stream-orient-radio-180") 180&deg; label(for="stream-orient-radio-180") 180&deg;
input(type="radio" id="stream-orient-radio-270" name="stream-orient-radio" value="270") input(type="radio" id="stream-orient-radio-270" name="stream-orient-radio" value="270")
label(for="stream-orient-radio-270") 270&deg; label(for="stream-orient-radio-270") 270&deg;
tr(id="stream-audio", class="feature-disabled") tr(id="stream-audio" class="feature-disabled")
td(i18n="kvm_text19") Audio volume: td Audio volume:
td(class="value-slider") #[input(type="range" id="stream-audio-volume-slider" class="slider")] td(class="value-slider") #[input(type="range" id="stream-audio-volume-slider" class="slider")]
td(id="stream-audio-volume-value" class="value-number") td(id="stream-audio-volume-value" class="value-number")
tr(id="stream-mic" class="feature-disabled") tr(id="stream-mic" class="feature-disabled")

4
web/kvm/navbar-text.pug
View File

@@ -17,6 +17,10 @@ li(id="text-dropdown" class="right")
td td
select(id="hid-pak-keymap-selector") select(id="hid-pak-keymap-selector")
table(class="kv") table(class="kv")
tr
+menu_switch_notable("hid-pak-slow-switch", "Slow typing", true, false)
tr
+menu_switch_notable("hid-pak-secure-switch", "Hide input text", true, false)
tr tr
+menu_switch_notable("hid-pak-slow-switch", "Slow typing", true, false, "hid-pak-slow-switch") +menu_switch_notable("hid-pak-slow-switch", "Slow typing", true, false, "hid-pak-slow-switch")
tr tr