From 1c4a6b0debd627cc141b3c6ca3269506f1cfe967 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Tue, 17 Jul 2018 04:14:05 +0300 Subject: refactoring --- kvmd/web/css/main.css | 9 ++++++--- kvmd/web/js/atx.js | 2 +- kvmd/web/js/stream.js | 4 ++-- kvmd/web/js/tools.js | 5 ----- 4 files changed, 9 insertions(+), 11 deletions(-) (limited to 'kvmd') diff --git a/kvmd/web/css/main.css b/kvmd/web/css/main.css index 6620e509..1817ecaf 100644 --- a/kvmd/web/css/main.css +++ b/kvmd/web/css/main.css @@ -53,6 +53,7 @@ ul#ctl p { ul#ctl img { margin: 0px; padding: 11px 11px; + height: 24px; } ul#ctl a.ctl-item { display: block; @@ -89,9 +90,10 @@ div.ctl-dropdown-content button { display: block; width: 100%; white-space:nowrap; - height: 30px!important; - font-size: 16px!important; + height: 30px; + font-size: 16px; text-align: left; + cursor: pointer; } div.ctl-dropdown-content button:last-child { border-radius: 0 0 8px 8px; @@ -102,6 +104,7 @@ div.ctl-dropdown-content button:enabled:hover { } div.ctl-dropdown-content button:disabled { color: #36393f; + cursor: wait; } div.ctl-dropdown-content hr { margin: 0px; @@ -126,6 +129,7 @@ img#stream-image { height: 480px; display: inline-block; border: 1px solid #17191d; + background-color: black; } img.stream-image-active { cursor: crosshair; @@ -144,7 +148,6 @@ img#msd-led, img#atx-hdd-led, img#stream-led, img#hid-keyboard-led { - height: 24px; } img.led-on { -webkit-filter: invert(0.5) sepia(1) saturate(5) hue-rotate(100deg); diff --git a/kvmd/web/js/atx.js b/kvmd/web/js/atx.js index d17735c5..8f6a0cc0 100644 --- a/kvmd/web/js/atx.js +++ b/kvmd/web/js/atx.js @@ -68,7 +68,7 @@ var atx = new function() { "atx-power-button-long", "atx-reset-button", ].forEach(function(name) { - tools.setButtonBusy(document.getElementById(name), busy); + document.getElementById(name).disabled = busy; }); }; }; diff --git a/kvmd/web/js/stream.js b/kvmd/web/js/stream.js index afaed1ae..6dad610a 100644 --- a/kvmd/web/js/stream.js +++ b/kvmd/web/js/stream.js @@ -28,13 +28,13 @@ var stream = new function() { // }; this.clickResetButton = function(el_button) { - tools.setButtonBusy(el_button, true); + el_button.disabled = true; var http = tools.makeRequest("POST", "/kvmd/streamer/reset", function() { if (http.readyState === 4) { if (http.status !== 200) { alert("Can't reset stream:", http.responseText); } - tools.setButtonBusy(el_button, false); + el_button.disabled = false; } }); }; diff --git a/kvmd/web/js/tools.js b/kvmd/web/js/tools.js index d9fe8357..37bbf451 100644 --- a/kvmd/web/js/tools.js +++ b/kvmd/web/js/tools.js @@ -8,11 +8,6 @@ var tools = new function() { return http; }; - this.setButtonBusy = function(el_button, busy) { - el_button.disabled = busy; - el_button.style.cursor = (busy ? "wait" : "default"); - }; - var __debug = (new URL(window.location.href)).searchParams.get("debug"); this.debug = function(...args) { -- cgit v1.2.3