Compare commits
5 commits
Author | SHA1 | Date | |
---|---|---|---|
f5a9133cab | |||
22c5bb2bee | |||
20d0b04499 | |||
8389ed8e36 | |||
a4d629d664 |
10 changed files with 410 additions and 376 deletions
|
@ -25,10 +25,10 @@
|
||||||
export let invalid: boolean | undefined = undefined;
|
export let invalid: boolean | undefined = undefined;
|
||||||
export let minlength: string | undefined = undefined;
|
export let minlength: string | undefined = undefined;
|
||||||
export let onChange: (() => void) | undefined = undefined;
|
export let onChange: (() => void) | undefined = undefined;
|
||||||
export let onInput: (() => void) | undefined = undefined;
|
export let onInput: ((e: Event) => void) | undefined = undefined;
|
||||||
|
|
||||||
const onInputHandler = () => {
|
const onInputHandler = (e: Event) => {
|
||||||
onInput?.();
|
onInput?.(e);
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,8 @@
|
||||||
: font.charAt(0).toUpperCase() + font.slice(1),
|
: font.charAt(0).toUpperCase() + font.slice(1),
|
||||||
font
|
font
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
let timePerScreen = $settings.timePerScreen;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Row>
|
<Row>
|
||||||
|
@ -61,7 +63,8 @@
|
||||||
<SettingsInput
|
<SettingsInput
|
||||||
id="timePerScreen"
|
id="timePerScreen"
|
||||||
label={$_('section.settings.timePerScreen')}
|
label={$_('section.settings.timePerScreen')}
|
||||||
bind:value={$settings.timePerScreen}
|
bind:value={timePerScreen}
|
||||||
|
onInput={(e) => ($settings.timePerScreen = Number(e.target.value))}
|
||||||
type="number"
|
type="number"
|
||||||
min={1}
|
min={1}
|
||||||
step={1}
|
step={1}
|
||||||
|
@ -69,7 +72,6 @@
|
||||||
suffix={$_('time.minutes')}
|
suffix={$_('time.minutes')}
|
||||||
size={$uiSettings.inputSize}
|
size={$uiSettings.inputSize}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<SettingsInput
|
<SettingsInput
|
||||||
id="fullRefreshMin"
|
id="fullRefreshMin"
|
||||||
label={$_('section.settings.fullRefreshEvery')}
|
label={$_('section.settings.fullRefreshEvery')}
|
||||||
|
|
|
@ -285,6 +285,20 @@
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
</Row>
|
</Row>
|
||||||
|
<Row>
|
||||||
|
<SettingsSwitch
|
||||||
|
id="screenRestoreZap"
|
||||||
|
bind:checked={$settings.scrnRestoreZap}
|
||||||
|
label={$_('section.settings.screenRestoreZap', {
|
||||||
|
default: 'Restore previous screen state after zap (Uses {setting} setting)',
|
||||||
|
values: {
|
||||||
|
setting: $_('section.settings.timePerScreen')
|
||||||
|
}
|
||||||
|
})}
|
||||||
|
size={$uiSettings.inputSize}
|
||||||
|
col={{ md: '12', xl: '12', xxl: '12' }}
|
||||||
|
/>
|
||||||
|
</Row>
|
||||||
<SettingsInput
|
<SettingsInput
|
||||||
id="nostrZapPubkey"
|
id="nostrZapPubkey"
|
||||||
label={$_('section.settings.nostrZapPubkey')}
|
label={$_('section.settings.nostrZapPubkey')}
|
||||||
|
|
|
@ -73,7 +73,8 @@
|
||||||
"dndStartHour": "Startstunde",
|
"dndStartHour": "Startstunde",
|
||||||
"dndStartMinute": "Startminute",
|
"dndStartMinute": "Startminute",
|
||||||
"dndEndHour": "Endstunde",
|
"dndEndHour": "Endstunde",
|
||||||
"dndEndMinute": "Schlussminute"
|
"dndEndMinute": "Schlussminute",
|
||||||
|
"screenRestoreZap": "Vorherigen Bildschirmzustand nach Zap wieder herstellen (Verwendet {setting} Einstellung)"
|
||||||
},
|
},
|
||||||
"control": {
|
"control": {
|
||||||
"systemInfo": "Systeminfo",
|
"systemInfo": "Systeminfo",
|
||||||
|
@ -88,7 +89,8 @@
|
||||||
"hostname": "Hostname",
|
"hostname": "Hostname",
|
||||||
"frontlight": "Displaybeleuchtung",
|
"frontlight": "Displaybeleuchtung",
|
||||||
"turnOn": "Einschalten",
|
"turnOn": "Einschalten",
|
||||||
"flashFrontlight": "Blinken"
|
"flashFrontlight": "Blinken",
|
||||||
|
"fwCommitMismatch": "Die Firmware -Version unterscheidet sich von der WebUI -Version, dies kann zu Problemen führen."
|
||||||
},
|
},
|
||||||
"status": {
|
"status": {
|
||||||
"title": "Status",
|
"title": "Status",
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
"dataSource": {
|
"dataSource": {
|
||||||
"label": "Data Source",
|
"label": "Data Source",
|
||||||
"btclock": "BTClock Data Source",
|
"btclock": "BTClock Data Source",
|
||||||
"thirdParty": "mempool.space/coincap.io",
|
"thirdParty": "mempool.space/Kraken",
|
||||||
"nostr": "Nostr publisher",
|
"nostr": "Nostr publisher",
|
||||||
"custom": "Custom Endpoint"
|
"custom": "Custom Endpoint"
|
||||||
},
|
},
|
||||||
|
@ -90,7 +90,8 @@
|
||||||
"dndStartHour": "Start hour",
|
"dndStartHour": "Start hour",
|
||||||
"dndStartMinute": "Start minute",
|
"dndStartMinute": "Start minute",
|
||||||
"dndEndHour": "End hour",
|
"dndEndHour": "End hour",
|
||||||
"dndEndMinute": "End minute"
|
"dndEndMinute": "End minute",
|
||||||
|
"screenRestoreZap": "Restore previous screen state after zap (Uses {setting} setting)"
|
||||||
},
|
},
|
||||||
"control": {
|
"control": {
|
||||||
"systemInfo": "System info",
|
"systemInfo": "System info",
|
||||||
|
@ -107,7 +108,8 @@
|
||||||
"turnOn": "Turn on",
|
"turnOn": "Turn on",
|
||||||
"flashFrontlight": "Flash",
|
"flashFrontlight": "Flash",
|
||||||
"firmwareUpdate": "Firmware update",
|
"firmwareUpdate": "Firmware update",
|
||||||
"fwCommit": "Firmware commit"
|
"fwCommit": "Firmware commit",
|
||||||
|
"fwCommitMismatch": "The firmware version is different from the WebUI version, this might cause problems. "
|
||||||
},
|
},
|
||||||
"status": {
|
"status": {
|
||||||
"title": "Status",
|
"title": "Status",
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
"section": {
|
"section": {
|
||||||
"displaysAndLed": "Pantallas y LED",
|
"displaysAndLed": "Pantallas y LED",
|
||||||
"screenSettings": "Específico de la pantalla",
|
"screenSettings": "Específico de la pantalla",
|
||||||
"dataSource": "fuente de datos",
|
"dataSource": "Fuente de datos",
|
||||||
"extraFeatures": "Funciones adicionales",
|
"extraFeatures": "Funciones adicionales",
|
||||||
"system": "Sistema"
|
"system": "Sistema"
|
||||||
},
|
},
|
||||||
|
@ -72,7 +72,8 @@
|
||||||
"dndStartHour": "Hora de inicio",
|
"dndStartHour": "Hora de inicio",
|
||||||
"dndStartMinute": "Minuto de inicio",
|
"dndStartMinute": "Minuto de inicio",
|
||||||
"dndEndHour": "Hora final",
|
"dndEndHour": "Hora final",
|
||||||
"dndEndMinute": "Minuto final"
|
"dndEndMinute": "Minuto final",
|
||||||
|
"screenRestoreZap": "Restaurar el estado de pantalla anterior después de Zap (Usa la configuración {setting})"
|
||||||
},
|
},
|
||||||
"control": {
|
"control": {
|
||||||
"turnOff": "Apagar",
|
"turnOff": "Apagar",
|
||||||
|
@ -87,7 +88,8 @@
|
||||||
"hostname": "Nombre del host",
|
"hostname": "Nombre del host",
|
||||||
"turnOn": "Encender",
|
"turnOn": "Encender",
|
||||||
"frontlight": "Luz de la pantalla",
|
"frontlight": "Luz de la pantalla",
|
||||||
"flashFrontlight": "Luz intermitente"
|
"flashFrontlight": "Luz intermitente",
|
||||||
|
"fwCommitMismatch": "La versión de firmware es diferente de la versión WebUI, esto podría causar problemas."
|
||||||
},
|
},
|
||||||
"status": {
|
"status": {
|
||||||
"memoryFree": "Memoria RAM libre",
|
"memoryFree": "Memoria RAM libre",
|
||||||
|
|
|
@ -64,7 +64,8 @@
|
||||||
"dndStartHour": "Begin uur",
|
"dndStartHour": "Begin uur",
|
||||||
"dndStartMinute": "Beginminuut",
|
"dndStartMinute": "Beginminuut",
|
||||||
"dndEndHour": "Eind uur",
|
"dndEndHour": "Eind uur",
|
||||||
"dndEndMinute": "Einde minuut"
|
"dndEndMinute": "Einde minuut",
|
||||||
|
"screenRestoreZap": "Herstel vorige schermstatus na zap (Gebruikt {setting} instelling)"
|
||||||
},
|
},
|
||||||
"control": {
|
"control": {
|
||||||
"systemInfo": "Systeeminformatie",
|
"systemInfo": "Systeeminformatie",
|
||||||
|
@ -78,7 +79,8 @@
|
||||||
"title": "Besturing",
|
"title": "Besturing",
|
||||||
"frontlight": "Displaylicht",
|
"frontlight": "Displaylicht",
|
||||||
"turnOn": "Aanzetten",
|
"turnOn": "Aanzetten",
|
||||||
"flashFrontlight": "Knipper"
|
"flashFrontlight": "Knipper",
|
||||||
|
"fwCommitMismatch": "De firmwareversie verschilt van de WebUI -versie, dit kan problemen veroorzaken."
|
||||||
},
|
},
|
||||||
"status": {
|
"status": {
|
||||||
"title": "Status",
|
"title": "Status",
|
||||||
|
|
|
@ -13,9 +13,8 @@
|
||||||
import { uiSettings } from '$lib/uiSettings';
|
import { uiSettings } from '$lib/uiSettings';
|
||||||
|
|
||||||
let settings = writable({
|
let settings = writable({
|
||||||
fgColor: '0',
|
isLoaded: false,
|
||||||
bgColor: '0',
|
timePerScreen: 0
|
||||||
isLoaded: false
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let status = writable({
|
let status = writable({
|
||||||
|
|
|
@ -13,7 +13,8 @@
|
||||||
Form,
|
Form,
|
||||||
Input,
|
Input,
|
||||||
Label,
|
Label,
|
||||||
Row
|
Row,
|
||||||
|
Alert
|
||||||
} from '@sveltestrap/sveltestrap';
|
} from '@sveltestrap/sveltestrap';
|
||||||
import FirmwareUpdater from './FirmwareUpdater.svelte';
|
import FirmwareUpdater from './FirmwareUpdater.svelte';
|
||||||
import { uiSettings } from '$lib/uiSettings';
|
import { uiSettings } from '$lib/uiSettings';
|
||||||
|
@ -226,6 +227,11 @@
|
||||||
<li>WebUI commit: <Placeholder value={$settings.fsRev} /></li>
|
<li>WebUI commit: <Placeholder value={$settings.fsRev} /></li>
|
||||||
<li>{$_('section.control.hostname')}: <Placeholder value={$settings.hostname} /></li>
|
<li>{$_('section.control.hostname')}: <Placeholder value={$settings.hostname} /></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
{#if $settings.gitRev != $settings.fsRev}
|
||||||
|
<Alert color="warning">
|
||||||
|
⚠️ <strong>{$_('warning')}</strong>: {$_('section.control.fwCommitMismatch')}
|
||||||
|
</Alert>
|
||||||
|
{/if}
|
||||||
<Row>
|
<Row>
|
||||||
<Col class="d-flex justify-content-end">
|
<Col class="d-flex justify-content-end">
|
||||||
<Button color="danger" id="restartBtn" on:click={restartClock}
|
<Button color="danger" id="restartBtn" on:click={restartClock}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue