--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -23,8 +23,10 @@ $url.= "&guid=ON"; return str_replace("&", "&", $url); } + function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { +global $labsPath; echo ' <!DOCTYPE html> <html lang="en"> @@ -33,31 +35,31 @@ <title>' . $pageTitle . '</title> <meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" /> - <link rel="stylesheet" href="css/jquery-ui-1.8.12.custom.css" />'; + <link rel="stylesheet" href="'.$labsPath.'css/jquery-ui-1.8.12.custom.css" />'; if (isDebugServer()) { - echo '<link rel="stylesheet" href="css/jquery.mobile-1.0a4.css" /> + echo '<link rel="stylesheet" href="'.$labsPath.'css/jquery.mobile-1.0b1.css" /> - <script type="text/javascript" src="js/jquery-1.5.js"></script> + <script type="text/javascript" src="'.$labsPath.'js/jquery-1.6.1.min.js"></script> <script>$(document).bind("mobileinit", function(){ $.mobile.ajaxEnabled = false; }); </script> - <script type="text/javascript" src="js/jquery.mobile-1.0a4.js"></script>'; + <script type="text/javascript" src="'.$labsPath.'js/jquery.mobile-1.0b1.js"></script>'; } else { - echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a4.1/jquery.mobile-1.0a4.1.min.css" /> - <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script> + echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.css" /> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script>$(document).bind("mobileinit", function(){ $.mobile.ajaxEnabled = false; }); </script> - <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a4.1/jquery.mobile-1.0a4.1.min.js"></script>'; + <script type="text/javascript" src="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js"></script>'; } echo ' - <script src="js/jquery.ui.autocomplete.min.js"></script> -<script src="js/jquery.ui.core.min.js"></script> -<script src="js/jquery.ui.position.min.js"></script> -<script src="js/jquery.ui.widget.min.js"></script> + <script src="'.$labsPath.'js/jquery.ui.autocomplete.min.js"></script> +<script src="'.$labsPath.'js/jquery.ui.core.min.js"></script> +<script src="'.$labsPath.'js/jquery.ui.position.min.js"></script> +<script src="'.$labsPath.'js/jquery.ui.widget.min.js"></script> <script> $(function() { $( "#geolocate" ).autocomplete({ @@ -76,6 +78,17 @@ </script> '; echo '<style type="text/css"> +.ui-li-thumb, .ui-li-icon { position: relative; }'; + +if (strstr($_SERVER['HTTP_USER_AGENT'], 'Android')) echo '.ui-shadow,.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a,.ui-body-b,.ui-btn-up-b,.ui-btn-hover-b, +.ui-btn-down-b,.ui-bar-c,.ui-body-c,.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c,.ui-bar-c,.ui-body-d, +.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d,.ui-bar-d,.ui-body-e,.ui-btn-up-e,.ui-btn-hover-e, +.ui-btn-down-e,.ui-bar-e,.ui-overlay-shadow,.ui-shadow,.ui-btn-active,.ui-body-a,.ui-bar-a { + text-shadow: none; + box-shadow: none; + -webkit-box-shadow: none; +}'; +echo ' .ui-navbar { width: 100%; } @@ -89,11 +102,11 @@ margin: 0 !important; } .ui-icon-navigation { - background-image: url(css/images/113-navigation.png); + background-image: url('.$labsPath.'css/images/113-navigation.png); background-position: 1px 0; } .ui-icon-beaker { - background-image: url(css/images/91-beaker-2.png); + background-image: url('.$labsPath.'css/images/91-beaker-2.png); background-position: 1px 0; } #footer { @@ -223,7 +236,7 @@ <div data-role="header" data-position="inline"> <a href="' . (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "javascript:history.go(-1)") . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a> <h1>' . $pageTitle . '</h1> - <a href="/index.php" data-icon="home" class="ui-btn-right">Home</a> + <a href="'.$labsPath.'/index.php" data-icon="home" class="ui-btn-right">Home</a> </div><!-- /header --> <a name="maincontent" id="maincontent"></a> <div data-role="content"> '; @@ -242,7 +255,9 @@ } function include_footer() { - echo '<div id="footer"><a href="about.php">About/Contact Us</a> <a href="feedback.php">Feedback/Bug Report</a>'; + +global $labsPath; + echo '<div id="footer"><a href="'.$labsPath.'about.php">About/Contact Us</a> <a href="'.$labsPath.'feedback.php">Feedback/Bug Report</a> <a href="'.$labsPath.'privacy.php">Privacy Policy</a>'; echo '</div>'; if (isAnalyticsOn()) { echo "<script> (function() {