From e92e4a11cd2771338db823e8aadb5a9c74957808 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Wed, 15 Mar 2017 12:54:29 +0100 Subject: Locationinfo: Reformat code. --- modules-available/locationinfo/api.inc.php | 85 ++-- .../locationinfo/inc/locationinfo.inc.php | 4 +- modules-available/locationinfo/install.inc.php | 100 ++--- .../locationinfo/lang/de/template-tags.json | 5 - .../locationinfo/templates/config.html | 381 ++++++++--------- .../locationinfo/templates/credentials.html | 38 +- .../locationinfo/templates/location-info.html | 463 +++++++++++---------- .../locationinfo/templates/timetable.html | 304 +++++++------- 8 files changed, 708 insertions(+), 672 deletions(-) (limited to 'modules-available') diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index a0f65cdb..caa9a6ec 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -2,7 +2,8 @@ HandleParameters(); -function HandleParameters() { +function HandleParameters() +{ $getAction = Request::get('action', 0, 'string'); if ($getAction == "roominfo") { @@ -35,16 +36,18 @@ function HandleParameters() { } } -function filterIdList($roomids) { +function filterIdList($roomids) +{ $idList = explode(',', $roomids); $filteredIdList = array_filter($idList, 'is_numeric'); - $filteredIdList = array_unique($filteredIdList); + $filteredIdList = array_unique($filteredIdList); $filteredIdList = filterHiddenRoom($filteredIdList); return $filteredIdList; } -function filterHiddenRoom($idArray) { +function filterHiddenRoom($idArray) +{ $filteredArray = array(); if (!empty($idArray)) { $query = "SELECT locationid, hidden FROM `location_info` WHERE locationid IN ("; @@ -53,7 +56,7 @@ function filterHiddenRoom($idArray) { $dbquery = Database::simpleQuery($query); - while($dbresult=$dbquery->fetch(PDO::FETCH_ASSOC)) { + while ($dbresult = $dbquery->fetch(PDO::FETCH_ASSOC)) { if ($dbresult['hidden'] == false) { $filteredArray[] = $dbresult['locationid']; } @@ -65,14 +68,15 @@ function filterHiddenRoom($idArray) { // ########## ########## -function getRoomInfo($idList, $coords = false) { +function getRoomInfo($idList, $coords = false) +{ $coordinates = (string)$coords; $dbresult = array(); if (!empty($idList)) { // Build SQL Query for multiple ids. - $query = "SELECT m.locationid, machineuuid, position, logintime, lastseen, lastboot FROM `machine` as m LEFT JOIN location_info AS l ON l.locationid = m.locationid WHERE l.hidden = 0 AND m.locationid IN ("; + $query = "SELECT m.locationid, machineuuid, position, logintime, lastseen, lastboot FROM `machine` AS m LEFT JOIN location_info AS l ON l.locationid = m.locationid WHERE l.hidden = 0 AND m.locationid IN ("; $query .= implode(",", $idList); $query .= ")"; @@ -87,7 +91,7 @@ function getRoomInfo($idList, $coords = false) { $pclist = array(); // Fetch db data. - while($dbdata=$dbquery->fetch(PDO::FETCH_ASSOC)) { + while ($dbdata = $dbquery->fetch(PDO::FETCH_ASSOC)) { // Set the id if the locationid changed. if (!isset($dbresult[$dbdata['locationid']])) { @@ -103,8 +107,7 @@ function getRoomInfo($idList, $coords = false) { if (isset($position['overlays'])) { $pc['overlay'] = $position['overlays']; - } - else { + } else { $pc['overlay'] = array(); } } @@ -118,11 +121,13 @@ function getRoomInfo($idList, $coords = false) { // The array keys are only used for the isset -> Return only the values. return json_encode(array_values($dbresult), true); } + // ########## ########### // ########## ########## -function getOpeningTime($idList) { +function getOpeningTime($idList) +{ $dbresult = array(); if (!empty($idList)) { @@ -134,7 +139,7 @@ function getOpeningTime($idList) { // Execute query. $dbquery = Database::simpleQuery($query); $handledIds = array(); - while($dbdata=$dbquery->fetch(PDO::FETCH_ASSOC)) { + while ($dbdata = $dbquery->fetch(PDO::FETCH_ASSOC)) { $data['id'] = $dbdata['locationid']; $data['openingtime'] = json_decode($dbdata['openingtime'], true); $handledIds[] = $data['id']; @@ -151,7 +156,7 @@ function getOpeningTime($idList) { } // Go through the db entrys [id] = id; [openingtime] = e.g. [{"days":["Saturday","Sunday"],"openingtime":"12:32","closingtime":"14:35"}] - foreach($dbresult as $entry) { + foreach ($dbresult as $entry) { $tmp = array(); // Get the parents time if there is no openingtime defined. if (count($entry['openingtime']) == 0) { @@ -168,12 +173,13 @@ function getOpeningTime($idList) { } // Format the openingtime in the frontend needed format. -function formatOpeningtime($openingtime) { - $weekarray = array ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"); +function formatOpeningtime($openingtime) +{ + $weekarray = array("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"); foreach ($weekarray as $d) { $array = array(); foreach ($openingtime as $opt) { - foreach($opt['days'] as $val) { + foreach ($opt['days'] as $val) { if ($val == $d) { $arr = array(); @@ -188,7 +194,7 @@ function formatOpeningtime($openingtime) { $array[] = $arr; } } - if(!empty($array)) { + if (!empty($array)) { $result[$d] = $array; } } @@ -196,7 +202,8 @@ function formatOpeningtime($openingtime) { return $result; } -function getOpeningTimesFromParent($locationID) { +function getOpeningTimesFromParent($locationID) +{ // Get parent location id. $dbquery = Database::queryFirst("SELECT parentlocationid FROM `location` WHERE locationid = :locationID", array('locationID' => $locationID)); $parentlocationid = 0; @@ -216,8 +223,9 @@ function getOpeningTimesFromParent($locationID) { } } -function createBasicClosingTime() { - $weekarray = array ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"); +function createBasicClosingTime() +{ + $weekarray = array("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"); $array = array(); foreach ($weekarray as $d) { $a = array(); @@ -234,8 +242,9 @@ function createBasicClosingTime() { // ########## ########## -function getConfig($locationID) { - $dbresult = Database::queryFirst("SELECT l.locationname, li.config, li.serverroomid, s.servertype, s.serverurl FROM `location_info` AS li +function getConfig($locationID) +{ + $dbresult = Database::queryFirst("SELECT l.locationname, li.config, li.serverroomid, s.servertype, s.serverurl FROM `location_info` AS li RIGHT JOIN `location` AS l ON l.locationid=li.locationid LEFT JOIN `setting_location_info` AS s ON s.serverid=li.serverid WHERE l.locationid=:locationID", array('locationID' => $locationID)); @@ -246,18 +255,19 @@ function getConfig($locationID) { $date = getdate(); $config['time'] = $date['year'] . "-" . $date['mon'] . "-" . $date['mday'] . " " . $date['hours'] . ":" . $date['minutes'] . ":" . $date['seconds']; - if($dbresult['servertype'] === "Frontend") { + if ($dbresult['servertype'] === "Frontend") { $config['calendarqueryurl'] = $dbresult['serverurl'] . "/" . $dbresult['serverroomid'] . ".json"; } if (empty($config)) { echo json_encode(array()); } else { - echo json_encode($config, JSON_UNESCAPED_SLASHES); + echo json_encode($config, JSON_UNESCAPED_SLASHES); } } -function getPcStates($idList) { +function getPcStates($idList) +{ $pcStates = array(); $roominfoList = json_decode(getRoomInfo($idList), true); @@ -271,11 +281,11 @@ function getPcStates($idList) { foreach ($roomInfo['computer'] as $computer) { if ($computer['pcState'] == 0) { $idle++; - } elseif($computer['pcState'] == 1) { + } elseif ($computer['pcState'] == 1) { $occupied++; - } elseif($computer['pcState'] == 2) { + } elseif ($computer['pcState'] == 2) { $off++; - } elseif($computer['pcState'] == 3) { + } elseif ($computer['pcState'] == 3) { $broken++; } } @@ -289,7 +299,8 @@ function getPcStates($idList) { return json_encode($pcStates); } -function getRoomTree($idList) { +function getRoomTree($idList) +{ $roomTree = array(); $filteredIdList = array(); foreach ($idList as $id) { @@ -307,12 +318,13 @@ function getRoomTree($idList) { return json_encode($roomTree); } -function getChildsRecursive($id, &$filteredIdList) { +function getChildsRecursive($id, &$filteredIdList) +{ $dbquery = Database::simpleQuery("SELECT locationid, locationname FROM `location` WHERE parentlocationid=:locationID", array('locationID' => $id)); $array = array(); $dbarray = array(); - while($dbresult=$dbquery->fetch(PDO::FETCH_ASSOC)) { + while ($dbresult = $dbquery->fetch(PDO::FETCH_ASSOC)) { $dbarray[] = $dbresult; } foreach ($dbarray as $db) { @@ -332,13 +344,14 @@ function getChildsRecursive($id, &$filteredIdList) { } // ########## ########### -function getCalendar($idList) { +function getCalendar($idList) +{ $serverList = array(); if (!empty($idList)) { //// Build SQL query for multiple ids. - $query = "SELECT locationid, l.serverid AS serverid, serverurl, servertype, credentials FROM `location_info` as l LEFT JOIN setting_location_info as s ON s.serverid = l.serverid WHERE locationid IN ("; + $query = "SELECT locationid, l.serverid AS serverid, serverurl, servertype, credentials FROM `location_info` AS l LEFT JOIN setting_location_info AS s ON s.serverid = l.serverid WHERE locationid IN ("; $query .= implode(",", $idList); @@ -348,7 +361,7 @@ function getCalendar($idList) { $first = true; $lastservertype = ""; - while($dbresult=$dbquery->fetch(PDO::FETCH_ASSOC)) { + while ($dbresult = $dbquery->fetch(PDO::FETCH_ASSOC)) { if (!isset($serverList[$dbresult['serverid']])) { $serverList[$dbresult['serverid']] = array('credentials' => json_decode($dbresult['credentials'], true), 'url' => $dbresult['serverurl'], 'type' => $dbresult['servertype'], 'idlist' => array()); } @@ -367,9 +380,9 @@ function getCalendar($idList) { if ($calendarFromBackend === false || $setCred === false) { $error['timestamp'] = time(); $error['error'] = $serverInstance->getError(); - Database::exec("UPDATE `setting_location_info` Set error=:error WHERE serverid=:id", array('id' => $serverid, 'error' => json_encode($error, true))); + Database::exec("UPDATE `setting_location_info` SET error=:error WHERE serverid=:id", array('id' => $serverid, 'error' => json_encode($error, true))); } else { - Database::exec("UPDATE `setting_location_info` Set error=NULL WHERE serverid=:id", array('id' => $serverid)); + Database::exec("UPDATE `setting_location_info` SET error=NULL WHERE serverid=:id", array('id' => $serverid)); } if (is_array($calendarFromBackend)) { foreach ($calendarFromBackend as $key => $value) { diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php index 7ef06f8b..02a7e2c1 100644 --- a/modules-available/locationinfo/inc/locationinfo.inc.php +++ b/modules-available/locationinfo/inc/locationinfo.inc.php @@ -11,14 +11,14 @@ class LocationInfo * [2] = OFF * [3] = 10 days offline (BROKEN?) */ - // TODO USE STATE NAME instead of numbers + // TODO USE STATE NAME instead of numbers $logintime = (int)$pc['logintime']; $lastseen = (int)$pc['lastseen']; $lastboot = (int)$pc['lastboot']; $NOW = time(); - if ($NOW - $lastseen > 14*86400) { + if ($NOW - $lastseen > 14 * 86400) { return 3; } elseif (($NOW - $lastseen > 610) || $lastboot === 0) { return 2; diff --git a/modules-available/locationinfo/install.inc.php b/modules-available/locationinfo/install.inc.php index a371ad02..88d69d3a 100644 --- a/modules-available/locationinfo/install.inc.php +++ b/modules-available/locationinfo/install.inc.php @@ -3,13 +3,13 @@ $res = array(); $res[] = tableCreate('location_info', ' - `locationid` INT(11) NOT NULL, - `serverid` INT(11) NOT NULL, + `locationid` INT(11) NOT NULL, + `serverid` INT(11) NOT NULL, `serverroomid` VARCHAR(2000), `hidden` BOOLEAN NOT NULL DEFAULT 0, `openingtime` VARCHAR(2000), `config` VARCHAR(2000), - `calendar` VARCHAR(2000), + `calendar` VARCHAR(2000), `lastcalendarupdate` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`locationid`) '); @@ -19,85 +19,85 @@ $res[] = tableCreate('setting_location_info', ' `servername` VARCHAR(2000) NOT NULL, `serverurl` VARCHAR(2000) NOT NULL, `servertype` VARCHAR(100) NOT NULL, - `credentials` VARCHAR(2000), + `credentials` VARCHAR(2000), `error` VARCHAR(2000), PRIMARY KEY (`serverid`) '); // Create response for browser if (!tableHasColumn('setting_location_info', 'error')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` ADD `error` VARCHAR(2000) AFTER `credentials`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding column error failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `setting_location_info` ADD `error` VARCHAR(2000) AFTER `credentials`"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Adding column error failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } if (!tableHasColumn('setting_location_info', 'credentials')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` ADD `credentials` VARCHAR(2000) AFTER `servertype`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding column credentials failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `setting_location_info` ADD `credentials` VARCHAR(2000) AFTER `servertype`"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Adding column credentials failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } if (tableHasColumn('setting_location_info', 'login')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` DROP COLUMN login"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Dropping column login failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `setting_location_info` DROP COLUMN login"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Dropping column login failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } if (tableHasColumn('setting_location_info', 'passwd')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` DROP COLUMN passwd"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Dropping column passwd failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `setting_location_info` DROP COLUMN passwd"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Dropping column passwd failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } if (tableHasColumn('location_info', 'serverroomid')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY serverroomid VARCHAR(2000)"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column serverroomid failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `location_info` MODIFY serverroomid VARCHAR(2000)"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Updateing column serverroomid failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } if (tableHasColumn('location_info', 'openingtime')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY openingtime VARCHAR(2000)"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column openingtime failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `location_info` MODIFY openingtime VARCHAR(2000)"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Updateing column openingtime failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } if (tableHasColumn('location_info', 'config')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY config VARCHAR(2000)"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column config failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `location_info` MODIFY config VARCHAR(2000)"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Updateing column config failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } if (tableHasColumn('location_info', 'calendar')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY calendar VARCHAR(2000)"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column calendar failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `location_info` MODIFY calendar VARCHAR(2000)"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Updateing column calendar failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } if (tableHasColumn('location_info', 'lastcalendarupdate')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY lastcalendarupdate INT(11) NOT NULL DEFAULT 0"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column lastcalendarupdate failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; + $ret = Database::exec("ALTER TABLE `location_info` MODIFY lastcalendarupdate INT(11) NOT NULL DEFAULT 0"); + if ($ret === false) { + finalResponse(UPDATE_FAILED, 'Updateing column lastcalendarupdate failed: ' . Database::lastError()); + } + $res[] = UPDATE_DONE; } -if(tableExists('locationinfo')) { +if (tableExists('locationinfo')) { $ret = Database::exec("DROP TABLE `locationinfo`"); if ($ret === false) { finalResponse(UPDATE_FAILED, 'Droping table locationinfo failed: ' . Database::lastError()); diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json index f7094cee..5525dec2 100644 --- a/modules-available/locationinfo/lang/de/template-tags.json +++ b/modules-available/locationinfo/lang/de/template-tags.json @@ -1,24 +1,20 @@ { "lang_mainHeader": "Infoscreen", - "lang_locationName": "Name", "lang_locationID": "ID", "lang_locationIsHidden": "Versteckt", "lang_locationInUse": "In Benutzung / Gesamt", "lang_locationSettings": "Einstellungen", "lang_locationConfig": "Config", - "lang_pcID": "ID", "lang_pcIP": "IP", "lang_pcX": "X", "lang_pcY": "Y", "lang_pcState": "PC Status", - "lang_day": "Tag", "lang_openingTime": "Öffnungszeit", "lang_closingTime": "Schließungszeit", "lang_deleteAll": "Alles Löschen", - "lang_shortMonday": "Mo", "lang_shortTuesday": "Di", "lang_shortWednesday": "Mi", @@ -31,7 +27,6 @@ "lang_saturday": "Samstag", "lang_sunday": "Sonntag", "lang_expertMode": "Experten Modus", - "lang_language": "Sprache", "lang_languageEn": "en", "lang_languageDe": "de", diff --git a/modules-available/locationinfo/templates/config.html b/modules-available/locationinfo/templates/config.html index 5e221756..79d6f085 100644 --- a/modules-available/locationinfo/templates/config.html +++ b/modules-available/locationinfo/templates/config.html @@ -1,192 +1,199 @@
-
- - - - - -
-
- -
- -
-
- -
- - -



- -
-
- -
-
-
- -
-
- {{lang_vertical}}
- {{lang_ecoMode}}
- {{lang_autoScale}} -
- -
-
- -
- -
-
- -
- -



- -
- 50 % - -

- -
- 20 {{lang_sec}} - -

- -
-
-
- {{lang_min}} -
-
-
- {{lang_sec}} -
-
-
- {{lang_min}} -
-
- -



- - - -
+
+ + + + + +
+
+ +
+ +
+
+ +
+ + +



+ +
+
+ +
+
+
+ +
+
+ {{lang_vertical}}
+ {{lang_ecoMode}}
+ {{lang_autoScale}} +
+ +
+
+ +
+ +
+
+ +
+ +



+ +
+ 50 % + +

+ +
+ 20 {{lang_sec}} + +

+ +
+
+
+ {{lang_min}} +
+
+
+ {{lang_sec}} +
+
+
+ {{lang_min}} +
+
+ +



+ + + +
diff --git a/modules-available/locationinfo/templates/credentials.html b/modules-available/locationinfo/templates/credentials.html index 70e96982..f8c04bcb 100644 --- a/modules-available/locationinfo/templates/credentials.html +++ b/modules-available/locationinfo/templates/credentials.html @@ -1,31 +1,31 @@
-
- - - -
- -
+
+ + + +
+ +
diff --git a/modules-available/locationinfo/templates/location-info.html b/modules-available/locationinfo/templates/location-info.html index 3e832284..ef8de412 100644 --- a/modules-available/locationinfo/templates/location-info.html +++ b/modules-available/locationinfo/templates/location-info.html @@ -1,52 +1,65 @@
-

{{lang_mainHeader}}

- -
-

{{lang_serverTable}}

-
- - - - - - - - - - -{{#serverlist}} - - - - +

{{lang_mainHeader}}

+ +
+

{{lang_serverTable}}

+
+ +
{{lang_sID}}{{lang_serverType}}{{lang_locationName}}{{lang_serverUrl}}
+ + + + + + + + + {{#serverlist}} + + + + - -{{/serverlist}} + {{/serverlist}} @@ -56,38 +69,41 @@
{{lang_sID}}{{lang_serverType}}{{lang_locationName}}{{lang_serverUrl}}
{{id}} - {{#types}} - - + - + - - + + + - - + +

- +


-
-
+
+
-

{{lang_buildingTable}}

- +

{{lang_buildingTable}}

+
- - - - - - - - + + + + + + + + -{{#list}} - + {{#list}} + - - - + + + - - - - - - -{{/list}} -
{{lang_locationName}}{{lang_locationID}}{{lang_locationInUse}}{{lang_locationIsHidden}}{{lang_openingTime}}{{lang_locationSettings}}
{{lang_locationName}}{{lang_locationID}}{{lang_locationInUse}}{{lang_locationIsHidden}}{{lang_openingTime}}{{lang_locationSettings}}
{{locationname}}		[{{locationid}}]{{#hasPcs}}{{pcState}} / {{total}}{{/hasPcs}} +
+ {{locationname}}		[{{locationid}}]{{#hasPcs}}{{pcState}} / {{total}}{{/hasPcs}}{{lang_openingTime}}{{lang_locationSettings}}
- - + + {{lang_openingTime}} + + {{lang_locationSettings}} + + + {{/list}} + + + + - diff --git a/modules-available/locationinfo/templates/timetable.html b/modules-available/locationinfo/templates/timetable.html index bb3f7991..29446f58 100644 --- a/modules-available/locationinfo/templates/timetable.html +++ b/modules-available/locationinfo/templates/timetable.html @@ -1,159 +1,166 @@
-
- - -
-
- -
- - - - - - - - - - - - - - - - + +
{{lang_day}}{{lang_openingTime}}{{lang_closingTime}}
{{lang_monTilFr}} -
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + - + - - - - + + + + - + - - - - + + + + - + - -
{{lang_day}}{{lang_openingTime}}{{lang_closingTime}}
{{lang_monTilFr}} +
- -
- 		-
+ +
+ 		+
- -
-
{{lang_saturday}} -
+ +
+
{{lang_saturday}} +
- -
- 		-
+ +
+ 		+
- -
-
{{lang_sunday}} -
+ +
+
{{lang_sunday}} +
- -
- 		-
+ +
+ 		+
- -
-
- -
-
-
- -
- -
- -
-
- - - - - - - - - - - - - - - {{#openingtimes}} - - - - - - - - {{/openingtimes}} - - -
{{lang_day}}{{lang_openingTime}}{{lang_closingTime}}{{lang_delete}}
{{days}}{{openingtime}}{{closingtime}}
- -
- {{lang_openingTime}} - -
-
- -
-
-
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + {{#openingtimes}} + + + + + + + + {{/openingtimes}} + + +
{{lang_day}}{{lang_openingTime}}{{lang_closingTime}}{{lang_delete}}
{{days}}{{openingtime}}{{closingtime}}
+ +
+ + {{lang_openingTime}} + +
+
+ +
+
+
-- cgit v1.2.3-55-g7522