diff --git a/assets/icons/close-circle.png b/assets/icons/close-circle.png deleted file mode 100644 index 265d8f6..0000000 Binary files a/assets/icons/close-circle.png and /dev/null differ diff --git a/assets/icons/menu.png b/assets/icons/menu.png deleted file mode 100644 index f75edb4..0000000 Binary files a/assets/icons/menu.png and /dev/null differ diff --git a/assets/nre/nre-powered.xcf b/assets/nre/nre-powered.xcf new file mode 100644 index 0000000..47319a7 Binary files /dev/null and b/assets/nre/nre-powered.xcf differ diff --git a/assets/nre/nre-powered_1200w.jxl b/assets/nre/nre-powered_1200w.jxl new file mode 100644 index 0000000..d70de7f Binary files /dev/null and b/assets/nre/nre-powered_1200w.jxl differ diff --git a/assets/nre/nre-powered_1200w.png b/assets/nre/nre-powered_1200w.png new file mode 100644 index 0000000..1c3b847 Binary files /dev/null and b/assets/nre/nre-powered_1200w.png differ diff --git a/assets/nre/nre-powered_1200w.webp b/assets/nre/nre-powered_1200w.webp new file mode 100644 index 0000000..9f068e3 Binary files /dev/null and b/assets/nre/nre-powered_1200w.webp differ diff --git a/assets/nre/nre-powered_1900w.jxl b/assets/nre/nre-powered_1900w.jxl new file mode 100644 index 0000000..d4da3df Binary files /dev/null and b/assets/nre/nre-powered_1900w.jxl differ diff --git a/assets/nre/nre-powered_1900w.png b/assets/nre/nre-powered_1900w.png new file mode 100644 index 0000000..39e05bf Binary files /dev/null and b/assets/nre/nre-powered_1900w.png differ diff --git a/assets/nre/nre-powered_1900w.webp b/assets/nre/nre-powered_1900w.webp new file mode 100644 index 0000000..9fb04c5 Binary files /dev/null and b/assets/nre/nre-powered_1900w.webp differ diff --git a/assets/nre/nre-powered_200w.jxl b/assets/nre/nre-powered_200w.jxl new file mode 100644 index 0000000..f86a24c Binary files /dev/null and b/assets/nre/nre-powered_200w.jxl differ diff --git a/assets/nre/nre-powered_200w.png b/assets/nre/nre-powered_200w.png new file mode 100644 index 0000000..b1c7abb Binary files /dev/null and b/assets/nre/nre-powered_200w.png differ diff --git a/assets/nre/nre-powered_200w.webp b/assets/nre/nre-powered_200w.webp new file mode 100644 index 0000000..36595dc Binary files /dev/null and b/assets/nre/nre-powered_200w.webp differ diff --git a/assets/nre/nre-powered_400w.jxl b/assets/nre/nre-powered_400w.jxl new file mode 100644 index 0000000..5a23645 Binary files /dev/null and b/assets/nre/nre-powered_400w.jxl differ diff --git a/assets/nre/nre-powered_400w.png b/assets/nre/nre-powered_400w.png new file mode 100644 index 0000000..ac90a79 Binary files /dev/null and b/assets/nre/nre-powered_400w.png differ diff --git a/assets/nre/nre-powered_400w.webp b/assets/nre/nre-powered_400w.webp new file mode 100644 index 0000000..73abfea Binary files /dev/null and b/assets/nre/nre-powered_400w.webp differ diff --git a/assets/nre/nre-powered_800w.jxl b/assets/nre/nre-powered_800w.jxl new file mode 100644 index 0000000..8fd3636 Binary files /dev/null and b/assets/nre/nre-powered_800w.jxl differ diff --git a/assets/nre/nre-powered_800w.png b/assets/nre/nre-powered_800w.png new file mode 100644 index 0000000..1fe153a Binary files /dev/null and b/assets/nre/nre-powered_800w.png differ diff --git a/assets/nre/nre-powered_800w.webp b/assets/nre/nre-powered_800w.webp new file mode 100644 index 0000000..ede2be2 Binary files /dev/null and b/assets/nre/nre-powered_800w.webp differ diff --git a/basic-test.php b/basic-test.php new file mode 100644 index 0000000..6d3caa6 --- /dev/null +++ b/basic-test.php @@ -0,0 +1,13 @@ + + + TEST_ONLY + + + + + + \ No newline at end of file diff --git a/js/nav.js b/js/nav.js index 6cbf18e..b76e9b7 100644 --- a/js/nav.js +++ b/js/nav.js @@ -1,19 +1,11 @@ -/* When the user clicks on the button, -toggle between hiding and showing the dropdown content */ -function myFunction() { - document.getElementById("myDropdown").classList.toggle("show"); +function sidebarOpen() { + document.getElementById("sidebar").style.width = "50%"; + document.getElementById("sidebar_open_short").style.display = "none"; + document.getElementById("sidebar_close_short").style.display = "block"; } -// Close the dropdown menu if the user clicks outside of it -window.onclick = function(event) { - if (!event.target.matches('.dropbtn')) { - var dropdowns = document.getElementsByClassName("dropdown-content"); - var i; - for (i = 0; i < dropdowns.length; i++) { - var openDropdown = dropdowns[i]; - if (openDropdown.classList.contains('show')) { - openDropdown.classList.remove('show'); - } - } - } -} +function sidebarClose() { + document.getElementById("sidebar").style.width = "0%" + document.getElementById("sidebar_open_short").style.display = "block"; + document.getElementById("sidebar_close_short").style.display = "none"; +} \ No newline at end of file diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php index b1f141f..eb6a5be 100644 --- a/page-blocks/nav-menu.php +++ b/page-blocks/nav-menu.php @@ -1,10 +1,9 @@ -'; -echo ' '; -echo '
'; -echo ' Home'; -echo ' Report Issue'; -echo ' Help'; -echo '
'; -echo ''; + + diff --git a/page-blocks/title-image.php b/page-blocks/title-image.php index 6986d0f..e9ca161 100644 --- a/page-blocks/title-image.php +++ b/page-blocks/title-image.php @@ -1,10 +1,9 @@ -'; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo 'Athena Owl Logo'; -echo ''; \ No newline at end of file + + + + + + + + Athena Owl Logo + \ No newline at end of file diff --git a/php/LDB-Tests/example.php b/php/LDB-Tests/example.php index 30e423a..64b2934 100644 --- a/php/LDB-Tests/example.php +++ b/php/LDB-Tests/example.php @@ -1,7 +1,8 @@ GetDepartureBoardByCRS(10,"BRI",date("H:i:s",time()),120,"","","","","True"); header("Content-Type: text/plain"); print_r($response); diff --git a/php/LDB-Tests/example_output.php b/php/LDB-Tests/example_output.php new file mode 100644 index 0000000..19806e3 --- /dev/null +++ b/php/LDB-Tests/example_output.php @@ -0,0 +1,56 @@ + + + + TESTING + + + GetDepartureBoard(10,"GTW"); + $template["header"] = " + + + + + + + + + + + "; + $template["row"] = " + + + + + + + "; + $template["footer"] = " + +
TimeDestinationPlatformExpected
{std}{destination}{platform}{etd}
+ "; + if (isset($response->GetStationBoardResult->trainServices->service)) + { + print $template["header"]; + foreach($response->GetStationBoardResult->trainServices->service as $service) + { + $row = $template["row"]; + $destinations = array(); + foreach($service->destination->location as $location) + { + $destinations[] = $location->locationName; + } + $row = str_replace("{std}",$service->std,$row); + $row = str_replace("{destination}",implode(" and ",$destinations),$row); + $row = str_replace("{platform}",(isset($service->platform)?$service->platform:" "),$row); + $row = str_replace("{etd}",$service->etd,$row); + print $row; + } + print $template["footer"]; + } + ?> + + \ No newline at end of file diff --git a/php/LDB-Tests/example_output_SV.php b/php/LDB-Tests/example_output_SV.php new file mode 100644 index 0000000..318f3cc --- /dev/null +++ b/php/LDB-Tests/example_output_SV.php @@ -0,0 +1,65 @@ + + + + TESTING + + + GetDepartureBoardByCRS(10,"BRI",date("H:i:s",time()),120,"","","","","True"); + $template["header"] = " + + + + + + + + + + + + + "; + $template["row"] = " + + + + + + + + + "; + $template["footer"] = " + +
IDOrg.Dest.Plat.SchExp
{id}{org}{dest}{plat}{sch}{act}
+ "; + if (isset($response->GetBoardResult->trainServices->service)) + { + print $template["header"]; + foreach($response->GetBoardResult->trainServices->service as $service) + { + $row = $template["row"]; + $destinations = array(); + + $row = str_replace("{id}",$service->trainid,$row); + $row = str_replace("{org}",$service->origin->location->tiploc,$row); + $row = str_replace("{dest}",$service->destination->location->tiploc,$row); + $row = str_replace("{plat}",$service->platform,$row); + $row = str_replace("{sch}",$servoce->std,$row); + $row = str_replace("{act}",$service->etd,$row); + print $row; + } + print $template["footer"]; + } + ?> + + \ No newline at end of file diff --git a/php/LDB-Tests/example_return.php b/php/LDB-Tests/example_return.php new file mode 100644 index 0000000..dc48a4e --- /dev/null +++ b/php/LDB-Tests/example_return.php @@ -0,0 +1,500 @@ +stdClass Object +( + [GetBoardResult] => stdClass Object + ( + [generatedAt] => 2022-11-05T21:47:01.9993579+00:00 + [locationName] => London Paddington + [crs] => PAD + [stationManager] => Network Rail + [stationManagerCode] => RT + [isTruncated] => 1 + [trainServices] => stdClass Object + ( + [service] => Array + ( + [0] => stdClass Object + ( + [rid] => 202211057051479 + [uid] => F51479 + [trainid] => 9U02 + [rsid] => XR134200 + [sdd] => 2022-11-05 + [operator] => Elizabeth Line + [operatorCode] => XR + [std] => 2022-11-05T21:48:00 + [etd] => 2022-11-05T21:48:00 + [departureType] => Forecast + [departureSource] => Darwin + [platform] => A + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTLL + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Abbey Wood + [crs] => ABW + [tiploc] => ABWDXR + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [1] => stdClass Object + ( + [rid] => 202211057919346 + [uid] => O19346 + [trainid] => 1T91 + [sdd] => 2022-11-05 + [operator] => Great Western Railway + [operatorCode] => GW + [std] => 2022-11-05T21:55:00 + [etd] => 2022-11-05T21:55:00 + [departureType] => Forecast + [departureSource] => TD + [platform] => 7 + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTON + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Heathrow Airport T5 + [crs] => HWV + [tiploc] => HTRWTM5 + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [2] => stdClass Object + ( + [rid] => 202211057051484 + [uid] => F51484 + [trainid] => 9U04 + [rsid] => XR134700 + [sdd] => 2022-11-05 + [operator] => Elizabeth Line + [operatorCode] => XR + [std] => 2022-11-05T21:58:00 + [etd] => 2022-11-05T21:58:00 + [departureType] => Forecast + [departureSource] => Darwin + [platform] => A + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTLL + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Abbey Wood + [crs] => ABW + [tiploc] => ABWDXR + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [3] => stdClass Object + ( + [rid] => 202211057051488 + [uid] => F51488 + [trainid] => 9U06 + [rsid] => XR135100 + [sdd] => 2022-11-05 + [operator] => Elizabeth Line + [operatorCode] => XR + [std] => 2022-11-05T22:08:00 + [etd] => 2022-11-05T22:08:00 + [departureType] => Forecast + [departureSource] => Darwin + [platform] => A + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTLL + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Abbey Wood + [crs] => ABW + [tiploc] => ABWDXR + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [4] => stdClass Object + ( + [rid] => 202211057919347 + [uid] => O19347 + [trainid] => 1T92 + [sdd] => 2022-11-05 + [operator] => Great Western Railway + [operatorCode] => GW + [std] => 2022-11-05T22:10:00 + [etd] => 2022-11-05T22:10:00 + [departureType] => Forecast + [departureSource] => TD + [platform] => 6 + [platformIsHidden] => 1 + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTON + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Heathrow Airport T5 + [crs] => HWV + [tiploc] => HTRWTM5 + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [5] => stdClass Object + ( + [rid] => 202211057051492 + [uid] => F51492 + [trainid] => 9U08 + [rsid] => XR135500 + [sdd] => 2022-11-05 + [operator] => Elizabeth Line + [operatorCode] => XR + [std] => 2022-11-05T22:18:00 + [etd] => 2022-11-05T22:18:00 + [departureType] => Forecast + [departureSource] => Darwin + [platform] => A + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTLL + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Abbey Wood + [crs] => ABW + [tiploc] => ABWDXR + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [6] => stdClass Object + ( + [rid] => 202211057919350 + [uid] => O19350 + [trainid] => 1T93 + [sdd] => 2022-11-05 + [operator] => Great Western Railway + [operatorCode] => GW + [std] => 2022-11-05T22:25:00 + [etd] => 2022-11-05T22:25:00 + [departureType] => Forecast + [departureSource] => Darwin + [platform] => 7 + [platformIsHidden] => 1 + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTON + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Heathrow Airport T5 + [crs] => HWV + [tiploc] => HTRWTM5 + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [7] => stdClass Object + ( + [rid] => 202211057051497 + [uid] => F51497 + [trainid] => 9U10 + [rsid] => XR136000 + [sdd] => 2022-11-05 + [operator] => Elizabeth Line + [operatorCode] => XR + [std] => 2022-11-05T22:28:00 + [etd] => 2022-11-05T22:28:00 + [departureType] => Forecast + [departureSource] => Darwin + [platform] => A + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTLL + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Abbey Wood + [crs] => ABW + [tiploc] => ABWDXR + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [8] => stdClass Object + ( + [rid] => 202211057051502 + [uid] => F51502 + [trainid] => 9U12 + [rsid] => XR136500 + [sdd] => 2022-11-05 + [operator] => Elizabeth Line + [operatorCode] => XR + [std] => 2022-11-05T22:38:00 + [etd] => 2022-11-05T22:38:00 + [departureType] => Forecast + [departureSource] => Darwin + [platform] => A + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTLL + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Abbey Wood + [crs] => ABW + [tiploc] => ABWDXR + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + [9] => stdClass Object + ( + [rid] => 202211057919351 + [uid] => O19351 + [trainid] => 1T94 + [sdd] => 2022-11-05 + [operator] => Great Western Railway + [operatorCode] => GW + [std] => 2022-11-05T22:40:00 + [etd] => 2022-11-05T22:40:00 + [departureType] => Forecast + [departureSource] => Darwin + [platform] => 6 + [platformIsHidden] => 1 + [origin] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => London Paddington + [crs] => PAD + [tiploc] => PADTON + ) + + ) + + ) + + [destination] => stdClass Object + ( + [location] => Array + ( + [0] => stdClass Object + ( + [locationName] => Heathrow Airport T5 + [crs] => HWV + [tiploc] => HTRWTM5 + ) + + ) + + ) + + [category] => OO + [activities] => TB + ) + + ) + + ) + + ) + +) \ No newline at end of file diff --git a/php/version.php b/php/version.php index f86ce04..eb8d55b 100644 --- a/php/version.php +++ b/php/version.php @@ -1,2 +1,2 @@ - needed to position the dropdown content */ -.dropdown { - position: relative; - display: inline-block; -} - -/* Dropdown Content (Hidden by Default) */ -.dropdown-content { - display: none; +#menubar_hamburger { position: absolute; - top: -80px; - /*right: -190px;*/ - left: 150px; - background-color: #7fa7e6; - min-width: 160px; - box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); - z-index: 1; + top: 2px; + right: 0; + padding: 5px; } - -/* Links inside the dropdown */ -.dropdown-content a { - color: white; - padding: 12px 16px; - text-decoration: none; +.sidebar_control { + background-color: transparent; + color: var(--link-color); + border: none; + font-family: sans-serif; + font-size: larger; +} +#sidebar_open_short {display: block;} +#sidebar_close_short { + display: none; + font-size: x-large; +} +#sidebar { + position: fixed; + top: 40px; + right: 0; + margin: auto; display: block; - border-bottom: 1px solid black; + max-width: 250px; + width: 0; + border-top-left-radius: 45px; + border-bottom-left-radius: 45px; + background-color: var(--overlay-color); + transition: 0.4s; } - -/*Final item of the dropdown has bottom border*/ -.dropdown-first { - border-top: 1px solid black; +#sidebar a { + padding: 8px 8px 8px 8px; + margin-top: 10px; + margin-bottom: 10px; + font-family: indie-flower, sans-serif; + font-weight: 300; + text-decoration: none; + text-align: center; + font-size: 25px; + color: var(--link-color); + display: block; + white-space: nowrap; + transition: 0.5s; } - -/* Change color of dropdown links on hover */ -.dropdown-content a:hover {background-color: #ddd;} - -/* Show the dropdown menu (use JS to add this class to the .dropdown-content container when the user clicks on the dropdown button) */ -.show {display:block;} - -/* END MENU STYLE */ - -/* Footer Styles */ - /* Footer Styles */ footer { - background-color: #7fa7e6; + background-color: var(--accent-color); color: white; width: 100%; position: fixed; bottom: 0; left: 0; } - footer a { text-decoration: underline; color: white; } - footer a:visited { color: white; } - footer a:hover { color: beige; } \ No newline at end of file