Adapt to new directory structure.
This commit is contained in:
parent
50a0369ba1
commit
c229df33b5
7 changed files with 27 additions and 31 deletions
|
@ -2,10 +2,10 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>uBus - Routes</title>
|
<title>uBus - Routes</title>
|
||||||
<?php include 'head.php'; ?>
|
<?php include 'modules/head.php'; ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php include 'nav.php'; ?>
|
<?php include 'modules/nav.php'; ?>
|
||||||
|
|
||||||
<h1>Routes</h1>
|
<h1>Routes</h1>
|
||||||
<p>This is a table of all the routes. Click on a route's name to see a list of
|
<p>This is a table of all the routes. Click on a route's name to see a list of
|
||||||
|
@ -22,7 +22,7 @@ to see a list of routes that have this line number</p>
|
||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
include 'libdata.php';
|
include 'modules/libdata.php';
|
||||||
|
|
||||||
foreach ($routes as $route){
|
foreach ($routes as $route){
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
|
@ -37,7 +37,7 @@ foreach ($routes as $route){
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
<?php include 'foot.php'; ?>
|
<?php include 'modules/foot.php'; ?>
|
||||||
</body>
|
</body>
|
||||||
</html
|
</html
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>uBus - ShowLine</title>
|
<title>uBus - ShowLine</title>
|
||||||
<?php include 'head.php'; ?>
|
<?php include 'modules/head.php'; ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php include 'nav.php'; ?>
|
<?php include 'modules/nav.php'; ?>
|
||||||
|
|
||||||
<h1>ShowLine</h1>
|
<h1>ShowLine</h1>
|
||||||
<p>Here you can find a list of routes that have a specified line number. Click
|
<p>Here you can find a list of routes that have a specified line number. Click
|
||||||
|
@ -15,7 +15,7 @@ on the map.</p>
|
||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
include 'libdata.php';
|
include 'modules/libdata.php';
|
||||||
|
|
||||||
if (isValidLine($_GET["line"])){
|
if (isValidLine($_GET["line"])){
|
||||||
echo '<header><h1>Line ' . $_GET["line"] . '</h1></header>';
|
echo '<header><h1>Line ' . $_GET["line"] . '</h1></header>';
|
||||||
|
@ -39,7 +39,7 @@ function PrintRoutes($line){
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<?php include 'foot.php'; ?>
|
<?php include 'modules/foot.php'; ?>
|
||||||
</body>
|
</body>
|
||||||
</html
|
</html
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>uBus - ShowRoute</title>
|
<title>uBus - ShowRoute</title>
|
||||||
<?php include 'head.php'; ?>
|
<?php include 'modules/head.php'; ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php include 'nav.php'; ?>
|
<?php include 'modules/nav.php'; ?>
|
||||||
|
|
||||||
<h1>ShowRoute</h1>
|
<h1>ShowRoute</h1>
|
||||||
<p>There are two tables below that list the bus stops of a route; one for each
|
<p>There are two tables below that list the bus stops of a route; one for each
|
||||||
|
@ -15,7 +15,7 @@ and view its position on a map.</p>
|
||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
include 'libdata.php';
|
include 'modules/libdata.php';
|
||||||
|
|
||||||
if (isValidRoute($_GET['route'])){
|
if (isValidRoute($_GET['route'])){
|
||||||
$route = getRouteInfo($_GET['route']);
|
$route = getRouteInfo($_GET['route']);
|
||||||
|
@ -41,11 +41,7 @@ function PrintStops($rt,$dir){
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tbody>
|
<?php include 'modules/foot.php'; ?>
|
||||||
</table>
|
|
||||||
|
|
||||||
|
|
||||||
<?php include 'foot.php'; ?>
|
|
||||||
</body>
|
</body>
|
||||||
</html
|
</html
|
||||||
|
|
||||||
|
|
10
ShowStop.php
10
ShowStop.php
|
@ -2,11 +2,11 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>uBus - ShowStop</title>
|
<title>uBus - ShowStop</title>
|
||||||
<?php include 'head.php'; ?>
|
<?php include 'modules/head.php'; ?>
|
||||||
<?php include 'map.php'; ?>
|
<?php include 'modules/map.php'; ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php include 'nav.php'; ?>
|
<?php include 'modules/nav.php'; ?>
|
||||||
|
|
||||||
<h1>ShowStop</h1>
|
<h1>ShowStop</h1>
|
||||||
<p>Below you can find two tables. One of them shows a list of routes tha visit
|
<p>Below you can find two tables. One of them shows a list of routes tha visit
|
||||||
|
@ -16,7 +16,7 @@ is also a map showing the location of the requested stop.</p>
|
||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
include 'libdata.php';
|
include 'modules/libdata.php';
|
||||||
|
|
||||||
if (isValidStop($_GET["stop"])){
|
if (isValidStop($_GET["stop"])){
|
||||||
$stop=getStopInfo($_GET["stop"]);
|
$stop=getStopInfo($_GET["stop"]);
|
||||||
|
@ -58,7 +58,7 @@ function PrintRoutes($stp){
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<?php include 'foot.php'; ?>
|
<?php include 'modules/foot.php'; ?>
|
||||||
</body>
|
</body>
|
||||||
</html
|
</html
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>uBus - Stops</title>
|
<title>uBus - Stops</title>
|
||||||
<?php include 'head.php'; ?>
|
<?php include 'modules/head.php'; ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php include 'nav.php'; ?>
|
<?php include 'modules/nav.php'; ?>
|
||||||
|
|
||||||
<h1>Stops</h1>
|
<h1>Stops</h1>
|
||||||
<p>This is a table of all the bus stops. Click on a stop's name to view its
|
<p>This is a table of all the bus stops. Click on a stop's name to view its
|
||||||
|
@ -22,7 +22,7 @@ on their way to it.</p>
|
||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
include 'libdata.php';
|
include 'modules/libdata.php';
|
||||||
|
|
||||||
foreach ($stops as $stop){
|
foreach ($stops as $stop){
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
|
@ -37,7 +37,7 @@ foreach ($stops as $stop){
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
<?php include 'foot.php'; ?>
|
<?php include 'modules/foot.php'; ?>
|
||||||
</body>
|
</body>
|
||||||
</html
|
</html
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>uBus - Home</title>
|
<title>uBus - Home</title>
|
||||||
<?php include 'head.php'; ?>
|
<?php include 'modules/head.php'; ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php include 'nav.php'; ?>
|
<?php include 'modules/nav.php'; ?>
|
||||||
<h1>Home</h1>
|
<h1>Home</h1>
|
||||||
<p>uBus is a generic web application that displays data regading buses,
|
<p>uBus is a generic web application that displays data regading buses,
|
||||||
routes and stops of public transport bus services. It uses modern web
|
routes and stops of public transport bus services. It uses modern web
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<?php include 'foot.php'; ?>
|
<?php include 'modules/foot.php'; ?>
|
||||||
</body>
|
</body>
|
||||||
</html
|
</html
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
$routes = json_decode(file_get_contents("routes.json"), true);
|
$routes = json_decode(file_get_contents("data/routes.json"), true);
|
||||||
$stops = json_decode(file_get_contents("stops.json"), true);
|
$stops = json_decode(file_get_contents("data/stops.json"), true);
|
||||||
$busposition = json_decode(file_get_contents("busposition.json"), true);
|
$busposition = json_decode(file_get_contents("data/busposition.json"), true);
|
||||||
?>
|
?>
|
||||||
|
|
Reference in a new issue