--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -46,7 +46,7 @@ echo ' <!DOCTYPE html> <html lang="en"> - <head> + <head profile="http://microformats.org/profile/hcalendar http://microformats.org/profile/geo http://vocab.org/transit/terms"> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>' . $pageTitle . ' - Canberra Bus Timetable</title> @@ -54,17 +54,14 @@ <link rel="dns-prefetch" href="//code.jquery.com"> <link rel="dns-prefetch" href="//ajax.googleapis.com"> <link rel="stylesheet" href="' . $basePath . 'css/jquery-ui-1.8.12.custom.css" />'; - $jqmVersion = "1.0.1"; + $jqmVersion = "1.1.0"; if (isDebugServer()) { - $jqmcss = $basePath . "css/jquery.mobile-$jqmVersion.css"; - $jqjs = $basePath . "js/jquery-1.6.4.min.js"; - $jqmjs = $basePath . "js/jquery.mobile-$jqmVersion.js"; - - $jqmcss = $basePath . "css/jquery.mobile-b90eab4935.css"; - $jqmjs = $basePath . "js/jquery.mobile-b90eab4935.js"; + $jqmcss = $basePath . "css/jquery.mobile-$jqmVersion.min.css"; + $jqjs = $basePath . "js/jquery-1.7.2.min.js"; + $jqmjs = $basePath . "js/jquery.mobile-$jqmVersion.min.js"; } else { $jqmcss = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.css"; - $jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"; + $jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"; $jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js"; } echo '<link rel="stylesheet" href="' . $jqmcss . '" /> @@ -164,11 +161,11 @@ </div> '; if ($opendiv) { - echo '<div data-role="page"> - <div data-role="header" data-position="inline"> + echo '<div data-role="page"'. (isset($stopid) ? 'itemscope itemtype="http://schema.org/BusStop"':'').'>'; + echo '<div data-role="header" data-position="inline"> <a href="' . (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "javascript:history.go(-1)") . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a> - <h1>' . $pageTitle . '</h1> - <a href="' . $basePath . '/index.php" data-icon="home" class="ui-btn-right">Home</a> + <h1 itemprop="name">' . $pageTitle . '</h1> + <a href="' . $basePath . '/index.php" data-icon="home" class="ui-btn-right" rel="home">Home</a> </div><!-- /header --> <a name="maincontent" id="maincontent"></a> <div data-role="content"> '; @@ -176,10 +173,10 @@ $overrides = getServiceOverride(); if (isset($overrides['service_id'])) { if ($overrides['service_id'] == "noservice") { - echo '<div id="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a + echo '<div class="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>'; } else { - echo '<div id="servicewarning">Buses are running on an altered timetable today due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>'; + echo '<div class="servicewarning">Buses are running on an altered timetable today due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>'; } } $serviceAlerts = Array(); @@ -204,7 +201,7 @@ } if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) { foreach ($serviceAlerts['entity'] as $entity) { - echo "<div id='servicewarning'><b>{$entity['alert']['header_text']['translation'][0]['text']}</b> <small>" + echo "<div class='servicewarning'><b>{$entity['alert']['header_text']['translation'][0]['text']}</b> <small>" . date("F jS Y, g:i a", $entity['alert']['active_period'][0]['start']) . " to " . date("F jS Y, g:i a", $entity['alert']['active_period'][0]['end']) . "</small> <br>Warning: {$entity['alert']['description_text']['translation'][0]['text']} @@ -218,7 +215,8 @@ function include_footer() { global $basePath; echo '<div id="footer"><a href="' . $basePath . 'about.php">About/Contact Us</a> <a href="' . $basePath . 'feedback.php">Feedback/Bug Report</a> <a href="' . $basePath . 'privacy.php">Privacy Policy</a>'; - echo '</div>'; + echo '<br><small> + <a rel="license" href="http://creativecommons.org/licenses/by/3.0/au/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by/3.0/au/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/3.0/au/">Creative Commons Attribution 3.0 Australia License</a>.</div></small>'; if (isAnalyticsOn()) { echo "<script> (function() { var ga = document.createElement('script'); ga.type =