From 8e54eaafbb0a160b9b9e2dbe5c2207126bc967bc Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 5 Dec 2018 16:10:29 +0100 Subject: [locationinfo] roomplaner -> roomplanner --- modules-available/locationinfo/api.inc.php | 2 +- modules-available/locationinfo/inc/locationinfo.inc.php | 4 ++-- modules-available/locationinfo/lang/de/template-tags.json | 4 ++-- modules-available/locationinfo/lang/en/template-tags.json | 4 ++-- modules-available/locationinfo/page.inc.php | 8 ++++---- modules-available/locationinfo/templates/frontend-default.html | 2 +- .../locationinfo/templates/page-config-panel-default.html | 6 +++--- .../locationinfo/templates/page-config-panel-summary.html | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index c33c528e..9ebbcea6 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -110,7 +110,7 @@ function getPcStates($idList, $paneluuid) foreach ($locationInfo['machines'] as $pc) { $key = strtolower($pc['pcState']); if (isset($pcStates[$id][$key])) { - if ($config['roomplaner']) { + if ($config['roomplanner']) { if (isset($pc['x']) && isset($pc['y'])) { $pcStates[$id][$key]++; } diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php index b996601a..377e960b 100644 --- a/modules-available/locationinfo/inc/locationinfo.inc.php +++ b/modules-available/locationinfo/inc/locationinfo.inc.php @@ -80,7 +80,7 @@ class LocationInfo 'vertical' => false, 'eco' => false, 'prettytime' => true, - 'roomplaner' => true, + 'roomplanner' => true, 'scaledaysauto' => true, 'daystoshow' => 7, 'rotation' => 0, @@ -94,7 +94,7 @@ class LocationInfo if ($type === 'SUMMARY') { return array( 'language' => defined('LANG') ? LANG : 'en', - 'roomplaner' => true, + 'roomplanner' => true, 'eco' => false, 'panelupdate' => 60, ); diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json index e93d83a9..03eb63a5 100644 --- a/modules-available/locationinfo/lang/de/template-tags.json +++ b/modules-available/locationinfo/lang/de/template-tags.json @@ -78,7 +78,7 @@ "lang_room": "Raum", "lang_roomId": "Raum ID", "lang_roomIdTooltip": "Die Raum ID, die der Server ben\u00f6tigt, um Kalenderdaten abzurufen (bei Exchange die Postfachadresse)", - "lang_roomplanerTooltip": "Nur PCs berücksichtigen, die im Raumplaner gesetzt wurden", + "lang_roomplannerTooltip": "Nur PCs berücksichtigen, die im Raumplaner gesetzt wurden", "lang_roomupdateTooltip": "Zeit nach der die PCs aktualisiert werden (in Sekunden)", "lang_rotation": "Rotation", "lang_rotation0": "0\u00b0", @@ -120,7 +120,7 @@ "lang_url": "URL", "lang_urlPanel": "URL-Panel", "lang_urlTooltip": "URL die aufgerufen wird", - "lang_useRoomplaner": "Raumplaner benutzen", + "lang_useRoomplanner": "Raumplaner benutzen", "lang_vertical": "Vertikaler Modus", "lang_verticalTooltip": "Legt fest, ob Kalender und Raum \u00fcbereinander angezeigt werden sollen" } \ No newline at end of file diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json index 8a6e0724..1b5ab0fd 100644 --- a/modules-available/locationinfo/lang/en/template-tags.json +++ b/modules-available/locationinfo/lang/en/template-tags.json @@ -78,7 +78,7 @@ "lang_room": "Room", "lang_roomId": "Room ID", "lang_roomIdTooltip": "The ID of the room the server needs, for querying the calendar data (when using exchange the room mailbox)", - "lang_roomplanerTooltip": "Only consider PCs which were set in the roomplaner", + "lang_roomplannerTooltip": "Only consider PCs which were set in the roomplanner", "lang_roomupdateTooltip": "Time the PCs in the room gets updated (in seconds)", "lang_rotation": "Rotation", "lang_rotation0": "0\u00b0", @@ -120,7 +120,7 @@ "lang_url": "URL", "lang_urlPanel": "URL panel", "lang_urlTooltip": "URL which is shown by the panel", - "lang_useRoomplaner": "Use roomplans", + "lang_useRoomplanner": "Use roomplans", "lang_vertical": "Vertical mode", "lang_verticalTooltip": "Defines whether the room and calendar are shown above each other" } \ No newline at end of file diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index 26fa6c4e..13382438 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -359,7 +359,7 @@ class Page_LocationInfo extends Page 'vertical' => Request::post('vertical', false, 'bool'), 'eco' => Request::post('eco', false, 'bool'), 'prettytime' => Request::post('prettytime', false, 'bool'), - 'roomplaner' => Request::post('roomplaner', false, 'bool'), + 'roomplanner' => Request::post('roomplanner', false, 'bool'), 'scaledaysauto' => Request::post('scaledaysauto', false, 'bool'), 'daystoshow' => Request::post('daystoshow', 7, 'int'), 'rotation' => Request::post('rotation', 0, 'int'), @@ -393,7 +393,7 @@ class Page_LocationInfo extends Page $conf = array( 'language' => Request::post('language', 'en', 'string'), 'eco' => Request::post('eco', false, 'bool'), - 'roomplaner' => Request::post('roomplaner', false, 'bool'), + 'roomplanner' => Request::post('roomplanner', false, 'bool'), 'panelupdate' => Request::post('panelupdate', 30, 'int') ); if ($conf['panelupdate'] < 15) { @@ -933,7 +933,7 @@ class Page_LocationInfo extends Page 'vertical_checked' => $config['vertical'] ? 'checked' : '', 'eco_checked' => $config['eco'] ? 'checked' : '', 'prettytime_checked' => $config['prettytime'] ? 'checked' : '', - 'roomplaner_checked' => $config['roomplaner'] ? 'checked' : '', + 'roomplanner_checked' => $config['roomplanner'] ? 'checked' : '', 'scaledaysauto_checked' => $config['scaledaysauto'] ? 'checked' : '', 'daystoshow' => $config['daystoshow'], 'rotation' => $config['rotation'], @@ -960,7 +960,7 @@ class Page_LocationInfo extends Page 'panelname' => $panel['panelname'], 'languages' => $langs, 'panelupdate' => $config['panelupdate'], - 'roomplaner_checked' => $config['roomplaner'] ? 'checked' : '', + 'roomplanner_checked' => $config['roomplanner'] ? 'checked' : '', 'locations' => Location::getLocations(), 'locationids' => $panel['locationids'], 'eco_checked' => $config['eco'] ? 'checked' : '', diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html index 7317f8e2..766329d9 100755 --- a/modules-available/locationinfo/templates/frontend-default.html +++ b/modules-available/locationinfo/templates/frontend-default.html @@ -1501,7 +1501,7 @@ optional: for (var i = 0; i < update.length; i++) { var $div = $("#pc_" + room.id + "_" + update[i].id); // Pc free - if (room.config.roomplaner === true) { + if (room.config.roomplanner === true) { if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") && !isNaN(update[i].x) && !isNaN(update[i].y)) { freePcs++; } diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html index c2915298..116c2e11 100644 --- a/modules-available/locationinfo/templates/page-config-panel-default.html +++ b/modules-available/locationinfo/templates/page-config-panel-default.html @@ -111,13 +111,13 @@
- +
- +
-

+

diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html index 737eef1f..a77719b8 100644 --- a/modules-available/locationinfo/templates/page-config-panel-summary.html +++ b/modules-available/locationinfo/templates/page-config-panel-summary.html @@ -74,13 +74,13 @@
- +
- +
-

+

-- cgit v1.2.3-55-g7522