--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -54,7 +54,7 @@
';
- $jqmVersion = "1.0.1";
+ $jqmVersion = "1.1.0-rc.1";
if (isDebugServer()) {
$jqmcss = $basePath . "css/jquery.mobile-$jqmVersion.css";
$jqjs = $basePath . "js/jquery-1.6.4.min.js";
@@ -64,7 +64,7 @@
$jqmjs = $basePath . "js/jquery.mobile-b90eab4935.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 '
@@ -176,35 +176,35 @@
$overrides = getServiceOverride();
if (isset($overrides['service_id'])) {
if ($overrides['service_id'] == "noservice") {
- echo '
';
} else {
- echo '';
+ echo '';
}
}
$serviceAlerts = Array();
$globalAlerts = getServiceAlertsAsArray("agency", "0");
- if ($globalAlerts != nullarray) {
+ if ($globalAlerts != null) {
// echo "getting alerts due to network wide";
$serviceAlerts = array_merge($serviceAlerts, $globalAlerts);
}
if (isset($stopid)) {
$stopAlerts = getServiceAlertsAsArray("stop", $stopid);
- if ($stopAlerts != nullarray) {
+ if ($stopAlerts != null) {
// echo "getting alerts due to stop $stopid";
$serviceAlerts = array_merge($serviceAlerts, $stopAlerts);
}
}
if (isset($routeid)) {
$routeAlerts = getServiceAlertsAsArray("route", $routeid);
- if ($routeAlerts != nullarray) {
+ 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']} "
+ 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']}
@@ -229,7 +229,7 @@
s.parentNode.insertBefore(ga, s);
})();";
$googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
- echo '
';
+ echo '
';
}
echo "\n