--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -1,4 +1,20 @@
@@ -38,14 +54,18 @@
';
+ $jqmVersion = "1.0.1";
if (isDebugServer()) {
- $jqmcss = $basePath . 'css/jquery.mobile-1.0b2.css';
- $jqjs = $basePath . 'js/jquery-1.6.2.min.js';
- $jqmjs = $basePath . 'js/jquery.mobile-1.0b2.js';
+ $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";
} else {
- $jqmcss = "//code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.css";
- $jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js";
- $jqmjs = "//code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.js";
+ $jqmcss = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.css";
+ $jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js";
+ $jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js";
}
echo '
@@ -87,7 +107,7 @@
}';
echo '';
echo '';
- if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
+ if (isIOSDevice()) {
echo '
@@ -152,20 +172,44 @@
';
- $overrides = getServiceOverride();
- if ($overrides['service_id']) {
- if ($overrides['service_id'] == "noservice") {
- echo '
';
- } else {
- echo '
';
- }
- }
- if ($GTFSREnabled) {
- $serviceAlerts = getServiceAlertsAsArray("agency", "0");
- foreach ($serviceAlerts['entity'] as $entity) {
- echo "
" . date("F j, g:i a", strtotime($entity['alert']['active_period'][0]['start'])) . " to " . date("F j, g:i a", strtotime($entity['alert']['active_period'][0]['end'])) . "{$entity['alert']['header_text']['translation'][0]['text']}
Warning: {$entity['alert']['description_text']['translation'][0]['text']}
-
Source ";
+ } else {
+ echo '
';
+ }
+ }
+ $serviceAlerts = Array();
+ $globalAlerts = getServiceAlertsAsArray("agency", "0");
+ if ($globalAlerts != null) {
+ // echo "getting alerts due to network wide";
+ $serviceAlerts = array_merge($serviceAlerts, $globalAlerts);
+ }
+ if (isset($stopid)) {
+ $stopAlerts = getServiceAlertsAsArray("stop", $stopid);
+ if ($stopAlerts != null) {
+ // echo "getting alerts due to stop $stopid";
+ $serviceAlerts = array_merge($serviceAlerts, $stopAlerts);
+ }
+ }
+ if (isset($routeid)) {
+ $routeAlerts = getServiceAlertsAsArray("route", $routeid);
+ if ($routeAlerts != null) {
+ // echo "getting alerts due to route $routeid";
+ $serviceAlerts = array_merge($serviceAlerts, $routeAlerts);
+ }
+ }
+ if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) {
+ foreach ($serviceAlerts['entity'] as $entity) {
+ echo "
{$entity['alert']['header_text']['translation'][0]['text']} "
+ . 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']) . "
+
Warning: {$entity['alert']['description_text']['translation'][0]['text']}
+
Source ";
+ }
}
}
}
@@ -185,13 +229,43 @@
s.parentNode.insertBefore(ga, s);
})();";
$googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
- echo '
';
+ echo '
';
}
echo "\n