--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -25,7 +25,7 @@
}
function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false)
{
- global $labsPath;
+ global $labsPath,$serviceAlertsEnabled;
echo '
@@ -34,16 +34,18 @@
' . $pageTitle . '
+
+
';
if (isDebugServer()) {
- $jqmcss = $labsPath . 'css/jquery.mobile-1.0b1.css';
- $jqjs = $labsPath . 'js/jquery-1.6.1.min.js';
- $jqmjs = $labsPath . 'js/jquery.mobile-1.0b1.js';
+ $jqmcss = $labsPath . 'css/jquery.mobile-1.0b2.css';
+ $jqjs = $labsPath . 'js/jquery-1.6.2.min.js';
+ $jqmjs = $labsPath . 'js/jquery.mobile-1.0b2.js';
}
else {
- $jqmcss = "http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.css";
- $jqjs = "http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js";
- $jqmjs = "http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js";
+ $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";
}
echo '
@@ -96,8 +98,11 @@
function success(position) {
$('#error').val('Location now detected. Please wait for data to load.');
$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);
-$.ajax({ url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });
-location.reload(true);
+$.ajax({ async: false,
+success: function(){
+ location.reload(true);
+ },
+url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });
}
function error(msg) {
$('#error').val('Error: '+msg);
@@ -154,6 +159,13 @@
echo '';
}
}
+ if ($serviceAlertsEnabled) {
+ $serviceAlerts = getServiceAlerts("network","network");
+ foreach ($serviceAlerts['entities'] as $entity) {
+ echo "".date("F j, g:i a",strtotime($entity['alert']['active_period']['start']))." to ". date("F j, g:i a", strtotime($entity['alert']['active_period']['end']))."
Warning: {$entity['alert']['description']['translation']}
+
Source ";
+ }
+ }
}
}
function include_footer()