Merge pull request #27 from owendaprile/master

More web interface spelling fixes + a little improvement
This commit is contained in:
Maxim Devaev 2021-02-07 22:57:47 +03:00 committed by GitHub
commit 7fa8b6011d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 8 deletions

View File

@ -37,9 +37,15 @@ export function Atx() {
$("atx-hdd-led").title = "Disk Activity Led";
for (let args of [
["atx-power-button", "power", "Are you sure to click the power button?"],
["atx-power-button-long", "power_long", "Are you sure to perform the long press of the power button?"],
["atx-reset-button", "reset", "Are you sure to reboot the server?"],
["atx-power-button", "power", "Are you sure you want to press the power button?"],
["atx-power-button-long", "power_long", `
Are you sure you want to long press the power button?<br>
(Warning! This could cause data loss on the server.)
`],
["atx-reset-button", "reset", `
Are you sure you want to press the reset button?<br>
(Warning! This could case data loss on the server.)
`],
]) {
tools.setOnClick($(args[0]), () => __clickButton(args[1], args[2]));
}

View File

@ -123,7 +123,7 @@ export function Gpio() {
`;
} else if (item.type === "output") {
let controls = [];
let confirm = (item.confirm ? "Are you sure to act this control?" : "");
let confirm = (item.confirm ? "Are you sure you want to perform this action?" : "");
if (item.scheme["switch"]) {
controls.push(`
<td><div class="switch-box">

View File

@ -196,10 +196,10 @@ export function Hid() {
var __clickPasteAsKeysButton = function() {
let text = $("hid-pak-text").value.replace(/[^\x00-\x7F]/g, ""); // eslint-disable-line no-control-regex
if (text) {
let confirm_msg = `
You're going to paste ${text.length} characters.<br>
Are you sure you want to continue?
`;
let confirm_msg = text.length !== 1 ?
`You're going to paste ${text.length} characters.<br>` :
`You're going to paste ${text.length} character.<br>`;
confirm_msg += "Are you sure you want to continue?";
wm.confirm(confirm_msg).then(function(ok) {
if (ok) {

View File

@ -190,6 +190,7 @@ export function Session() {
__ws.onerror = __wsErrorHandler;
__ws.onclose = __wsCloseHandler;
} else if (http.status === 401 || http.status === 403) {
window.onbeforeunload = () => null;
wm.error("Unexpected logout occured, please login again").then(function() {
document.location.href = "/login";
});