From 92c20c8740b5319fd5e09298465dc031c2f3eafe Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Thu, 15 Sep 2022 22:31:56 +0100 Subject: [PATCH 001/144] Added OpenLDBSVWS to Repo --- OpenLDBSVWS/openLDBSVWS.php | 341 ++++++++++++++++++++++++++++++++++++ 1 file changed, 341 insertions(+) create mode 100644 OpenLDBSVWS/openLDBSVWS.php diff --git a/OpenLDBSVWS/openLDBSVWS.php b/OpenLDBSVWS/openLDBSVWS.php new file mode 100644 index 0000000..66d6dc6 --- /dev/null +++ b/OpenLDBSVWS/openLDBSVWS.php @@ -0,0 +1,341 @@ + + + + + + + + + '; + + function __construct($accessToken,$trace=FALSE) + { + $this->accessToken = $accessToken; + + $this->trace = $trace; + + $soapOptions = array("trace"=>$this->trace,"soap_version"=>SOAP_1_2,"features"=>SOAP_SINGLE_ELEMENT_ARRAYS); + + if (extension_loaded("zlib")) $soapOptions["compression"] = SOAP_COMPRESSION_ACCEPT|SOAP_COMPRESSION_GZIP; + + $this->soapClient = new SoapClient("data:text/plain;base64,".base64_encode($this->wsdl),$soapOptions); + + $soapVar = new SoapVar(array("ns2:TokenValue"=>$this->accessToken),SOAP_ENC_OBJECT); + + $soapHeader = new SoapHeader("http://thalesgroup.com/RTTI/2010-11-01/ldb/commontypes","AccessToken",$soapVar,FALSE); + + $this->soapClient->__setSoapHeaders($soapHeader); + } + + private function call($method,$params) + { + try + { + $response = $this->soapClient->$method($params); + } + catch(SoapFault $soapFault) + { + if ($this->trace) + { + $traceOutput["soapFaultMessage"] = $soapFault->getMessage(); + + $traceOutput["soapClientRequest"] = str_replace($this->accessToken,"",$this->soapClient->__getLastRequest()); + + $traceOutput["soapClientResponse"] = $this->soapClient->__getLastResponse(); + + print_r($traceOutput); + } + } + + return (isset($response)?$response:FALSE); + } + + function GetBoardByCRS($method,$numRows,$crs,$time,$timeWindow,$filtercrs,$filterType,$filterTOC,$services,$getNonPassengerServices) + { + $params = array(); + + if ($numRows) $params["numRows"] = $numRows; + + if ($crs) $params["crs"] = $crs; + + if ($time) $params["time"] = $time; + + if ($timeWindow) $params["timeWindow"] = $timeWindow; + + if ($filtercrs) $params["filtercrs"] = $filtercrs; + + if ($filterType) $params["filterType"] = $filterType; + + if ($filterTOC) $params["filterTOC"] = $filterTOC; + + if ($services) $params["services"] = $services; + + if ($getNonPassengerServices) $params["getNonPassengerServices"] = $getNonPassengerServices; + + return $this->call($method,$params); + } + + function GetArrivalDepartureBoardByCRS($numRows="",$crs="",$time="",$timeWindow="",$filtercrs="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByCRS("GetArrivalDepartureBoardByCRS",$numRows,$crs,$time,$timeWindow,$filtercrs,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetArrivalBoardByCRS($numRows="",$crs="",$time="",$timeWindow="",$filtercrs="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByCRS("GetArrivalBoardByCRS",$numRows,$crs,$time,$timeWindow,$filtercrs,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetDepartureBoardByCRS($numRows="",$crs="",$time="",$timeWindow="",$filtercrs="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByCRS("GetDepartureBoardByCRS",$numRows,$crs,$time,$timeWindow,$filtercrs,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetArrDepBoardWithDetails($numRows="",$crs="",$time="",$timeWindow="",$filtercrs="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByCRS("GetArrDepBoardWithDetails",$numRows,$crs,$time,$timeWindow,$filtercrs,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetArrBoardWithDetails($numRows="",$crs="",$time="",$timeWindow="",$filtercrs="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByCRS("GetArrBoardWithDetails",$numRows,$crs,$time,$timeWindow,$filtercrs,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetDepBoardWithDetails($numRows="",$crs="",$time="",$timeWindow="",$filtercrs="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByCRS("GetDepBoardWithDetails",$numRows,$crs,$time,$timeWindow,$filtercrs,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetBoardByTIPLOC($method,$numRows,$tiploc,$time,$timeWindow,$filterTiploc,$filterType,$filterTOC,$services,$getNonPassengerServices) + { + $params = array(); + + if ($numRows) $params["numRows"] = $numRows; + + if ($tiploc) $params["tiploc"] = $tiploc; + + if ($time) $params["time"] = $time; + + if ($timeWindow) $params["timeWindow"] = $timeWindow; + + if ($filterTiploc) $params["filterTiploc"] = $filterTiploc; + + if ($filterType) $params["filterType"] = $filterType; + + if ($filterTOC) $params["filterTOC"] = $filterTOC; + + if ($services) $params["services"] = $services; + + if ($getNonPassengerServices) $params["getNonPassengerServices"] = $getNonPassengerServices; + + return $this->call($method,$params); + } + + function GetArrivalDepartureBoardByTIPLOC($numRows="",$tiploc="",$time="",$timeWindow="",$filterTiploc="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByTIPLOC("GetArrivalDepartureBoardByTIPLOC",$numRows,$tiploc,$time,$timeWindow,$filterTiploc,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetArrivalBoardByTIPLOC($numRows="",$tiploc="",$time="",$timeWindow="",$filterTiploc="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByTIPLOC("GetArrivalBoardByTIPLOC",$numRows,$tiploc,$time,$timeWindow,$filterTiploc,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetDepartureBoardByTIPLOC($numRows="",$tiploc="",$time="",$timeWindow="",$filterTiploc="",$filterType="",$filterTOC="",$services="",$getNonPassengerServices="") + { + return $this->GetBoardByTIPLOC("GetDepartureBoardByTIPLOC",$numRows,$tiploc,$time,$timeWindow,$filterTiploc,$filterType,$filterTOC,$services,$getNonPassengerServices); + } + + function GetDepartures($method,$crs,$filterList,$time,$timeWindow,$filterTOC,$services) + { + $params = array(); + + if ($crs) $params["crs"] = $crs; + + if ($filterList) $params["filterList"] = $filterList; + + if ($time) $params["time"] = $time; + + if ($timeWindow) $params["timeWindow"] = $timeWindow; + + if ($filterTOC) $params["filterTOC"] = $filterTOC; + + if ($services) $params["services"] = $services; + + return $this->call($method,$params); + } + + function GetNextDepartures($crs="",$filterList="",$time="",$timeWindow="",$filterTOC="",$services="") + { + return $this->GetDepartures("GetNextDepartures",$crs,$filterList,$time,$timeWindow,$filterTOC,$services); + } + + function GetFastestDepartures($crs="",$filterList="",$time="",$timeWindow="",$filterTOC="",$services="") + { + return $this->GetDepartures("GetFastestDepartures",$crs,$filterList,$time,$timeWindow,$filterTOC,$services); + } + + function GetNextDeparturesWithDetails($crs="",$filterList="",$time="",$timeWindow="",$filterTOC="",$services="") + { + return $this->GetDepartures("GetNextDeparturesWithDetails",$crs,$filterList,$time,$timeWindow,$filterTOC,$services); + } + + function GetFastestDeparturesWithDetails($crs="",$filterList="",$time="",$timeWindow="",$filterTOC="",$services="") + { + return $this->GetDepartures("GetFastestDeparturesWithDetails",$crs,$filterList,$time,$timeWindow,$filterTOC,$services); + } + + function GetServiceDetailsByRID($rid="") + { + $params = array(); + + if ($rid) $params["rid"] = $rid; + + return $this->call("GetServiceDetailsByRID",$params); + } + + function QueryServices($serviceID="",$sdd="",$filterTime="",$filtercrs="",$tocFilter="") + { + $params = array(); + + if ($serviceID) $params["serviceID"] = $serviceID; + + if ($sdd) $params["sdd"] = $sdd; + + if ($filterTime) $params["filterTime"] = $filterTime; + + if ($filtercrs) $params["filtercrs"] = $filtercrs; + + if ($tocFilter) $params["tocFilter"] = $tocFilter; + + return $this->call("QueryServices",$params); + } + + function GetDisruptionList($CRSList="") + { + $params = array(); + + if ($CRSList) $params["CRSList"] = $CRSList; + + return $this->call("GetDisruptionList",$params); + } + } + + class OpenLDBSVREFWS + { + private $accessToken; + + private $trace; + + private $wsdl = ' + + + + + + + + '; + + function __construct($accessToken,$trace=FALSE) + { + $this->accessToken = $accessToken; + + $this->trace = $trace; + + $soapOptions = array("trace"=>$this->trace,"soap_version"=>SOAP_1_2,"features"=>SOAP_SINGLE_ELEMENT_ARRAYS); + + if (extension_loaded("zlib")) $soapOptions["compression"] = SOAP_COMPRESSION_ACCEPT|SOAP_COMPRESSION_GZIP; + + $this->soapClient = new SoapClient("data:text/plain;base64,".base64_encode($this->wsdl),$soapOptions); + + $soapVar = new SoapVar(array("ns2:TokenValue"=>$this->accessToken),SOAP_ENC_OBJECT); + + $soapHeader = new SoapHeader("http://thalesgroup.com/RTTI/2010-11-01/ldb/commontypes","AccessToken",$soapVar,FALSE); + + $this->soapClient->__setSoapHeaders($soapHeader); + } + + private function call($method,$params) + { + try + { + $response = $this->soapClient->$method($params); + } + catch(SoapFault $soapFault) + { + if ($this->trace) + { + $traceOutput["soapFaultMessage"] = $soapFault->getMessage(); + + $traceOutput["soapClientRequest"] = str_replace($this->accessToken,"",$this->soapClient->__getLastRequest()); + + $traceOutput["soapClientResponse"] = $this->soapClient->__getLastResponse(); + + print_r($traceOutput); + } + } + + return (isset($response)?$response:FALSE); + } + + function GetReasonCode($reasonCode="") + { + $params = array(); + + if ($reasonCode) $params["reasonCode"] = $reasonCode; + + return $this->call("GetReasonCode",$params); + } + + function GetReasonCodeList() + { + $params = array(); + + return $this->call("GetReasonCodeList",$params); + } + + function GetSourceInstanceNames() + { + $params = array(); + + return $this->call("GetSourceInstanceNames",$params); + } + + function GetTOCList($currentVersion="") + { + $params = array(); + + if ($currentVersion) $params["currentVersion"] = $currentVersion; + + return $this->call("GetTOCList",$params); + } + + function GetStationList($currentVersion="") + { + $params = array(); + + if ($currentVersion) $params["currentVersion"] = $currentVersion; + + return $this->call("GetStationList",$params); + } + } +?> -- 2.34.1 From ca94cbcbc799710b872ae56c918697c1901df878 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Thu, 15 Sep 2022 22:46:12 +0100 Subject: [PATCH 002/144] Added test page --- example.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 example.php diff --git a/example.php b/example.php new file mode 100644 index 0000000..2adaf00 --- /dev/null +++ b/example.php @@ -0,0 +1,8 @@ + GetDepartureBoardByCRS(10,"BRI",date("H:i:s",time()),120,"","","","","True"); + header("Content-Type: text/plain"); + print_r($response); +?> -- 2.34.1 From f7bae7c31ff34a32a8f0fd110475cf3c2794a5a6 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Thu, 15 Sep 2022 22:48:03 +0100 Subject: [PATCH 003/144] Bump minor version --- index.html | 2 +- scripts/tiploc-finder.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 7c3e9f0..2319e66 100644 --- a/index.html +++ b/index.html @@ -99,7 +99,7 @@
-

Created by Fred Boniface - v0.2.1-alpha

+

Created by Fred Boniface - v0.3.0-alpha

diff --git a/scripts/tiploc-finder.js b/scripts/tiploc-finder.js index 68b1a56..b25193a 100644 --- a/scripts/tiploc-finder.js +++ b/scripts/tiploc-finder.js @@ -1,7 +1,7 @@ const url = "https://tiger.worldline.global/"; const view = "/staff;scrollbar=true"; -console.group("Athena - v0.2.1-alpha") +console.group("Athena - v0.3.0-alpha") console.info("Initialising"); -- 2.34.1 From 74fa1dfed8ccbbdbf7eff1ef535b0a4458b1da1b Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Fri, 16 Sep 2022 19:17:25 +0100 Subject: [PATCH 004/144] Create php test page --- test.php | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 test.php diff --git a/test.php b/test.php new file mode 100644 index 0000000..99c69bc --- /dev/null +++ b/test.php @@ -0,0 +1,5 @@ + -- 2.34.1 From d0c40afdfe35aa0004d8eeb60d758ae3d5e76a9f Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Fri, 16 Sep 2022 19:20:24 +0100 Subject: [PATCH 005/144] Update testpage --- test.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/test.php b/test.php index 99c69bc..4e1b63b 100644 --- a/test.php +++ b/test.php @@ -1,5 +1,3 @@ -- 2.34.1 From 6fbace0a112e4641c053cd9dd7eb4feab65ddac4 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Fri, 16 Sep 2022 19:29:33 +0100 Subject: [PATCH 006/144] Bump version numbers to 0.4.0-devel --- index.html | 2 +- scripts/tiploc-finder.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 2319e66..0827cd7 100644 --- a/index.html +++ b/index.html @@ -99,7 +99,7 @@
-

Created by Fred Boniface - v0.3.0-alpha

+

Created by Fred Boniface - v0.4.0-devel

diff --git a/scripts/tiploc-finder.js b/scripts/tiploc-finder.js index b25193a..1920ae1 100644 --- a/scripts/tiploc-finder.js +++ b/scripts/tiploc-finder.js @@ -1,7 +1,7 @@ const url = "https://tiger.worldline.global/"; const view = "/staff;scrollbar=true"; -console.group("Athena - v0.3.0-alpha") +console.group("Athena - v0.4.0-devel") console.info("Initialising"); -- 2.34.1 From 18e586f92d870890573adf7c03ab366b55d4cae1 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Fri, 16 Sep 2022 19:38:41 +0100 Subject: [PATCH 007/144] Change local perms --- test.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 test.php diff --git a/test.php b/test.php old mode 100644 new mode 100755 -- 2.34.1 From 71f09a8444eeedebcf92075ce54d4d770fab14d9 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Fri, 16 Sep 2022 19:41:59 +0100 Subject: [PATCH 008/144] Create test HTML --- test.html | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 test.html diff --git a/test.html b/test.html new file mode 100644 index 0000000..1ffaaa1 --- /dev/null +++ b/test.html @@ -0,0 +1,6 @@ + + + +

TEST PAGE

+ + -- 2.34.1 From f04f9f17335620f47ec25e09eb3ce562e9e10d98 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Fri, 16 Sep 2022 19:55:34 +0100 Subject: [PATCH 009/144] Remove test.html --- test.html | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 test.html diff --git a/test.html b/test.html deleted file mode 100644 index 1ffaaa1..0000000 --- a/test.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -

TEST PAGE

- - -- 2.34.1 From 3f8923195915245b5bc0b1ce16460d37fc93afc4 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Fri, 16 Sep 2022 19:59:29 +0100 Subject: [PATCH 010/144] Create 404 error page --- error-pages/404.html | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 error-pages/404.html diff --git a/error-pages/404.html b/error-pages/404.html new file mode 100644 index 0000000..cd3b6ab --- /dev/null +++ b/error-pages/404.html @@ -0,0 +1,34 @@ + + + + Athena + + + + + + + + + + + + + + + + + +

oops, that page can't be found

+ +

Go back to the homepage

+ + + +
+

Created by Fred Boniface - v0.4.0-devel

+
+ + + + -- 2.34.1 From 542a51c4a4274d97b92d371d49c164bff429fbdf Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Fri, 16 Sep 2022 20:02:46 +0100 Subject: [PATCH 011/144] Switch to absolute references throughout --- error-pages/404.html | 8 ++++---- index.html | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/error-pages/404.html b/error-pages/404.html index cd3b6ab..38634f6 100644 --- a/error-pages/404.html +++ b/error-pages/404.html @@ -9,17 +9,17 @@ - - + + - + -

oops, that page can't be found

+

Oh no! That page can't be found

Go back to the homepage

diff --git a/index.html b/index.html index 0827cd7..50ec522 100644 --- a/index.html +++ b/index.html @@ -9,12 +9,12 @@ - - - + + + - - + + @@ -22,16 +22,16 @@ - +
@@ -61,7 +61,7 @@ @@ -69,32 +68,12 @@ incorrect or unavailable on Tiger, you will be redirected to a blank board. CRS codes will be verified against a lookup file before redirecting.

-

Use the TIPLOC Lookup option from the menu to look up a TIPLOC from - a given CRS code.

Some stations are not on Tiger and these stations are not supported here either. Notably TfW and Chiltern stations that border the GWR network. Most GWR Central served stations are now available to lookup.

-

Until there is a more modern public API offering access to Darwin, - I have no interest in supporting any more than simply linking to - the relevent Tiger page.

- - - diff --git a/scripts/tiploc-finder.js b/scripts/tiploc-finder.js index 1920ae1..f7c6dc0 100644 --- a/scripts/tiploc-finder.js +++ b/scripts/tiploc-finder.js @@ -88,38 +88,3 @@ function gotoInfoBoard(station) { console.groupEnd(); return 0; } - -/*This function provides the Lookup TIPLOC from CRS function from the menu*/ -function tiplocFinder() { - console.group("Athena: function: tiplocFinder()"); - let crs_to_find = document.getElementById("lookup-tiploc").value; - console.info("You are trying to lookup the TIPLOC for:" + crs_to_find.toUpperCase()); - console.info("Checking if CRS code exists in look up data"); - let hasKey = dataGlobal.hasOwnProperty(crs_to_find); - if (hasKey) { //If key exists then log and continue - console.info(crs_to_find.toUpperCase() + " does exist in lookup file"); - } else { //If key does not exist then stop further processing - console.warn(crs_to_find.toUpperCase() + "does not exist in lookup file"); - console.error(crs_to_find.toUpperCase() + " is an incorrect code or not supported."); - alert(crs_to_find.toUpperCase() + " is not a valid or supported CRS, " + - "please see the help section for more information"); - console.groupEnd(); - return 0; - } - let crs_obj = dataGlobal[crs_to_find]; - let name = crs_obj['name'].toUpperCase(); - let crs = crs_to_find.toUpperCase(); - let stanme = crs_obj['stanme'].toUpperCase(); - let stanox = crs_obj['stanox']; - let tiploc = crs_obj['tiploc']; - console.info("Found Data for " + crs +": Name: " + name + ", STANME: " + stanme + - ", STANOX: " + stanox + ", TIPLOC: " + tiploc); - console.warn("Attempt writing to DOM, feature incomplete"); - document.getElementById("resultCRS").innerHTML = "CRS: " + crs_to_find.toUpperCase(); - document.getElementById("resultTIPLOC").innerHTML = "TIPLOC: " + tiploc.toUpperCase(); - document.getElementById("resultSTANME").innerHTML = "STANME: " + stanme.toUpperCase(); - document.getElementById("resultName").innerHTML = "Name: " + name.toUpperCase(); - document.getElementById("resultSTANOX").innerHTML = "STANOX: " + stanox; - console.info("Writing to DOM Complete") - console.groupEnd(); -} -- 2.34.1 From b8a6dda0829032a9c556a5516ed0189846bca56a Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:29:48 +0100 Subject: [PATCH 042/144] Include UA string and PHP version in issue report. --- report-issue/index.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/report-issue/index.php b/report-issue/index.php index 7059933..3d3f036 100644 --- a/report-issue/index.php +++ b/report-issue/index.php @@ -40,9 +40,12 @@ "Content-Type: application/json" ); + // Prepare $detail to POST + $body = "User Agent: ", $ua_str, "\n Server PHP Version: ", PHP_VERSION, "\n", $detail; + // Prepare the request $rawData = array( - 'body' => $detail, + 'body' => $body, 'title' => $subject, 'closed' => 'false' ); -- 2.34.1 From fe3d73f79be743328ad146cacb07633f538c61f8 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:32:11 +0100 Subject: [PATCH 043/144] Sytax fixes --- report-issue/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-issue/index.php b/report-issue/index.php index 3d3f036..c7d00f2 100644 --- a/report-issue/index.php +++ b/report-issue/index.php @@ -41,7 +41,7 @@ ); // Prepare $detail to POST - $body = "User Agent: ", $ua_str, "\n Server PHP Version: ", PHP_VERSION, "\n", $detail; + $body = "User Agent: " . $ua_str . "\n Server PHP Version: " . PHP_VERSION . "\n" . $detail; // Prepare the request $rawData = array( -- 2.34.1 From 9c259def430817eeec98ab322071ab60c8912910 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:34:31 +0100 Subject: [PATCH 044/144] File reorganisation --- index.html | 4 ++-- {scripts => js}/nav.js | 0 {scripts => js}/sw.js | 0 {scripts => js}/tiploc-finder.js | 0 {OpenLDBSVWS => php}/openLDBSVWS.php | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => js}/nav.js (100%) rename {scripts => js}/sw.js (100%) rename {scripts => js}/tiploc-finder.js (100%) rename {OpenLDBSVWS => php}/openLDBSVWS.php (100%) diff --git a/index.html b/index.html index 4ae4d79..c1c5606 100644 --- a/index.html +++ b/index.html @@ -13,8 +13,8 @@ - - + + diff --git a/scripts/nav.js b/js/nav.js similarity index 100% rename from scripts/nav.js rename to js/nav.js diff --git a/scripts/sw.js b/js/sw.js similarity index 100% rename from scripts/sw.js rename to js/sw.js diff --git a/scripts/tiploc-finder.js b/js/tiploc-finder.js similarity index 100% rename from scripts/tiploc-finder.js rename to js/tiploc-finder.js diff --git a/OpenLDBSVWS/openLDBSVWS.php b/php/openLDBSVWS.php similarity index 100% rename from OpenLDBSVWS/openLDBSVWS.php rename to php/openLDBSVWS.php -- 2.34.1 From fcfd90f79bf8caa2fc2d82530f54d18ad3a93412 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:35:33 +0100 Subject: [PATCH 045/144] Presentation reorganising --- report-issue/index.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/report-issue/index.php b/report-issue/index.php index c7d00f2..e64c3ec 100644 --- a/report-issue/index.php +++ b/report-issue/index.php @@ -106,11 +106,6 @@

JSON REPLY: -
-
- SUBJECT: -
- DETAIL:

-- 2.34.1 From 30ce754a24eac6487b88bb93cd2b903b5b2dbfab Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:38:27 +0100 Subject: [PATCH 046/144] Path changes --- example.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.php b/example.php index 2adaf00..30e423a 100644 --- a/example.php +++ b/example.php @@ -1,5 +1,5 @@ GetDepartureBoardByCRS(10,"BRI",date("H:i:s",time()),120,"","","","","True"); -- 2.34.1 From 49ac099e4135572d7f7e57ed7d29b492a2358c08 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:39:32 +0100 Subject: [PATCH 047/144] re-org --- php/submitIssue.php | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 php/submitIssue.php diff --git a/php/submitIssue.php b/php/submitIssue.php new file mode 100644 index 0000000..402f0ce --- /dev/null +++ b/php/submitIssue.php @@ -0,0 +1,3 @@ +THIS FILE WILL CONTAIN THE FUNCTIONS NEEDED TO SUBMIT AN ISSUE TO gitea + +TAKING IN ARGUMENTS CONTAINING THE REQUEST DATA -- 2.34.1 From 41b0c63eb0c1927d5c9082b0f416b1e83f1a1ba7 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:41:52 +0100 Subject: [PATCH 048/144] Added version file --- php/version.php | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 php/version.php diff --git a/php/version.php b/php/version.php new file mode 100644 index 0000000..2302cc9 --- /dev/null +++ b/php/version.php @@ -0,0 +1,5 @@ + -- 2.34.1 From 82f394aa0b77b4b07effd4af5e95c263a1624eae Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:45:15 +0100 Subject: [PATCH 049/144] Include footer test --- page-blocks/footer.php | 4 ++++ report-issue/index.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 page-blocks/footer.php diff --git a/page-blocks/footer.php b/page-blocks/footer.php new file mode 100644 index 0000000..ae1b277 --- /dev/null +++ b/page-blocks/footer.php @@ -0,0 +1,4 @@ +Created by Fred Boniface - v$athenaVersion

" +?> diff --git a/report-issue/index.php b/report-issue/index.php index e64c3ec..34c740a 100644 --- a/report-issue/index.php +++ b/report-issue/index.php @@ -110,7 +110,7 @@
-

Created by Fred Boniface - v0.4.0-devel

+
-- 2.34.1 From 10c069e9999b619d2809f3db7ef98308690e4ace Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 18 Sep 2022 20:46:47 +0100 Subject: [PATCH 050/144] Fix includes --- page-blocks/footer.php | 2 +- report-issue/index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/page-blocks/footer.php b/page-blocks/footer.php index ae1b277..039f0d5 100644 --- a/page-blocks/footer.php +++ b/page-blocks/footer.php @@ -1,4 +1,4 @@ Created by Fred Boniface - v$athenaVersion

" ?> diff --git a/report-issue/index.php b/report-issue/index.php index 34c740a..bfe208d 100644 --- a/report-issue/index.php +++ b/report-issue/index.php @@ -110,7 +110,7 @@
- +
-- 2.34.1 From b93e4bf1bef507c077aac4884c92903d52627260 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 19:28:11 +0100 Subject: [PATCH 051/144] Simplified version.php --- php/version.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/php/version.php b/php/version.php index 2302cc9..b071876 100644 --- a/php/version.php +++ b/php/version.php @@ -1,5 +1,3 @@ -- 2.34.1 From 9d4808d64fa4618d85198860df6214a9491b05ee Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 19:33:48 +0100 Subject: [PATCH 052/144] Create a php-cli test script for gitea web call. --- php/submitIssue-cli-test.php | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 php/submitIssue-cli-test.php diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php new file mode 100644 index 0000000..96647d4 --- /dev/null +++ b/php/submitIssue-cli-test.php @@ -0,0 +1,37 @@ + $body, + 'title' => $subject, + 'closed' => 'false' + ); + + $issueData = json_encode($rawData); + + // Prepare CURL + $curlConnection = curl_init('https://git.fjla.uk/api/v1/repos/fred.boniface/athena.fb-infra.uk/issues'); + curl_setopt($curlConnection, CURLOPT_POSTFIELDS, $issueData); + curl_setopt($curlConnection, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curlConnection, CURLOPT_HTTPHEADER, $httpHeaders); + + // Get response and exit CURL + $giteaResponse = curl_exec($curlConnection); + curl_close($curlConnection); + + echo $issueData . "\n\n"; + echo $giteaResponse; +?> -- 2.34.1 From f2f0d33e61999ad9379ead2b6dae75adbb3b668b Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 19:40:08 +0100 Subject: [PATCH 053/144] Corrected php-cli test script --- php/submitIssue-cli-test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index 96647d4..c3ea73a 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -11,7 +11,7 @@ // Prepare $detail to POST $body = "This is a PHP-CLI test issue."; - $title = "Test Issue"; + $subject = "Test Issue"; // Prepare the request $rawData = array( -- 2.34.1 From c70c7637a3e7eb81b527cd0c0f82b78917d87748 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 19:46:34 +0100 Subject: [PATCH 054/144] Further changes of test scrupt --- php/submitIssue-cli-test.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index c3ea73a..d1f4c08 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -2,6 +2,8 @@ // Get API Key for git.fjla.uk $giteaKey = "Authorization: token d9e748bbca7b662dbd946854e57ae0213d0e8f88"; + echo "Gitea AUTH header is: $giteaKey"; + // Set httpHeaders $httpHeaders = array( "accept: application/json", @@ -13,6 +15,8 @@ $body = "This is a PHP-CLI test issue."; $subject = "Test Issue"; + echo "Prepared POST data:\nSubject: $subject\nBody:$body"; + // Prepare the request $rawData = array( 'body' => $body, @@ -22,6 +26,8 @@ $issueData = json_encode($rawData); + echo "Ready to send data:\n$issueData" + // Prepare CURL $curlConnection = curl_init('https://git.fjla.uk/api/v1/repos/fred.boniface/athena.fb-infra.uk/issues'); curl_setopt($curlConnection, CURLOPT_POSTFIELDS, $issueData); @@ -32,6 +38,5 @@ $giteaResponse = curl_exec($curlConnection); curl_close($curlConnection); - echo $issueData . "\n\n"; - echo $giteaResponse; + echo "Response: " . $giteaResponse; ?> -- 2.34.1 From a8bcfbba6120fd6c31019ed16fb430d983983461 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 19:47:22 +0100 Subject: [PATCH 055/144] syntax fixes --- php/submitIssue-cli-test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index d1f4c08..418d8ea 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -26,7 +26,7 @@ $issueData = json_encode($rawData); - echo "Ready to send data:\n$issueData" + echo "Ready to send data:\n$issueData"; // Prepare CURL $curlConnection = curl_init('https://git.fjla.uk/api/v1/repos/fred.boniface/athena.fb-infra.uk/issues'); -- 2.34.1 From 3751b69a191dcb93f7ca6498ac7db24f628897af Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 19:55:57 +0100 Subject: [PATCH 056/144] Trying without json_encode --- php/submitIssue-cli-test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index 418d8ea..8d5574b 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -30,7 +30,7 @@ // Prepare CURL $curlConnection = curl_init('https://git.fjla.uk/api/v1/repos/fred.boniface/athena.fb-infra.uk/issues'); - curl_setopt($curlConnection, CURLOPT_POSTFIELDS, $issueData); + curl_setopt($curlConnection, CURLOPT_POSTFIELDS, $rawData); curl_setopt($curlConnection, CURLOPT_RETURNTRANSFER, true); curl_setopt($curlConnection, CURLOPT_HTTPHEADER, $httpHeaders); -- 2.34.1 From 018a387e547a15f3c67965a34cedb8c85d74343e Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 19:57:36 +0100 Subject: [PATCH 057/144] without json_encode didnt work --- php/submitIssue-cli-test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index 8d5574b..418d8ea 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -30,7 +30,7 @@ // Prepare CURL $curlConnection = curl_init('https://git.fjla.uk/api/v1/repos/fred.boniface/athena.fb-infra.uk/issues'); - curl_setopt($curlConnection, CURLOPT_POSTFIELDS, $rawData); + curl_setopt($curlConnection, CURLOPT_POSTFIELDS, $issueData); curl_setopt($curlConnection, CURLOPT_RETURNTRANSFER, true); curl_setopt($curlConnection, CURLOPT_HTTPHEADER, $httpHeaders); -- 2.34.1 From dd42127e16990a43b29b869d1a6df7aff7554605 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 19:58:29 +0100 Subject: [PATCH 058/144] Try without closed --- php/submitIssue-cli-test.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index 418d8ea..f1f44d5 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -20,8 +20,7 @@ // Prepare the request $rawData = array( 'body' => $body, - 'title' => $subject, - 'closed' => 'false' + 'title' => $subject ); $issueData = json_encode($rawData); -- 2.34.1 From f369cb65bf2ed246d76cdbac716ec3a36e48c2c5 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Mon, 19 Sep 2022 20:00:41 +0100 Subject: [PATCH 059/144] Updated report-issue/index.php based on the CLI tests --- report-issue/index.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/report-issue/index.php b/report-issue/index.php index bfe208d..4f25f60 100644 --- a/report-issue/index.php +++ b/report-issue/index.php @@ -46,8 +46,7 @@ // Prepare the request $rawData = array( 'body' => $body, - 'title' => $subject, - 'closed' => 'false' + 'title' => $subject ); $issueData = json_encode($rawData); -- 2.34.1 From 542110baf0b84c167fb7efab58de0124f5f514e3 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Mon, 19 Sep 2022 20:25:23 +0100 Subject: [PATCH 060/144] moved report-issue/index.php to report-issue.php --- report-issue/index.php => report-issue.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename report-issue/index.php => report-issue.php (100%) diff --git a/report-issue/index.php b/report-issue.php similarity index 100% rename from report-issue/index.php rename to report-issue.php -- 2.34.1 From bd0502ef9f3bfc6629baf2e8da2f5adfa473f4fc Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Mon, 19 Sep 2022 20:28:38 +0100 Subject: [PATCH 061/144] Fixed path for include footer. --- report-issue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-issue.php b/report-issue.php index 4f25f60..f15d839 100644 --- a/report-issue.php +++ b/report-issue.php @@ -109,7 +109,7 @@
- +
-- 2.34.1 From a64a14420ef6a8bedc0a0456424f596c94fc6c45 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Mon, 19 Sep 2022 20:30:15 +0100 Subject: [PATCH 062/144] Corrected path for include version.php --- page-blocks/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/footer.php b/page-blocks/footer.php index 039f0d5..faad65c 100644 --- a/page-blocks/footer.php +++ b/page-blocks/footer.php @@ -1,4 +1,4 @@ Created by Fred Boniface - v$athenaVersion

" ?> -- 2.34.1 From 5afdf094d5a9e5b8c396aeaf9a0f2975c06e3927 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Mon, 19 Sep 2022 20:33:42 +0100 Subject: [PATCH 063/144] Echo gitea key to check it is found. --- report-issue.php | 1 + 1 file changed, 1 insertion(+) diff --git a/report-issue.php b/report-issue.php index f15d839..74c5d6b 100644 --- a/report-issue.php +++ b/report-issue.php @@ -101,6 +101,7 @@

You have submitted:

+

REQUEST DATA:

-- 2.34.1 From 833e81e6f3354dab17a6804602667335216812f4 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Mon, 19 Sep 2022 20:34:55 +0100 Subject: [PATCH 064/144] Remove echo $giteaKey to protect it. --- report-issue.php | 1 - 1 file changed, 1 deletion(-) diff --git a/report-issue.php b/report-issue.php index 74c5d6b..f15d839 100644 --- a/report-issue.php +++ b/report-issue.php @@ -101,7 +101,6 @@

You have submitted:

-

REQUEST DATA:

-- 2.34.1 From 6a54ff1b9f8ec42a87821325b55292ff61fa124b Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Mon, 19 Sep 2022 20:37:58 +0100 Subject: [PATCH 065/144] Changed CLI test to test from server. --- php/submitIssue-cli-test.php | 2 +- report-issue.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index f1f44d5..1f67918 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -13,7 +13,7 @@ // Prepare $detail to POST $body = "This is a PHP-CLI test issue."; - $subject = "Test Issue"; + $subject = "Test Issue - From PHP CLI"; echo "Prepared POST data:\nSubject: $subject\nBody:$body"; diff --git a/report-issue.php b/report-issue.php index f15d839..b484096 100644 --- a/report-issue.php +++ b/report-issue.php @@ -41,7 +41,7 @@ ); // Prepare $detail to POST - $body = "User Agent: " . $ua_str . "\n Server PHP Version: " . PHP_VERSION . "\n" . $detail; + $body = "User Agent: " . $ua_str . "\n Server PHP Version: " . PHP_VERSION . "\n\n\n" . $detail; // Prepare the request $rawData = array( -- 2.34.1 From 021a27e0140d75333c04e96034081c1efc53cc85 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Mon, 19 Sep 2022 20:40:39 +0100 Subject: [PATCH 066/144] Further changes to CLI test --- php/submitIssue-cli-test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index 1f67918..1f38ddf 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -1,6 +1,6 @@ Date: Mon, 19 Sep 2022 20:44:39 +0100 Subject: [PATCH 067/144] Change giteaKey to var in a server local php file --- php/submitIssue-cli-test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index 1f38ddf..b43648f 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -1,6 +1,6 @@ Date: Mon, 19 Sep 2022 20:46:06 +0100 Subject: [PATCH 068/144] Fixed previous commit --- php/submitIssue-cli-test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/submitIssue-cli-test.php b/php/submitIssue-cli-test.php index b43648f..17d48b1 100644 --- a/php/submitIssue-cli-test.php +++ b/php/submitIssue-cli-test.php @@ -1,6 +1,6 @@ Date: Tue, 20 Sep 2022 14:55:18 +0100 Subject: [PATCH 069/144] Remove PHP end tag from version.php --- php/version.php | 1 - 1 file changed, 1 deletion(-) diff --git a/php/version.php b/php/version.php index b071876..0d2e6fe 100644 --- a/php/version.php +++ b/php/version.php @@ -1,3 +1,2 @@ -- 2.34.1 From f995db23ea2400d91f9314ebb5328ed6c1c4a502 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:15:09 +0100 Subject: [PATCH 070/144] Change inclusion of $giteaKey from read file to require PHP file. --- report-issue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-issue.php b/report-issue.php index b484096..69abb45 100644 --- a/report-issue.php +++ b/report-issue.php @@ -31,7 +31,7 @@ $detail = validate($_POST["detail"]); // Get API Key for git.fjla.uk - $giteaKey = file_get_contents('/srv/php-keys/athena/gitea'); + require '/srv/php-keys/athena/gitea'; // Set httpHeaders $httpHeaders = array( -- 2.34.1 From 676dcfdc9864e0e7daa9f2b45069e0cbd0cc4269 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:15:22 +0100 Subject: [PATCH 071/144] Corrected filename --- report-issue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-issue.php b/report-issue.php index 69abb45..5c6f8b1 100644 --- a/report-issue.php +++ b/report-issue.php @@ -31,7 +31,7 @@ $detail = validate($_POST["detail"]); // Get API Key for git.fjla.uk - require '/srv/php-keys/athena/gitea'; + require '/srv/php-keys/athena/gitea.php'; // Set httpHeaders $httpHeaders = array( -- 2.34.1 From dc44deb343f6fa454fb39f3c224ce762337e4387 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:22:01 +0100 Subject: [PATCH 072/144] Create submitToGitea(...) function --- php/submitIssue.php | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/php/submitIssue.php b/php/submitIssue.php index 402f0ce..e1cae27 100644 --- a/php/submitIssue.php +++ b/php/submitIssue.php @@ -1,3 +1,34 @@ -THIS FILE WILL CONTAIN THE FUNCTIONS NEEDED TO SUBMIT AN ISSUE TO gitea + $body, + 'title' => $subject + ); + + $preparedData = json_encode($rawData); + + // Prepare CURL + $curlConnection = curl_init('https://git.fjla.uk/api/v1/repos/fred.boniface/athena.fb-infra.uk/issues'); + curl_setopt($curlConnection, CURLOPT_POSTFIELDS, $preparedData); + curl_setopt($curlConnection, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curlConnection, CURLOPT_HTTPHEADER, $httpHeaders); + + // Get response and exit CURL + $response = curl_exec($curlConnection); + curl_close($curlConnection); + + return $response; +} -- 2.34.1 From 95c1ea7b93678fc4dc987780508de8b4ec1aad17 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:24:09 +0100 Subject: [PATCH 073/144] Rename report-issue.php for neature URLs --- report-issue.php => issue.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename report-issue.php => issue.php (100%) diff --git a/report-issue.php b/issue.php similarity index 100% rename from report-issue.php rename to issue.php -- 2.34.1 From 30b05df104604891b7a4db59c077ca5f3cb52344 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:26:32 +0100 Subject: [PATCH 074/144] Create page-blocks/headers.php --- page-blocks/headers.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 page-blocks/headers.php diff --git a/page-blocks/headers.php b/page-blocks/headers.php new file mode 100644 index 0000000..cb95fee --- /dev/null +++ b/page-blocks/headers.php @@ -0,0 +1,9 @@ +; +echo ; +echo ; +echo ; +echo ; +echo ; +echo ; -- 2.34.1 From af0e2ec943776d4ece427e41153a8f325e5271c1 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:28:22 +0100 Subject: [PATCH 075/144] Remove headers and include headers.php --- issue.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/issue.php b/issue.php index 5c6f8b1..66e2001 100644 --- a/issue.php +++ b/issue.php @@ -1,17 +1,8 @@ - Athena - - - - - - - - - - + + Athena - Report Issue -- 2.34.1 From d106168b9bac8357e1f07373a2eecae32560b207 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:29:19 +0100 Subject: [PATCH 076/144] Move

tags from page to template --- issue.php | 3 --- page-blocks/footer.php | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/issue.php b/issue.php index 66e2001..830bc6f 100644 --- a/issue.php +++ b/issue.php @@ -99,10 +99,7 @@

-
-
- diff --git a/page-blocks/footer.php b/page-blocks/footer.php index faad65c..882dc7d 100644 --- a/page-blocks/footer.php +++ b/page-blocks/footer.php @@ -1,4 +1,4 @@ Created by Fred Boniface - v$athenaVersion

" +echo "

Created by Fred Boniface - v$athenaVersion

" ?> -- 2.34.1 From 175453f083231d3254d9c8cad5b6fa6fd07964eb Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:29:59 +0100 Subject: [PATCH 077/144] Formatting --- page-blocks/footer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/page-blocks/footer.php b/page-blocks/footer.php index 882dc7d..61df0af 100644 --- a/page-blocks/footer.php +++ b/page-blocks/footer.php @@ -1,4 +1,6 @@

Created by Fred Boniface - v$athenaVersion

" +echo "
" +echo "

Created by Fred Boniface - v$athenaVersion

" +echo "
" ?> -- 2.34.1 From c94ebb62b91036311fa73623a69417fd5fbdba8a Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:30:20 +0100 Subject: [PATCH 078/144] Formatting --- page-blocks/footer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/page-blocks/footer.php b/page-blocks/footer.php index 61df0af..290e2ac 100644 --- a/page-blocks/footer.php +++ b/page-blocks/footer.php @@ -3,4 +3,3 @@ include "./php/version.php"; echo "
" echo "

Created by Fred Boniface - v$athenaVersion

" echo "
" -?> -- 2.34.1 From ec6551e985d09ff6df671227d984847ded7cde34 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:34:44 +0100 Subject: [PATCH 079/144] index.html > index.php --- index.html => index.php | 15 ++------------- page-blocks/headers.php | 15 ++++++++------- 2 files changed, 10 insertions(+), 20 deletions(-) rename index.html => index.php (82%) diff --git a/index.html b/index.php similarity index 82% rename from index.html rename to index.php index c1c5606..80fd116 100644 --- a/index.html +++ b/index.php @@ -1,18 +1,9 @@ + Athena - - - - - - - - - - @@ -77,9 +68,7 @@ -
-

Created by Fred Boniface - v0.4.0-devel

-
+ diff --git a/page-blocks/headers.php b/page-blocks/headers.php index cb95fee..7ddfa77 100644 --- a/page-blocks/headers.php +++ b/page-blocks/headers.php @@ -1,9 +1,10 @@ ; -echo ; -echo ; -echo ; -echo ; -echo ; -echo ; +echo ''; +echo ';' +echo ''; +echo ''; +echo ''; +echo ''; +echo ''; +echo ''; -- 2.34.1 From 2e56d596642b6ca4feabb4605d33bbbd7c8f424d Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:41:47 +0100 Subject: [PATCH 080/144] Move nav-menu to external php file --- index.php | 11 ++--------- page-blocks/nav-menu.php | 10 ++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 page-blocks/nav-menu.php diff --git a/index.php b/index.php index 80fd116..19e3063 100644 --- a/index.php +++ b/index.php @@ -4,21 +4,14 @@ Athena - - + - - + diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php new file mode 100644 index 0000000..d5b44a4 --- /dev/null +++ b/page-blocks/nav-menu.php @@ -0,0 +1,10 @@ +'; + +echo '' +echo '' -- 2.34.1 From 746e77ddd98c285af0abe4d485de635284b0b4f8 Mon Sep 17 00:00:00 2001 From: "fred.boniface" Date: Tue, 20 Sep 2022 19:42:51 +0100 Subject: [PATCH 081/144] Add nav menu to issue.php --- issue.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/issue.php b/issue.php index 830bc6f..c14e07a 100644 --- a/issue.php +++ b/issue.php @@ -61,6 +61,9 @@ } ?> + + + -- 2.34.1 From 374333ed3a8ebfcfda0747bae0e57f45c2a096b4 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 20:23:06 +0100 Subject: [PATCH 082/144] Fixed syntax error --- page-blocks/headers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/headers.php b/page-blocks/headers.php index 7ddfa77..6f0a09f 100644 --- a/page-blocks/headers.php +++ b/page-blocks/headers.php @@ -1,7 +1,7 @@ '; -echo ';' +echo ''; echo ''; echo ''; echo ''; -- 2.34.1 From 460cc282dc5396afd676ee346b028bfcbb2bdb10 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 20:24:05 +0100 Subject: [PATCH 083/144] Fixed missing ;'s --- page-blocks/nav-menu.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php index d5b44a4..decf976 100644 --- a/page-blocks/nav-menu.php +++ b/page-blocks/nav-menu.php @@ -3,8 +3,8 @@ echo ''; echo '' -echo '' +echo ''; +echo ''; -- 2.34.1 From 64c69ef01cd2b7b233aed16daf58f151c82e6cf8 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 20:24:56 +0100 Subject: [PATCH 084/144] I use Python too much... more missing ;'s --- page-blocks/footer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/page-blocks/footer.php b/page-blocks/footer.php index 290e2ac..df5398d 100644 --- a/page-blocks/footer.php +++ b/page-blocks/footer.php @@ -1,5 +1,5 @@ " -echo "

Created by Fred Boniface - v$athenaVersion

" -echo "" +echo "
"; +echo "

Created by Fred Boniface - v$athenaVersion

"; +echo "
"; -- 2.34.1 From 2ac8c3fa83440f191620b80687ff1aace6e56861 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 20:36:00 +0100 Subject: [PATCH 085/144] Moved submission code to separate file --- issue.php | 54 +++++++++------------------------------------ php/submitIssue.php | 9 +++++++- 2 files changed, 19 insertions(+), 44 deletions(-) diff --git a/issue.php b/issue.php index c14e07a..a3eddfa 100644 --- a/issue.php +++ b/issue.php @@ -8,56 +8,24 @@ $body, - 'title' => $subject - ); - - $issueData = json_encode($rawData); - - // Prepare CURL - $curlConnection = curl_init('https://git.fjla.uk/api/v1/repos/fred.boniface/athena.fb-infra.uk/issues'); - curl_setopt($curlConnection, CURLOPT_POSTFIELDS, $issueData); - curl_setopt($curlConnection, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curlConnection, CURLOPT_HTTPHEADER, $httpHeaders); - - // Get response and exit CURL - $giteaResponse = curl_exec($curlConnection); - curl_close($curlConnection); - } - - function validate($data) { - $data = trim($data); - $data = stripslashes($data); - $data = htmlspecialchars($data); - return $data; + // Call POST function + sendInput($title,$body); } ?> diff --git a/php/submitIssue.php b/php/submitIssue.php index e1cae27..e501c05 100644 --- a/php/submitIssue.php +++ b/php/submitIssue.php @@ -1,6 +1,6 @@ Date: Tue, 20 Sep 2022 20:38:20 +0100 Subject: [PATCH 086/144] Removed unused variables --- issue.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/issue.php b/issue.php index a3eddfa..73afc0d 100644 --- a/issue.php +++ b/issue.php @@ -62,12 +62,6 @@ -

You have submitted:

-

REQUEST DATA: -
-
- JSON REPLY: -

-- 2.34.1 From 695fada5b95379c48c37571072af4d3aab6ee2de Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 20:40:29 +0100 Subject: [PATCH 087/144] Fix var names --- issue.php | 4 ++-- php/submitIssue.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/issue.php b/issue.php index 73afc0d..54c9601 100644 --- a/issue.php +++ b/issue.php @@ -13,7 +13,7 @@ require './php/submitIssue.php'; // Set initial values - $subject = $detail = ""; + $title = $detail = ""; $ua_str = $_SERVER["HTTP_USER_AGENT"]; // If the page has been POSTed to then run this: @@ -42,7 +42,7 @@
" method="post"> Subject:
- +

Details: diff --git a/php/submitIssue.php b/php/submitIssue.php index e501c05..c73ac58 100644 --- a/php/submitIssue.php +++ b/php/submitIssue.php @@ -15,7 +15,7 @@ function sendInput($title,$body) { // Prepare the request $rawData = array( 'body' => $body, - 'title' => $subject + 'title' => $title ); $preparedData = json_encode($rawData); -- 2.34.1 From ab00082232fb328cc0092549d500ac6a982acd4e Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 20:51:45 +0100 Subject: [PATCH 088/144] Replaced quicklinks with 'action buttons' --- index.php | 18 +++++++++--------- issue.php | 2 +- styles/style.css | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/index.php b/index.php index 19e3063..6f6843e 100644 --- a/index.php +++ b/index.php @@ -26,15 +26,15 @@

Quick Links

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

diff --git a/issue.php b/issue.php index 54c9601..bb79d6d 100644 --- a/issue.php +++ b/issue.php @@ -59,7 +59,7 @@

- + diff --git a/styles/style.css b/styles/style.css index 196ef48..b749c8d 100644 --- a/styles/style.css +++ b/styles/style.css @@ -47,7 +47,7 @@ a { line-height: 3; } -.quicklink { +.actionbutton { display: inline-block; cursor: pointer; background-color: #3c78d8; -- 2.34.1 From 6771a98f4376e824622cc4485015dac4443d2938 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 20:56:53 +0100 Subject: [PATCH 089/144] Create help.php page --- help.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 help.php diff --git a/help.php b/help.php new file mode 100644 index 0000000..0ab5b10 --- /dev/null +++ b/help.php @@ -0,0 +1,31 @@ + + + + + Athena - Report Issue + + + + + + + + + +

Help

+

Just type in a three character CRS code or a TIPLOC into the text + box and tap the Lookup button.

+

If you enter a TIPLOC, this will not be verified - if it is + incorrect or unavailable on Tiger, you will be redirected to a + blank board. CRS codes will be verified against a lookup file + before redirecting.

+

Some stations are not on Tiger and these stations are not supported + here either. Notably TfW and Chiltern stations that border the GWR + network. Most GWR Central served stations are now available to + lookup.

+

I am working on a new version that will provide data for every + station in the National Rail database.

+ + + + -- 2.34.1 From 86146ef5239d754816b1e74e944b8467849d5c24 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 20:57:42 +0100 Subject: [PATCH 090/144] Update comments --- help.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/help.php b/help.php index 0ab5b10..98070ea 100644 --- a/help.php +++ b/help.php @@ -26,6 +26,7 @@

I am working on a new version that will provide data for every station in the National Rail database.

+ - + -- 2.34.1 From dfceb41e61456f906bbfb5bec612c80bf374e801 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:01:36 +0100 Subject: [PATCH 091/144] Remove redundant CSS --- styles/style.css | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/styles/style.css b/styles/style.css index b749c8d..0a5c6dd 100644 --- a/styles/style.css +++ b/styles/style.css @@ -36,17 +36,6 @@ body { cursor: pointer; } -a { - display: float; - background-color: #3c78d8; - color: #f6f5f4; - padding: 7px; - border-radius: 5px; - text-decoration: none; - margin-bottom: 10px; - line-height: 3; -} - .actionbutton { display: inline-block; cursor: pointer; @@ -95,26 +84,6 @@ a { background-color: #112b55; } -.popup-info { - display: none; - position: absolute; - margin: 0 auto; - left: 0; - right: 0; - top: 20px; - width: 80%; - background-color: rgba(41,106,163,0.9); - color: white; - border-radius: 50px; - padding: 30px; -} - -.popup-close { - position: absolute; - right: 30px; - cursor: pointer; -} - footer { background-color: #7fa7e6; color: white; -- 2.34.1 From 7e574334e518e61749a4e56752bdc8bbb8f4a5f9 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:01:44 +0100 Subject: [PATCH 092/144] Adjust menu for new pages --- page-blocks/nav-menu.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php index decf976..b3dd60d 100644 --- a/page-blocks/nav-menu.php +++ b/page-blocks/nav-menu.php @@ -5,6 +5,7 @@ echo ''; echo ''; -- 2.34.1 From 7aee153e82b2a889ed1f36d3617f314ca0b52145 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:02:32 +0100 Subject: [PATCH 093/144] Once again, missing ; --- page-blocks/nav-menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php index b3dd60d..2441aee 100644 --- a/page-blocks/nav-menu.php +++ b/page-blocks/nav-menu.php @@ -6,6 +6,6 @@ echo ''; echo ''; echo ''; -- 2.34.1 From 52e69cb89ff746704c6d9d063b0b8bcc47d76649 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:05:48 +0100 Subject: [PATCH 094/144] Fixed styling --- page-blocks/nav-menu.php | 5 +++-- styles/style.css | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php index 2441aee..295c839 100644 --- a/page-blocks/nav-menu.php +++ b/page-blocks/nav-menu.php @@ -5,7 +5,8 @@ echo ''; echo ''; diff --git a/styles/style.css b/styles/style.css index 0a5c6dd..cde6915 100644 --- a/styles/style.css +++ b/styles/style.css @@ -60,7 +60,7 @@ body { } .menu-button { - position: absolute; + position: relative; background-color: #aac4ee; border: none; right: 30px; @@ -69,6 +69,7 @@ body { .menuitem { background-color: #2256aa; + text-decoration: none; color: #f6f5f4; border: none; border-radius: 18px; -- 2.34.1 From f6e5fa0ee56e674c7972b2b3bc53039b302e2a86 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:07:28 +0100 Subject: [PATCH 095/144] Changed positioning of close button --- page-blocks/nav-menu.php | 2 +- styles/style.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php index 295c839..99df8d5 100644 --- a/page-blocks/nav-menu.php +++ b/page-blocks/nav-menu.php @@ -8,5 +8,5 @@ echo ''; diff --git a/styles/style.css b/styles/style.css index cde6915..d84e419 100644 --- a/styles/style.css +++ b/styles/style.css @@ -60,7 +60,7 @@ body { } .menu-button { - position: relative; + position: absolute; background-color: #aac4ee; border: none; right: 30px; -- 2.34.1 From 19c59d2eb63c39028ece454e2d5a0f229c568142 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:08:43 +0100 Subject: [PATCH 096/144] Removed help info from index. --- index.php | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/index.php b/index.php index 6f6843e..024dc2d 100644 --- a/index.php +++ b/index.php @@ -42,24 +42,6 @@

This is an Alpha release and is under testing.

Some features may not work and some stations may not be available.

- - - -- 2.34.1 From f5a8bcdec3cb5aa96d660d283f4d07bdf60edf74 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:12:38 +0100 Subject: [PATCH 097/144] Changed form styling. --- issue.php | 4 ++-- styles/style.css | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/issue.php b/issue.php index bb79d6d..7fc48da 100644 --- a/issue.php +++ b/issue.php @@ -42,12 +42,12 @@
" method="post"> Subject:
- +

Details:
- +
On submission of this form, your browsers User Agent string will be collected alongside the information you provide above and will be diff --git a/styles/style.css b/styles/style.css index d84e419..6eaab4b 100644 --- a/styles/style.css +++ b/styles/style.css @@ -23,6 +23,22 @@ body { text-transform: uppercase; } +.form-text-small { + text-align: center; + border: black; + border-radius: 20px; + padding: 10px; + font-size: 18px; +} + +.form-text-large { + text-align: left; + border: black; + border-radius: 20px; + padding: 5px; + font-size: 16px; +} + .lookup-button { background-color: #3c78d8; color: #f6f5f4; -- 2.34.1 From 14d65ebfde978d9e54050f7030f01a912b58a4ee Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:15:32 +0100 Subject: [PATCH 098/144] Changed form styling --- issue.php | 4 ++-- styles/style.css | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/issue.php b/issue.php index 7fc48da..22bb965 100644 --- a/issue.php +++ b/issue.php @@ -40,12 +40,12 @@

Give as much detail as possible so we can try to fix the problem.

" method="post"> - Subject: + Subject:


- Details: + Details:

diff --git a/styles/style.css b/styles/style.css index 6eaab4b..2124cae 100644 --- a/styles/style.css +++ b/styles/style.css @@ -34,11 +34,16 @@ body { .form-text-large { text-align: left; border: black; - border-radius: 20px; + border-radius: 5px; padding: 5px; font-size: 16px; } +.form-info { + font-size: 16px; + font-weight: bold; +} + .lookup-button { background-color: #3c78d8; color: #f6f5f4; -- 2.34.1 From fa418a44d9a3fb55ea197096ea1ab8ffa8986bd0 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:16:37 +0100 Subject: [PATCH 099/144] Further form styling --- styles/style.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/styles/style.css b/styles/style.css index 2124cae..6f3e75e 100644 --- a/styles/style.css +++ b/styles/style.css @@ -26,7 +26,7 @@ body { .form-text-small { text-align: center; border: black; - border-radius: 20px; + border-radius: 5px; padding: 10px; font-size: 18px; } @@ -40,8 +40,9 @@ body { } .form-info { - font-size: 16px; - font-weight: bold; + font-size: 17px; + font-weight: bolder; + margin-bottom: 4px; } .lookup-button { -- 2.34.1 From e12cff51d078561752e301b07fe42a063dd9cbf8 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:20:13 +0100 Subject: [PATCH 100/144] Yet more styling --- issue.php | 16 ++++++++++------ styles/style.css | 5 +++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/issue.php b/issue.php index 22bb965..5169b03 100644 --- a/issue.php +++ b/issue.php @@ -49,14 +49,18 @@

- On submission of this form, your browsers User Agent string will be - collected alongside the information you provide above and will be - posted to git.fjla.uk/fred.boniface/athena.fb-infra.uk/issues. + + On submission of this form, your browsers User Agent string will be + collected alongside the information you provide above and will be + posted to git.fjla.uk/fred.boniface/athena.fb-infra.uk/issues. +

- Your user agent is: -
- + + Your user agent is: +
+ +

diff --git a/styles/style.css b/styles/style.css index 6f3e75e..724f194 100644 --- a/styles/style.css +++ b/styles/style.css @@ -40,11 +40,16 @@ body { } .form-info { + color: #3c78d8; font-size: 17px; font-weight: bolder; margin-bottom: 4px; } +.form-description { + color: #3c78d8; +} + .lookup-button { background-color: #3c78d8; color: #f6f5f4; -- 2.34.1 From b1d34ae2d90e47e969bbc28e74c2a3e4bbc75cfa Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:21:01 +0100 Subject: [PATCH 101/144] Further styling --- issue.php | 1 + 1 file changed, 1 insertion(+) diff --git a/issue.php b/issue.php index 5169b03..61a9583 100644 --- a/issue.php +++ b/issue.php @@ -49,6 +49,7 @@

+
On submission of this form, your browsers User Agent string will be collected alongside the information you provide above and will be -- 2.34.1 From 41eebb69045fe942194e3471fcef3cbb29a3f39c Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:21:53 +0100 Subject: [PATCH 102/144] styling --- issue.php | 6 ------ styles/style.css | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/issue.php b/issue.php index 61a9583..32fe37e 100644 --- a/issue.php +++ b/issue.php @@ -48,22 +48,16 @@ Details:
-
-
On submission of this form, your browsers User Agent string will be collected alongside the information you provide above and will be posted to git.fjla.uk/fred.boniface/athena.fb-infra.uk/issues. -
-
Your user agent is:
-
-
diff --git a/styles/style.css b/styles/style.css index 724f194..15085be 100644 --- a/styles/style.css +++ b/styles/style.css @@ -48,6 +48,8 @@ body { .form-description { color: #3c78d8; + margin-top: 5px; + margin-bottom: 5px; } .lookup-button { -- 2.34.1 From 8ff87b3416769f5cc0b02e1702729405ea719d46 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:22:58 +0100 Subject: [PATCH 103/144] Change margin to padding --- styles/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/style.css b/styles/style.css index 15085be..a213641 100644 --- a/styles/style.css +++ b/styles/style.css @@ -48,8 +48,8 @@ body { .form-description { color: #3c78d8; - margin-top: 5px; - margin-bottom: 5px; + padding-top: 5px; + padding-bottom: 5px; } .lookup-button { -- 2.34.1 From 518ae7e0d8c52afd423122c2a0e4161053020b50 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:23:51 +0100 Subject: [PATCH 104/144] Added
's --- issue.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/issue.php b/issue.php index 32fe37e..bb3c004 100644 --- a/issue.php +++ b/issue.php @@ -48,16 +48,19 @@ Details:
+
On submission of this form, your browsers User Agent string will be collected alongside the information you provide above and will be posted to git.fjla.uk/fred.boniface/athena.fb-infra.uk/issues. +
Your user agent is:
+
-- 2.34.1 From ef743f7e84760b945abfc4da59dba02ea17fc787 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:24:40 +0100 Subject: [PATCH 105/144] more
--- issue.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/issue.php b/issue.php index bb3c004..d64a9a4 100644 --- a/issue.php +++ b/issue.php @@ -49,18 +49,22 @@

+
+
On submission of this form, your browsers User Agent string will be collected alongside the information you provide above and will be posted to git.fjla.uk/fred.boniface/athena.fb-infra.uk/issues.
+
Your user agent is:

+
-- 2.34.1 From f6059c939093a7c6faf11d4df0204b6932781a12 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:26:50 +0100 Subject: [PATCH 106/144] Change text colour --- styles/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/styles/style.css b/styles/style.css index a213641..9c582ef 100644 --- a/styles/style.css +++ b/styles/style.css @@ -1,6 +1,6 @@ body { background-color: #aac4ee; - color: #359aff; + color: #0280e5; font-family: sans-serif; text-align: center; padding-bottom: 60px; /*Footer height*/ @@ -40,14 +40,14 @@ body { } .form-info { - color: #3c78d8; + color: #0280e5; font-size: 17px; font-weight: bolder; margin-bottom: 4px; } .form-description { - color: #3c78d8; + color: #0280e5; padding-top: 5px; padding-bottom: 5px; } -- 2.34.1 From c7a489e0acfc8d34ed5a689eed958ff6949050fe Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Tue, 20 Sep 2022 21:29:47 +0100 Subject: [PATCH 107/144] Remove index.php from link to homepage take users to / --- page-blocks/nav-menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php index 99df8d5..7ec96f1 100644 --- a/page-blocks/nav-menu.php +++ b/page-blocks/nav-menu.php @@ -5,7 +5,7 @@ echo ''; echo '