diff --git a/package.json b/package.json index 6b04dd0..1a89e09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fm-dx-webserver", - "version": "1.2.3", + "version": "1.2.4", "description": "FM DX Webserver", "main": "index.js", "scripts": { diff --git a/server/fmdx_list.js b/server/fmdx_list.js index fe7e919..ffc21d0 100644 --- a/server/fmdx_list.js +++ b/server/fmdx_list.js @@ -4,6 +4,7 @@ const fetch = require('node-fetch'); const { logDebug, logError, logInfo, logWarn } = require('./console'); const { serverConfig, configUpdate, configSave } = require('./server_config'); var pjson = require('../package.json'); +var os = require('os'); let timeoutID = null; @@ -60,6 +61,7 @@ function sendKeepalive() { } function sendUpdate() { + let currentOs = os.type() + ' ' + os.release(); let bwLimit = ''; if (serverConfig.webserver.tuningLimit === true) { @@ -76,7 +78,8 @@ function sendUpdate() { contact: serverConfig.identification.contact || '', tuner: serverConfig.device || '', bwLimit: bwLimit, - version: pjson.version + os: currentOs, + version: pjson.version }; if (serverConfig.identification.token) diff --git a/web/css/breadcrumbs.css b/web/css/breadcrumbs.css index 999aa23..c1b674e 100644 --- a/web/css/breadcrumbs.css +++ b/web/css/breadcrumbs.css @@ -47,7 +47,7 @@ h4 { color: var(--color-text); text-align: center; font-size: 14px; - border-radius: 30px; + border-radius: 15px; padding: 5px 25px; z-index: 1000; opacity: 0; @@ -86,6 +86,7 @@ label { #data-ps { font-weight: 500; + margin-top: -5px; } #data-station-container { @@ -254,28 +255,28 @@ label { } .admin-quick-dashboard { - position: absolute; - top: 0; - bottom: 0; - left: -96px; - width: 96px; - height: 286px; + width: 255px; + height: 72px; background-color: var(--color-2); - margin: auto 0; - border-radius: 30px; - padding-top: 15px; + margin: 0 auto; + margin-bottom: 15px; + padding: 5px; + border-radius: 15px; + display: flex; + align-items: center; + justify-content: center; } .admin-quick-dashboard .icon { - width: 72px; - height: 72px; - margin: 10px auto; + width: 52px; + height: 52px; + margin: auto; color: var(--color-1); background-color: var(--color-3); display: flex; justify-content: center; align-items: center; - font-size: 24px; + font-size: 18px; border-radius: 10px; transition: 0.3s ease-in-out background-color; cursor: pointer; @@ -293,6 +294,30 @@ pre { color: white; } +.circle-container { + position: relative; + width: 25px; + height: 34px; +} + +.circle { + position: absolute; + width: 16px; + height: 16px; + border: 2px solid var(--color-3); + border-radius: 50%; +} + +.circle.circle1 { + left: 0px; + top: 10px; +} + +.circle.circle2 { + left: 8px; + top: 10px; +} + @media (max-width: 768px) { canvas, #flags-container { display: none; @@ -442,4 +467,10 @@ pre { .chatbutton { height: 88px !important; } +} + +@media only screen and (min-width: 769px) and (max-height: 610px) { + .canvas-container { + display: none; + } } \ No newline at end of file diff --git a/web/css/buttons.css b/web/css/buttons.css index 23a20e3..c5827e4 100644 --- a/web/css/buttons.css +++ b/web/css/buttons.css @@ -2,7 +2,7 @@ button, input[type="submit"] { width: 100%; height: 100%; border: 0; - border-radius: 30px; + border-radius: 15px; transition: 0.3s ease-in-out background-color; background-color: var(--color-4); cursor: pointer; @@ -40,7 +40,7 @@ button:hover { height: 64px; background: var(--color-2); color: var(--color-main); - border-radius: 30px; + border-radius: 15px; margin-right: 10px; margin-left: 10px; display: flex; @@ -112,11 +112,11 @@ input[type="text"], textarea, input[type="password"] { } #freq-down { - border-radius: 30px 0 0 30px; + border-radius: 15px 0 0 15px; } #freq-up { - border-radius: 0 30px 30px 0; + border-radius: 0 15px 15px 0; } input[type="range"] { @@ -130,7 +130,7 @@ input[type="range"] { outline: none; /* slider progress trick */ overflow: hidden; - border-radius: 30px; + border-radius: 15px; height: 100%; background: transparent; } @@ -139,7 +139,7 @@ input[type="range"] { input[type="range"]::-moz-range-track { height: 48px; background: var(--color-1); - border-radius: 30px; + border-radius: 15px; border: 0; } @@ -153,7 +153,7 @@ input[type="range"]::-webkit-slider-thumb { background: url('../images/speaker.svg') center no-repeat, var(--color-5); background-position: center; background-size: 20px; - border-radius: 30px; + border-radius: 15px; outline: 4px solid var(--color-5); outline-offset: -3px; /* slider progress trick */ @@ -168,7 +168,7 @@ input[type="range"]::-moz-range-thumb { background: url('../images/speaker.svg') center no-repeat, var(--color-5); background-position: center; background-size: 20px; - border-radius: 30px; + border-radius: 15px; outline: 4px solid var(--color-5); outline-offset: -3px; /* slider progress trick */ @@ -279,7 +279,7 @@ input[type="range"]::-moz-range-thumb { position: absolute; left: 0; top: -2px; - border-radius: 30px; + border-radius: 15px; -webkit-transition: all 0.2s ease-out; -moz-transition: all 0.2s ease-out; transition: all 0.2s ease-out; diff --git a/web/css/helpers.css b/web/css/helpers.css index 701c78b..3215c7e 100644 --- a/web/css/helpers.css +++ b/web/css/helpers.css @@ -242,7 +242,7 @@ display: none; } .m-0 { - margin: auto; + margin: auto !important; } } diff --git a/web/css/main.css b/web/css/main.css index f1bb68c..45136c4 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -46,19 +46,31 @@ body { font-family: 'Titillium Web', sans-serif; color: var(--color-text); background: var(--color-main); - background-blend-mode: multiply; background-repeat: no-repeat; background-position: center; background-size: cover; transition: 0.3s ease-in-out background-color; margin: 0 auto; + min-height: 100%; +} + +#wrapper-outer { + width: 100%; + height: auto; + background-color: var(--color-main); + display: flex; + align-items: center; + justify-content: center; + min-height:100vh; +} + +.wrapper-outer-static { + display: block !important; + padding-top: 10px; + padding-bottom: 10px; } #wrapper { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); width: 1180px; max-width: 1180px; } @@ -82,7 +94,7 @@ hr { } .table-big { - border-radius: 30px; + border-radius: 15px; background-color: var(--color-2); padding: 20px; margin: auto; @@ -109,11 +121,11 @@ hr { .table-big th:nth-child(1) { - border-radius: 30px 0px 0px 30px; + border-radius: 15px 0px 0px 15px; } .table-big th:nth-last-child(1){ - border-radius: 0px 30px 30px 0px; + border-radius: 0px 15px 15px 0px; } @media (max-width: 1180px) { diff --git a/web/css/modal.css b/web/css/modal.css index a3bc0d9..89b026d 100644 --- a/web/css/modal.css +++ b/web/css/modal.css @@ -22,7 +22,7 @@ transform: translate(-50%, -50%); background-color: var(--color-main); padding: 30px; - border-radius: 30px; + border-radius: 15px; opacity: 1; transition: opacity 0.3s ease-in-out; /* Fade-in/out transition */ z-index: 21; /* Ensure the modal content is above the modal background */ @@ -56,7 +56,7 @@ right: 35px; width: 100px; height: 48px; - border-radius: 30px; + border-radius: 15px; background: var(--color-4); font-weight: bold; border: 0; @@ -135,12 +135,12 @@ text-align: center; display: none; background-color: var(--color-main); - border-radius: 30px 30px 0px 0px; + border-radius: 15px 15px 0px 0px; } .modal-panel-chat .modal-panel-sidebar { width: 100%; - border-radius: 30px 30px 0px 0px; + border-radius: 15px 15px 0px 0px; } @media only screen and (max-width: 768px) { diff --git a/web/css/multiselect.css b/web/css/multiselect.css index be45c53..345d71e 100644 --- a/web/css/multiselect.css +++ b/web/css/multiselect.css @@ -3,7 +3,7 @@ height: 320px; background-color: var(--color-2); padding: 8px 16px; - border-radius: 30px; + border-radius: 15px; padding: 20px; } diff --git a/web/css/panels.css b/web/css/panels.css index 455dff4..75a9e1a 100644 --- a/web/css/panels.css +++ b/web/css/panels.css @@ -2,15 +2,14 @@ background-color: var(--color-1); margin-left: 10px; margin-right: 10px; - border-radius: 30px; + border-radius: 15px; text-align: center; - margin-top: 30px; + margin-top: 20px; transition: 0.3s ease-in-out background-color; } .panel-10 { width: 10%; - margin-top: 30px; } .panel-33 { diff --git a/web/css/setup.css b/web/css/setup.css index e6de6cd..34e92e5 100644 --- a/web/css/setup.css +++ b/web/css/setup.css @@ -30,7 +30,7 @@ ul.nav { list-style-type: none; padding: 15px 0; background: var(--color-2); - border-radius: 30px; + border-radius: 15px; } ul.nav li { @@ -98,7 +98,7 @@ li.active { color: var(--color-main); margin: 0px 10px; padding: 15px 35px; - border-radius: 30px; + border-radius: 15px; min-width: fit-content; } } \ No newline at end of file diff --git a/web/index.ejs b/web/index.ejs index 37f0595..b8602d9 100644 --- a/web/index.ejs +++ b/web/index.ejs @@ -36,9 +36,10 @@
+You are logged in as an adminstrator.
- Setup • Logout
-
You are logged in as an adminstrator.
+You are logged in and can control the receiver.
Logout
You are logged in and can control the receiver.
Logout