From 662315be2b5f6153fda03e8ec48ea3f8b343f68b Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 21 Mar 2018 11:05:25 +0100 Subject: Update permission translations --- modules-available/serversetup-bwlp/lang/de/permissions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules-available/serversetup-bwlp/lang/de') diff --git a/modules-available/serversetup-bwlp/lang/de/permissions.json b/modules-available/serversetup-bwlp/lang/de/permissions.json index 673bf153..65367c51 100644 --- a/modules-available/serversetup-bwlp/lang/de/permissions.json +++ b/modules-available/serversetup-bwlp/lang/de/permissions.json @@ -1,5 +1,5 @@ { - "edit.address": "Boot-Adresse des Servers auswählen.", - "edit.menu": "Bootmenü anpassen.", - "download": "USB-Image herunteladen." + "download": "USB-Image herunterladen.", + "edit.address": "Boot-Adresse des Servers ausw\u00e4hlen.", + "edit.menu": "Bootmen\u00fc anpassen." } \ No newline at end of file -- cgit v1.2.3-55-g7522 From a7198124169059d32da12487a067a05c8507ef3c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 10 Apr 2018 13:02:50 +0200 Subject: Update translations --- modules-available/adduser/lang/de/permissions.json | 4 ++-- modules-available/adduser/lang/en/permissions.json | 4 ++-- .../locationinfo/lang/de/backend-exchange.json | 14 ++++++++++++++ .../locationinfo/lang/en/backend-exchange.json | 14 ++++++++++++++ modules-available/news/lang/de/permissions.json | 9 +++++---- modules-available/news/lang/en/permissions.json | 9 +++++---- .../serversetup-bwlp/lang/de/permissions.json | 1 + .../serversetup-bwlp/lang/en/permissions.json | 7 ++++--- modules-available/webinterface/lang/de/permissions.json | 7 ++++--- modules-available/webinterface/lang/en/permissions.json | 7 ++++--- 10 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 modules-available/locationinfo/lang/de/backend-exchange.json create mode 100644 modules-available/locationinfo/lang/en/backend-exchange.json (limited to 'modules-available/serversetup-bwlp/lang/de') diff --git a/modules-available/adduser/lang/de/permissions.json b/modules-available/adduser/lang/de/permissions.json index 636b73ff..8792ac14 100644 --- a/modules-available/adduser/lang/de/permissions.json +++ b/modules-available/adduser/lang/de/permissions.json @@ -1,6 +1,6 @@ { - "list.view": "Nutzerliste anzeigen", "user.add": "Neuen Nutzer hinzuf\u00fcgen", "user.edit": "Nutzer bearbeiten", - "user.remove": "Nutzer l\u00f6schen" + "user.remove": "Nutzer l\u00f6schen", + "user.view-list": "Nutzerliste anzeigen" } \ No newline at end of file diff --git a/modules-available/adduser/lang/en/permissions.json b/modules-available/adduser/lang/en/permissions.json index d12d100e..ed3d8ee3 100644 --- a/modules-available/adduser/lang/en/permissions.json +++ b/modules-available/adduser/lang/en/permissions.json @@ -1,6 +1,6 @@ { - "list.view": "Show userlist", "user.add": "Add new user", "user.edit": "Edit user", - "user.remove": "Remove user" + "user.remove": "Remove user", + "user.view-list": "Show userlist" } \ No newline at end of file diff --git a/modules-available/locationinfo/lang/de/backend-exchange.json b/modules-available/locationinfo/lang/de/backend-exchange.json new file mode 100644 index 00000000..51b4ed37 --- /dev/null +++ b/modules-available/locationinfo/lang/de/backend-exchange.json @@ -0,0 +1,14 @@ +{ + "clientVersion": "Version", + "clientVersion_helptext": "Eingesetzte Exchange Version", + "password": "Passwort", + "password_helptext": "Passwort des Nutzers in Exchange", + "serverAddress": "Server-IP", + "serverAddress_helptext": "IP-Adresse des Exchange Servers", + "username": "Benutzername", + "username_helptext": "Benutzer muss mind. Reviewer Rechte auf Kalender besitzen", + "verifyCert": "Zertifikat pr\u00fcfen", + "verifyCert_helptext": "Wenn das Zertifikat abgelaufen ist, oder von keiner bekannten CA ausgestellt wurde, wird die Verbindung abgelehnt.", + "verifyHostname": "Hostnamen pr\u00fcfen", + "verifyHostname_helptext": "Der im Zertifikat angegebene Hostname muss mit dem Hostnamen aus der URL \u00fcbereinstimmen, sonst wird die Verbindung abgelehnt." +} \ No newline at end of file diff --git a/modules-available/locationinfo/lang/en/backend-exchange.json b/modules-available/locationinfo/lang/en/backend-exchange.json new file mode 100644 index 00000000..b3025d88 --- /dev/null +++ b/modules-available/locationinfo/lang/en/backend-exchange.json @@ -0,0 +1,14 @@ +{ + "clientVersion": "Version", + "clientVersion_helptext": "Used exchange version", + "password": "Password", + "password_helptext": "User password in exchange", + "serverAddress": "Server-IP", + "serverAddress_helptext": "IP of the exchange server", + "username": "Username", + "username_helptext": "User needs at least reviewer rights on calendar", + "verifyCert": "Verify certificate", + "verifyCert_helptext": "If the certificate expired or was not signed by a known CA, the connection will be aborted", + "verifyHostname": "Verify host name", + "verifyHostname_helptext": "The certificate's host name must match the host name given in the URL, otherwise the connection will be aborted." +} \ No newline at end of file diff --git a/modules-available/news/lang/de/permissions.json b/modules-available/news/lang/de/permissions.json index b2c6fb1b..888bb4a7 100644 --- a/modules-available/news/lang/de/permissions.json +++ b/modules-available/news/lang/de/permissions.json @@ -1,6 +1,7 @@ { - "news.save": "Änderungen am News Text speichern.", - "news.delete": "Alte News Texte löschen.", - "help.save": "Änderungen am Hilfe Text speichern.", - "help.delete": "Alte Hilfe Texte löschen." + "access-page": "Seite sehen.", + "help.delete": "Alte Hilfe Texte l\u00f6schen.", + "help.save": "\u00c4nderungen am Hilfe Text speichern.", + "news.delete": "Alte News Texte l\u00f6schen.", + "news.save": "\u00c4nderungen am News Text speichern." } \ No newline at end of file diff --git a/modules-available/news/lang/en/permissions.json b/modules-available/news/lang/en/permissions.json index 90d07aef..37fc7a8e 100644 --- a/modules-available/news/lang/en/permissions.json +++ b/modules-available/news/lang/en/permissions.json @@ -1,6 +1,7 @@ { - "news.save": "Save new news.", - "news.delete": "Delete old news.", - "help.save": "Save new help texts.", - "help.delete": "Delete old help texts" + "access-page": "View page.", + "help.delete": "Delete old help texts.", + "help.save": "Save new help texts.", + "news.delete": "Delete old news.", + "news.save": "Save new news." } \ No newline at end of file diff --git a/modules-available/serversetup-bwlp/lang/de/permissions.json b/modules-available/serversetup-bwlp/lang/de/permissions.json index 65367c51..98baec3c 100644 --- a/modules-available/serversetup-bwlp/lang/de/permissions.json +++ b/modules-available/serversetup-bwlp/lang/de/permissions.json @@ -1,4 +1,5 @@ { + "access-page": "Seite sehen.", "download": "USB-Image herunterladen.", "edit.address": "Boot-Adresse des Servers ausw\u00e4hlen.", "edit.menu": "Bootmen\u00fc anpassen." diff --git a/modules-available/serversetup-bwlp/lang/en/permissions.json b/modules-available/serversetup-bwlp/lang/en/permissions.json index c04f09f7..44d1c519 100644 --- a/modules-available/serversetup-bwlp/lang/en/permissions.json +++ b/modules-available/serversetup-bwlp/lang/en/permissions.json @@ -1,5 +1,6 @@ { - "edit.address": "Choose boot address of the server.", - "edit.menu": "Customize boot menu.", - "download": "Download USB Image." + "access-page": "View page.", + "download": "Download USB Image.", + "edit.address": "Choose boot address of the server.", + "edit.menu": "Customize boot menu." } \ No newline at end of file diff --git a/modules-available/webinterface/lang/de/permissions.json b/modules-available/webinterface/lang/de/permissions.json index ee96810a..213ebd8f 100644 --- a/modules-available/webinterface/lang/de/permissions.json +++ b/modules-available/webinterface/lang/de/permissions.json @@ -1,5 +1,6 @@ { - "edit.https": "HTTPS Einstellungen bearbeiten.", - "edit.password": "Ändern, ob Passwortfelder in der Web-Schnittstelle maskiert werden sollen.", - "edit.design": "Seitentitel und Hintergrundfarbe des Logos bearbeiten." + "access-page": "Seite sehen.", + "edit.design": "Seitentitel und Hintergrundfarbe des Logos bearbeiten.", + "edit.https": "HTTPS Einstellungen bearbeiten.", + "edit.password": "\u00c4ndern, ob Passwortfelder in der Web-Schnittstelle maskiert werden sollen." } \ No newline at end of file diff --git a/modules-available/webinterface/lang/en/permissions.json b/modules-available/webinterface/lang/en/permissions.json index caf6d0cb..8ebb2830 100644 --- a/modules-available/webinterface/lang/en/permissions.json +++ b/modules-available/webinterface/lang/en/permissions.json @@ -1,5 +1,6 @@ { - "edit.https": "Edit HTTPS settings.", - "edit.password": "Change whether password fields should be masked or not.", - "edit.design": "Edit page title and logo background color." + "access-page": "View page.", + "edit.design": "Edit page title and logo background color.", + "edit.https": "Edit HTTPS settings.", + "edit.password": "Change whether password fields should be masked or not." } \ No newline at end of file -- cgit v1.2.3-55-g7522 From 9b24161637553f3889d9a81344e6eec59dc6aa00 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 7 May 2018 17:34:35 +0200 Subject: [serversetup-bwlp] Add log output to ipxe building task --- inc/event.inc.php | 3 +-- inc/trigger.inc.php | 1 + .../serversetup-bwlp/lang/de/template-tags.json | 4 +++- .../serversetup-bwlp/lang/en/template-tags.json | 4 +++- modules-available/serversetup-bwlp/page.inc.php | 20 ++++++++++-------- .../serversetup-bwlp/templates/ipxe_update.html | 24 ++++++++++++++++++---- 6 files changed, 40 insertions(+), 16 deletions(-) (limited to 'modules-available/serversetup-bwlp/lang/de') diff --git a/inc/event.inc.php b/inc/event.inc.php index fe59b2b9..b1ee3663 100644 --- a/inc/event.inc.php +++ b/inc/event.inc.php @@ -98,8 +98,7 @@ class Event public static function serverIpChanged() { error_log('Server ip changed'); - global $tidIpxe; - $tidIpxe = Trigger::ipxe(); + Trigger::ipxe(); if (Module::isAvailable('sysconfig')) { // TODO: Modularize events ConfigModule::serverIpChanged(); } diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php index b49cafb0..93f57236 100644 --- a/inc/trigger.inc.php +++ b/inc/trigger.inc.php @@ -25,6 +25,7 @@ class Trigger $task = Taskmanager::submit('CompileIPxe', $data); if (!isset($task['id'])) return false; + Property::set('ipxe-task-id', $task['id'], 15); return $task['id']; } diff --git a/modules-available/serversetup-bwlp/lang/de/template-tags.json b/modules-available/serversetup-bwlp/lang/de/template-tags.json index f80febb0..74ab494b 100644 --- a/modules-available/serversetup-bwlp/lang/de/template-tags.json +++ b/modules-available/serversetup-bwlp/lang/de/template-tags.json @@ -21,9 +21,11 @@ "lang_menuCustomHint3": "und w\u00e4hlen Sie als Standard-Bootverhalten ebenfalls custom.", "lang_menuDisplayTime": "Anzeigedauer des Men\u00fcs", "lang_menuGeneration": "Erzeugen des Bootmen\u00fcs", - "lang_moduleHeading": "iPXE / Boot Menu", + "lang_moduleHeading": "iPXE \/ Boot Menu", + "lang_pxeBuilt": "PXE-Binary gebaut", "lang_seconds": "Sekunden", "lang_set": "Setzen", + "lang_usbBuilt": "USB-Image gebaut", "lang_usbImage": "USB-Image", "lang_usbImgHelp": "Mit dem USB-Image k\u00f6nnen Sie einen bootbaren USB-Stick erstellen, \u00fcber den sich bwLehrpool an Rechnern starten l\u00e4sst, die keinen Netzwerkboot unterst\u00fctzen, bzw. f\u00fcr die keine entsprechende DHCP-Konfiguration vorhanden ist. Dies erfordert dann lediglich, dass in der BIOS-Konfiguration des Rechners USB-Boot zugelassen ist. Der Stick dient dabei lediglich als Einstiegspunkt; es ist nach wie vor ein bwLehrpool-Satellitenserver f\u00fcr den eigentlichen Bootvorgang von N\u00f6ten.", "lang_usbImgHelpLinux": "Nutzen Sie dd, um das Image auf einen USB-Stick zu schreiben. Das Image enth\u00e4lt bereits eine Partitionstabelle, achten Sie daher darauf, dass Sie das Image z.B. nach \/dev\/sdx schreiben, und nicht nach \/dev\/sdx1", diff --git a/modules-available/serversetup-bwlp/lang/en/template-tags.json b/modules-available/serversetup-bwlp/lang/en/template-tags.json index 1948718b..7f519022 100644 --- a/modules-available/serversetup-bwlp/lang/en/template-tags.json +++ b/modules-available/serversetup-bwlp/lang/en/template-tags.json @@ -21,9 +21,11 @@ "lang_menuCustomHint3": "and select as the default boot behavior custom as well.", "lang_menuDisplayTime": "Menu Display Time", "lang_menuGeneration": "Generating boot menu...", - "lang_moduleHeading": "iPXE / Boot Menu", + "lang_moduleHeading": "iPXE \/ Boot Menu", + "lang_pxeBuilt": "Built PXE binary", "lang_seconds": "Seconds", "lang_set": "Set", + "lang_usbBuilt": "Built USB image", "lang_usbImage": "USB image", "lang_usbImgHelp": "The USB image can be used to create a bootable USB stick, which enables you to boot bwLehrpool without changing your DHCP settings or enabling network boot in the clients. The only requirement is that you enable USB boot in the client's BIOS. The USB stick is only used for bootstrapping, the actual bwLehrpool system is still loaded via network from your local bwLehrpool server.", "lang_usbImgHelpLinux": "On Linux you can simply use dd to write the image to a usb stick. The image already contains a partition table, so make sure you write the image to the device itself and not to an already existing partition (e.g. to \/dev\/sdx not \/dev\/sdx1)", diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php index 78096d7b..52b3afe4 100644 --- a/modules-available/serversetup-bwlp/page.inc.php +++ b/modules-available/serversetup-bwlp/page.inc.php @@ -54,9 +54,15 @@ class Page_ServerSetup extends Page protected function doRender() { Render::addTemplate("heading"); - $taskid = Request::any('taskid'); - if ($taskid !== false && Taskmanager::isTask($taskid)) { - Render::addTemplate('ipxe_update', array('taskid' => $taskid)); + $task = Property::get('ipxe-task-id'); + if ($task !== false) { + $task = Taskmanager::status($task); + if (!Taskmanager::isTask($task) || Taskmanager::isFinished($task)) { + $task = false; + } + } + if ($task !== false) { + Render::addTemplate('ipxe_update', array('taskid' => $task['id'])); } Permission::addGlobalTags($perms, null, ['edit.menu', 'edit.address', 'download']); @@ -137,9 +143,7 @@ class Page_ServerSetup extends Page } if ($valid) { Property::setServerIp($newAddress); - global $tidIpxe; - if (isset($tidIpxe) && $tidIpxe !== false) - Util::redirect('?do=ServerSetup&taskid=' . $tidIpxe); + Util::redirect('?do=ServerSetup'); } else { Message::addError('invalid-ip', $newAddress); } @@ -163,8 +167,8 @@ class Page_ServerSetup extends Page else $this->currentMenu['masterpassword'] = Crypto::hash6($this->currentMenu['masterpasswordclear']); Property::setBootMenu($this->currentMenu); - $id = Trigger::ipxe(); - Util::redirect('?do=ServerSetup&taskid=' . $id); + Trigger::ipxe(); + Util::redirect('?do=ServerSetup'); } private function handleGetImage() diff --git a/modules-available/serversetup-bwlp/templates/ipxe_update.html b/modules-available/serversetup-bwlp/templates/ipxe_update.html index 9c598667..e7ba5ffa 100644 --- a/modules-available/serversetup-bwlp/templates/ipxe_update.html +++ b/modules-available/serversetup-bwlp/templates/ipxe_update.html @@ -1,20 +1,36 @@
{{lang_bootentryTitle}} | +Hotkey | +{{lang_edit}} | +{{lang_delete}} | +
---|---|---|---|
+ {{title}} + | ++ {{hotkey}} + | ++ {{#allowEdit}} + + + + {{/allowEdit}} + | ++ {{#allowDelete}} + + {{/allowDelete}} + | +
{{lang_localBootIntro}}
+ + -- cgit v1.2.3-55-g7522 From 313d1c1dfb15de455cc5a8e4952eccfed5fba159 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 18 Jan 2019 16:57:16 +0100 Subject: [serversetup-bwlp] Fix saving default; add missing lang tag --- modules-available/serversetup-bwlp/api.inc.php | 2 +- modules-available/serversetup-bwlp/lang/de/template-tags.json | 1 + modules-available/serversetup-bwlp/page.inc.php | 3 ++- modules-available/serversetup-bwlp/templates/localboot.html | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'modules-available/serversetup-bwlp/lang/de') diff --git a/modules-available/serversetup-bwlp/api.inc.php b/modules-available/serversetup-bwlp/api.inc.php index d089584e..6da4c5df 100644 --- a/modules-available/serversetup-bwlp/api.inc.php +++ b/modules-available/serversetup-bwlp/api.inc.php @@ -106,7 +106,7 @@ if ($model !== false) { } } if ($localboot === false || !isset($BOOT_METHODS[$localboot])) { - $localboot = Property::get('serversetup.localboot', 'AUTO'); + $localboot = Property::get(Localboot::PROPERTY_KEY, 'AUTO'); if (!isset($BOOT_METHODS[$localboot])) { $localboot = 'AUTO'; } diff --git a/modules-available/serversetup-bwlp/lang/de/template-tags.json b/modules-available/serversetup-bwlp/lang/de/template-tags.json index 2b68b3fb..a242be5e 100644 --- a/modules-available/serversetup-bwlp/lang/de/template-tags.json +++ b/modules-available/serversetup-bwlp/lang/de/template-tags.json @@ -72,6 +72,7 @@ "lang_seconds": "Sekunden", "lang_set": "Setzen", "lang_spacer": "Abstandhalter\/\u00dcberschrift", + "lang_systemmodel": "System-Modell", "lang_title": "Titel", "lang_typeExecEntry": "Standardeintrag", "lang_typeScriptEntry": "Benutzerdefiniertes Script", diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php index 7766050b..6c32cb82 100644 --- a/modules-available/serversetup-bwlp/page.inc.php +++ b/modules-available/serversetup-bwlp/page.inc.php @@ -245,7 +245,7 @@ class Page_ServerSetup extends Page private function showLocalbootConfig() { // Default setting - $default = Property::get('serversetup.localboot', false); + $default = Property::get(Localboot::PROPERTY_KEY, 'AUTO'); if (!array_key_exists($default, Localboot::BOOT_METHODS)) { $default = 'AUTO'; } @@ -796,6 +796,7 @@ class Page_ServerSetup extends Page Message::addError('localboot-invalid-method', $default); return; } + Property::set(Localboot::PROPERTY_KEY, $default); $overrides = Request::post('override', [], 'array'); Database::exec('TRUNCATE TABLE serversetup_localboot'); foreach ($overrides as $model => $mode) { diff --git a/modules-available/serversetup-bwlp/templates/localboot.html b/modules-available/serversetup-bwlp/templates/localboot.html index 960f463d..3037de2a 100644 --- a/modules-available/serversetup-bwlp/templates/localboot.html +++ b/modules-available/serversetup-bwlp/templates/localboot.html @@ -25,7 +25,7 @@{{lang_name}} | +{{lang_systemmodel}} | {{lang_count}} | {{lang_override}} |
---|
{{lang_bootentryTitle}} | -Hotkey | +{{lang_hotkey}} | +{{lang_refCount}} | {{lang_edit}} | {{lang_delete}} | {{hotkey}} | ++ {{refs}} + | {{#allowEdit}} diff --git a/modules-available/serversetup-bwlp/templates/ipxe-new-boot-entry.html b/modules-available/serversetup-bwlp/templates/ipxe-new-boot-entry.html index fe496029..7e82b5cc 100644 --- a/modules-available/serversetup-bwlp/templates/ipxe-new-boot-entry.html +++ b/modules-available/serversetup-bwlp/templates/ipxe-new-boot-entry.html @@ -14,7 +14,7 @@ | {{#entries}} -
---|---|---|---|---|---|
diff --git a/modules-available/serversetup-bwlp/templates/menu-list.html b/modules-available/serversetup-bwlp/templates/menu-list.html
index 67365a33..545f22a9 100644
--- a/modules-available/serversetup-bwlp/templates/menu-list.html
+++ b/modules-available/serversetup-bwlp/templates/menu-list.html
@@ -1,5 +1,9 @@
{{lang_listOfMenus}}++ {{lang_menuListIntro}} + +
|