--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -1,227 +1,307 @@
- ' . $pageTitle . '
- ';
- if ($datepicker) echo '';
- if (isDebugServer()) echo '
-
- ';
- else echo '
-
- ';
- if ($datepicker) echo '
- ';
- echo '';
- if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod')) {
- echo '
+
+' . $pageTitle . ' - Canberra Bus Timetable
+
+
+
+ ';
+ $jqmVersion = "1.0.1";
+ 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";
+ } 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";
+ $jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js";
+
+ }
+ echo '
+
+
+
+
+
+
+
+
+ ';
+ echo '';
+ echo '';
+ if (isIOSDevice()){
+ echo '
';
- }
- if ($geolocate) {
- echo " ";
- }
- if (isAnalyticsOn()) echo '
- ";
+ }
+ if (isAnalyticsOn())
+ echo '
+";
-echo '
+ echo '
';
- if ($opendiv) {
- echo '
-
-
+ if ($opendiv) {
+ echo '
+
';
- }
-}
-function include_footer()
-{
- if ($geolocate && isset($_SESSION['lat'])) {
- echo "";
- }
- echo '';
- if (isAnalyticsOn()) {
- echo "";
+ $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
+ echo '
';
+ }
+ echo "\n