From: Maxious <maxious@lambdacomplex.org>
Date: Sat, 31 Mar 2012 08:18:43 +0000
Subject: Code standards
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=bb905fe0ff7fb4d887b8f5f836ad4f37bcc52a65
---
Code standards
---


--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -54,7 +54,7 @@
 <link rel="dns-prefetch" href="//code.jquery.com">
 <link rel="dns-prefetch" href="//ajax.googleapis.com">
 	<link rel="stylesheet"  href="' . $basePath . 'css/jquery-ui-1.8.12.custom.css" />';
-    $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 '<link rel="stylesheet"  href="' . $jqmcss . '" />

--- a/myway/myway_timeliness.php
+++ b/myway/myway_timeliness.php
@@ -89,8 +89,8 @@
             },
             yaxis: {
                 tickFormatter: yformatter,
-                min: -60*8,
-                max: 60*8
+                min: -60*10,
+                max: 60*10
             },
             mouse: { track: true, relative: true, trackFormatter: showTooltip}
         });
@@ -112,3 +112,4 @@
     }
 
 </script> 
+

--- a/stop.php
+++ b/stop.php
@@ -141,7 +141,7 @@
 if (sizeof($trips) == 0) {
     echo "<li style='text-align: center;'>No trips in the near future.</li>";
 } else {
-            if ($labs) {
+            if (isset($labs)) {
 // ETA calculation
                 
                 $tripETA = Array();
@@ -176,7 +176,7 @@
             $destination = getTripDestination($trip['trip_id']);
             echo '<a href="trip.php?stopid=' . $stopid . '&amp;tripid=' . $trip['trip_id'] . '"><h3>' . $trip['route_short_name'] . " towards " . $destination['stop_name'] . "</h3><p>";
             $viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
-if ($labs) {
+if (isset($labs)) {
                 echo '<br><span class="eta">ETA: ' . $tripETA[$trip['trip_id']] . '</span>';
             }
             if ($viaPoints != "")

--- a/stopList.php
+++ b/stopList.php
@@ -81,7 +81,7 @@
         trackEvent("Stop Lists", "Stops By Suburb", $suburb);
     } else {
         $listType = 'allstops=yes';
-        $stops = getStops($firstLetter);
+        $stops = getStops((isset($firstLetter)? $firstLetter : ""));
         include_header("Stops by Name", "stopList");
         navbar();
     }