From 14f6669314c0bfa334a1c9fe7cc0077530f93dbf Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 13 Dec 2023 19:40:07 +0100 Subject: [PATCH] webapp: Beautify and unify form footers --- webapp/src/components/FormFooter.vue | 7 +++++++ webapp/src/locales/de.json | 24 ++++++++++-------------- webapp/src/locales/en.json | 24 ++++++++++-------------- webapp/src/locales/fr.json | 20 +++++++++----------- webapp/src/views/DeviceAdminView.vue | 4 +++- webapp/src/views/DtuAdminView.vue | 4 +++- webapp/src/views/MqttAdminView.vue | 4 +++- webapp/src/views/NetworkAdminView.vue | 4 +++- webapp/src/views/NtpAdminView.vue | 4 +++- webapp/src/views/SecurityAdminView.vue | 4 +++- 10 files changed, 54 insertions(+), 45 deletions(-) create mode 100644 webapp/src/components/FormFooter.vue diff --git a/webapp/src/components/FormFooter.vue b/webapp/src/components/FormFooter.vue new file mode 100644 index 00000000..7a18e602 --- /dev/null +++ b/webapp/src/components/FormFooter.vue @@ -0,0 +1,7 @@ + diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json index f9eea89d..5018ff45 100644 --- a/webapp/src/locales/de.json +++ b/webapp/src/locales/de.json @@ -24,7 +24,9 @@ }, "base": { "Loading": "Lade...", - "Reload": "Aktualisieren" + "Reload": "Aktualisieren", + "Cancel": "Abbrechen", + "Save": "Speichern" }, "localeswitcher": { "Dark": "Dunkel", @@ -330,7 +332,7 @@ "DeviceReboot": "Gerät neu starten", "PerformReboot": "Neustart durchführen", "Reboot": "Neustarten!", - "Cancel": "Abbrechen", + "Cancel": "@:base.Cancel", "RebootOpenDTU": "OpenDTU neustarten", "RebootQuestion": "Möchten Sie das Gerät wirklich neu starten?", "RebootHint": "Hinweis: Ein manueller Neustart muss normalerweise nicht durchgeführt werden. OpenDTU führt jeden erforderlichen Neustart (z. B. nach einem Firmware-Update) automatisch durch. Einstellungen werden auch ohne Neustart übernommen. Wenn Sie aufgrund eines Fehlers einen Neustart durchführen müssen, denken Sie bitte daran, diesen unter https://github.com/tbnobody/OpenDTU/issues zu melden." @@ -351,7 +353,6 @@ "CmtFrequencyWarning": "Die ausgewählte Frequenz befindet außerhalb des in der EU zugelassenen Bereiches. Vergewissere dich, dass mit dieser Auswahl keine lokalen Regularien verletzt werden.", "MHz": "{mhz} MHz", "dBm": "{dbm} dBm", - "Save": "Speichern", "Min": "Minimum ({db} dBm)", "Low": "Niedrig ({db} dBm)", "High": "Hoch ({db} dBm)", @@ -364,8 +365,7 @@ "RepeatPassword": "Passwort wiederholen:", "PasswordHint": "Hinweis: Das Administrator-Passwort wird für den Zugriff auf die Webschnittstelle (Benutzer 'admin'), aber auch für die Verbindung mit dem Gerät im AP-Modus verwendet. Es muss zwischen 8 und 64 Zeichen lang sein.", "Permissions": "Berechtigungen", - "ReadOnly": "Nur-Lese-Zugriff auf die Weboberfläche ohne Passwort zulassen", - "Save": "@:dtuadmin.Save" + "ReadOnly": "Nur-Lese-Zugriff auf die Weboberfläche ohne Passwort zulassen" }, "ntpadmin": { "NtpSettings": "NTP-Einstellungen", @@ -383,7 +383,6 @@ "NAUTICAL": "Nautische Dämmerung (102°)", "CIVIL": "Bürgerliche Dämmerung (96°)", "ASTONOMICAL": "Astronomische Dämmerung (108°)", - "Save": "@:dtuadmin.Save", "ManualTimeSynchronization": "Manuelle Zeitsynchronization", "CurrentOpenDtuTime": "Aktuelle OpenDTU-Zeit:", "CurrentLocalTime": "Aktuelle lokale Zeit:", @@ -407,7 +406,6 @@ "ApTimeout": "AccessPoint Zeitlimit:", "ApTimeoutHint": "Zeit die der AccessPoint offen gehalten wird. Ein Wert von 0 bedeutet unendlich.", "Minutes": "Minuten", - "Save": "@:dtuadmin.Save", "EnableMdns": "mDNS aktivieren", "MdnsSettings": "mDNS-Einstellungen" }, @@ -451,8 +449,7 @@ "HassPrefixTopicHint": "The prefix for the discovery topic", "HassRetain": "Retain Flag aktivieren", "HassExpire": "Ablauffunktion aktivieren", - "HassIndividual": "Einzelne Paneele", - "Save": "@:dtuadmin.Save" + "HassIndividual": "Einzelne Paneele" }, "inverteradmin": { "InverterSettings": "Wechselrichter Einstellungen", @@ -495,8 +492,8 @@ "ZeroRuntimeHint": "Nulle Laufzeit Daten (keine Ertragsdaten), wenn der Wechselrichter nicht erreichbar ist.", "ZeroDay": "Nulle Tagesertrag um Mitternacht", "ZeroDayHint": "Das funktioniert nur wenn der Wechselrichter nicht erreichbar ist. Wenn Daten aus dem Wechselrichter gelesen werden, werden deren Werte verwendet. (Ein Reset erfolgt nur beim Neustarten)", - "Cancel": "@:maintenancereboot.Cancel", - "Save": "@:dtuadmin.Save", + "Cancel": "@:base.Cancel", + "Save": "@:base.Save", "DeleteMsg": "Soll der Wechselrichter \"{name}\" mit der Seriennummer {serial} wirklich gelöscht werden?", "Delete": "Löschen", "YieldDayCorrection": "Tagesertragskorrektur", @@ -519,7 +516,7 @@ "FactoryReset": "Werksreset", "ResetMsg": "Sind Sie sicher, dass Sie die aktuelle Konfiguration löschen und alle Einstellungen auf die Werkseinstellungen zurücksetzen möchten?", "ResetConfirm": "Werksreset!", - "Cancel": "@:maintenancereboot.Cancel" + "Cancel": "@:base.Cancel" }, "login": { "Login": "Anmeldung", @@ -586,8 +583,7 @@ "fr": "Französisch", "Leds": "LEDs", "EqualBrightness": "Gleiche Helligkeit:", - "LedBrightness": "LED {led} Helligkeit ({brightness}):", - "Save": "@:dtuadmin.Save" + "LedBrightness": "LED {led} Helligkeit ({brightness}):" }, "pininfo": { "PinOverview": "Anschlussübersicht", diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json index d7cd7b34..b8a6eb03 100644 --- a/webapp/src/locales/en.json +++ b/webapp/src/locales/en.json @@ -24,7 +24,9 @@ }, "base": { "Loading": "Loading...", - "Reload": "Reload" + "Reload": "Reload", + "Cancel": "Cancel", + "Save": "Save" }, "localeswitcher": { "Dark": "Dark", @@ -330,7 +332,7 @@ "DeviceReboot": "Device Reboot", "PerformReboot": "Perform Reboot", "Reboot": "Reboot!", - "Cancel": "Cancel", + "Cancel": "@:base.Cancel", "RebootOpenDTU": "Reboot OpenDTU", "RebootQuestion": "Do you really want to reboot the device?", "RebootHint": "Note: A manual reboot does not normally have to be performed. OpenDTU performs any required reboot (e.g. after a firmware update) automatically. Settings are also adopted without rebooting. If you need to reboot due to an error, please consider reporting it at https://github.com/tbnobody/OpenDTU/issues." @@ -351,7 +353,6 @@ "CmtFrequencyWarning": "The selected frequency is outside the range allowed in the EU. Make sure that this selection does not violate any local regulations.", "MHz": "{mhz} MHz", "dBm": "{dbm} dBm", - "Save": "Save", "Min": "Minimum ({db} dBm)", "Low": "Low ({db} dBm)", "High": "High ({db} dBm)", @@ -364,8 +365,7 @@ "RepeatPassword": "Repeat Password:", "PasswordHint": "Hint: The administrator password is used to access this web interface (user 'admin'), but also to connect to the device when in AP mode. It must be 8..64 characters.", "Permissions": "Permissions", - "ReadOnly": "Allow readonly access to web interface without password", - "Save": "@:dtuadmin.Save" + "ReadOnly": "Allow readonly access to web interface without password" }, "ntpadmin": { "NtpSettings": "NTP Settings", @@ -383,7 +383,6 @@ "NAUTICAL": "Nautical dawn (102°)", "CIVIL": "Civil dawn (96°)", "ASTONOMICAL": "Astronomical dawn (108°)", - "Save": "@:dtuadmin.Save", "ManualTimeSynchronization": "Manual Time Synchronization", "CurrentOpenDtuTime": "Current OpenDTU Time:", "CurrentLocalTime": "Current Local Time:", @@ -407,7 +406,6 @@ "ApTimeout": "AccessPoint Timeout:", "ApTimeoutHint": "Time which the AccessPoint is kept open. A value of 0 means infinite.", "Minutes": "minutes", - "Save": "@:dtuadmin.Save", "EnableMdns": "Enable mDNS", "MdnsSettings": "mDNS Settings" }, @@ -451,8 +449,7 @@ "HassPrefixTopicHint": "The prefix for the discovery topic", "HassRetain": "Enable Retain Flag", "HassExpire": "Enable Expiration", - "HassIndividual": "Individual Panels", - "Save": "@:dtuadmin.Save" + "HassIndividual": "Individual Panels" }, "inverteradmin": { "InverterSettings": "Inverter Settings", @@ -495,8 +492,8 @@ "ZeroRuntimeHint": "Zero runtime data (no yield data) if inverter becomes unreachable.", "ZeroDay": "Zero daily yield at midnight", "ZeroDayHint": "This only works if the inverter is unreachable. If data is read from the inverter, it's values will be used. (Reset only occours on power cycle)", - "Cancel": "@:maintenancereboot.Cancel", - "Save": "@:dtuadmin.Save", + "Cancel": "@:base.Cancel", + "Save": "@:base.Save", "DeleteMsg": "Are you sure you want to delete the inverter \"{name}\" with serial number {serial}?", "Delete": "Delete", "YieldDayCorrection": "Yield Day Correction", @@ -519,7 +516,7 @@ "FactoryReset": "Factory Reset", "ResetMsg": "Are you sure you want to delete the current configuration and reset all settings to their factory defaults?", "ResetConfirm": "Factory Reset!", - "Cancel": "@:maintenancereboot.Cancel" + "Cancel": "@:base.Cancel" }, "login": { "Login": "Login", @@ -586,8 +583,7 @@ "fr": "French", "Leds": "LEDs", "EqualBrightness": "Equal brightness:", - "LedBrightness": "LED {led} brightness ({brightness}):", - "Save": "@:dtuadmin.Save" + "LedBrightness": "LED {led} brightness ({brightness}):" }, "pininfo": { "PinOverview": "Connection overview", diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json index 8e6ed304..30abfc6e 100644 --- a/webapp/src/locales/fr.json +++ b/webapp/src/locales/fr.json @@ -24,7 +24,9 @@ }, "base": { "Loading": "Chargement...", - "Reload": "Reload" + "Reload": "Reload", + "Cancel": "Annuler", + "Save": "Sauvegarder" }, "localeswitcher": { "Dark": "Sombre", @@ -330,7 +332,7 @@ "DeviceReboot": "Redémarrage de l'appareil", "PerformReboot": "Effectuer un redémarrage", "Reboot": "Redémarrer !", - "Cancel": "Annuler", + "Cancel": "@:base.Cancel", "RebootOpenDTU": "Redémarrer OpenDTU", "RebootQuestion": "Voulez-vous vraiment redémarrer l'appareil ?", "RebootHint": "Astuce : Normalement, il n'est pas nécessaire de procéder à un redémarrage manuel. OpenDTU effectue automatiquement tout redémarrage nécessaire (par exemple, après une mise à jour du firmware). Les paramètres sont également adoptés sans redémarrage. Si vous devez redémarrer en raison d'une erreur, veuillez envisager de la signaler à l'adresse suivante https://github.com/tbnobody/OpenDTU/issues." @@ -351,7 +353,6 @@ "CmtFrequencyWarning": "The selected frequency is outside the range allowed in the EU. Make sure that this selection does not violate any local regulations.", "MHz": "{mhz} MHz", "dBm": "{dbm} dBm", - "Save": "Sauvegarder", "Min": "Minimum ({db} dBm)", "Low": "Bas ({db} dBm)", "High": "Haut ({db} dBm)", @@ -364,8 +365,7 @@ "RepeatPassword": "Répéter le mot de passe", "PasswordHint": "Astuce : Le mot de passe administrateur est utilisé pour accéder à cette interface web (utilisateur 'admin'), mais aussi pour se connecter à l'appareil en mode AP. Il doit comporter de 8 à 64 caractères.", "Permissions": "Autorisations", - "ReadOnly": "Autoriser l'accès en lecture seule à l'interface web sans mot de passe", - "Save": "@:dtuadmin.Save" + "ReadOnly": "Autoriser l'accès en lecture seule à l'interface web sans mot de passe" }, "ntpadmin": { "NtpSettings": "Paramètres NTP", @@ -383,7 +383,6 @@ "NAUTICAL": "Nautical dawn (102°)", "CIVIL": "Civil dawn (96°)", "ASTONOMICAL": "Astronomical dawn (108°)", - "Save": "@:dtuadmin.Save", "ManualTimeSynchronization": "Synchronisation manuelle de l'heure", "CurrentOpenDtuTime": "Heure actuelle de l'OpenDTU", "CurrentLocalTime": "Heure locale actuelle", @@ -495,8 +494,8 @@ "ZeroRuntimeHint": "Zero runtime data (no yield data) if inverter becomes unreachable.", "ZeroDay": "Zero daily yield at midnight", "ZeroDayHint": "This only works if the inverter is unreachable. If data is read from the inverter, it's values will be used. (Reset only occours on power cycle)", - "Cancel": "@:maintenancereboot.Cancel", - "Save": "@:dtuadmin.Save", + "Cancel": "@:base.Cancel", + "Save": "@:base.Save", "DeleteMsg": "Êtes-vous sûr de vouloir supprimer l'onduleur \"{name}\" avec le numéro de série \"{serial}\" ?", "Delete": "Supprimer", "YieldDayCorrection": "Yield Day Correction", @@ -519,7 +518,7 @@ "FactoryReset": "Remise à zéro", "ResetMsg": "Êtes-vous sûr de vouloir supprimer la configuration actuelle et réinitialiser tous les paramètres à leurs valeurs par défaut ?", "ResetConfirm": "Remise à zéro !", - "Cancel": "@:maintenancereboot.Cancel" + "Cancel": "@:base.Cancel" }, "login": { "Login": "Connexion", @@ -586,8 +585,7 @@ "fr": "Français", "Leds": "LEDs", "EqualBrightness": "Même luminosité:", - "LedBrightness": "LED {led} luminosité ({brightness}):", - "Save": "@:dtuadmin.Save" + "LedBrightness": "LED {led} luminosité ({brightness}):" }, "pininfo": { "PinOverview": "Vue d'ensemble des connexions", diff --git a/webapp/src/views/DeviceAdminView.vue b/webapp/src/views/DeviceAdminView.vue index bcf3d40b..ba6096df 100644 --- a/webapp/src/views/DeviceAdminView.vue +++ b/webapp/src/views/DeviceAdminView.vue @@ -123,7 +123,7 @@ - + @@ -132,6 +132,7 @@