--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -1,32 +1,49 @@
@@ -36,29 +53,29 @@ - '; - 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'; - } - else { - $jqmcss = "//code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.css"; - $jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"; - $jqmjs = "//code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js"; - } - echo ' - + '; + $jqmVersion = "1.1.0"; + if (isDebugServer()) { + $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.7.1/jquery.min.js"; + $jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js"; + } + echo ' + - - - - - - + + + + + + '; - echo ''; - echo ''; - if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) { - echo ' + echo ''; + echo ''; + if (isIOSDevice()) { + echo ' '; - } - if ($geolocate) { - echo " "; - } - if (isAnalyticsOn()) echo ' + if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") + echo "geolocate();"; + echo " "; + } + if (isAnalyticsOn()) + echo ' "; - echo ' + echo ' '; - if ($opendiv) { - echo '