Changeset 9267 for src/django_gheat/website

Timestamp:

Jun 17, 2011, 1:13:58 PM (13 years ago)

Author:

dennisw

Message:

Moved scripts from home.html to heatmap_extensions.js for better overview.

Location:

src/django_gheat/website

Files:

• static/heatmap_extensions.js (modified) (1 diff)
• templates/home.html (modified) (1 diff)

src/django_gheat/website/static/heatmap_extensions.js

@@ -14 +14 @@
 
 $(document).ready(function() {
+  var signallayer = '';
   var userlist = new Array();
   var nodelist = new Array();
+
+  // add colour picker
+  $("#colour").colorPicker();
+
+  // add date picker for start date
+  $("#start_date").datepicker({
+    dateFormat: "dd/mm/yy",
+    onSelect: function(dateValue, inst){
+      $("#end_date").datepicker("option", "minDate", dateValue);
+    }
+  });
+
+  // add date picker for end date
+  $("#end_date").datepicker({
+    dateFormat: "dd/mm/yy",
+  });
+
+  // add slider for signal strength filter
+  $("#slider").slider({
+    range: true,
+    min: 0,
+    max: 100,
+    values: [0, 100],
+    // while sliding, it changes the text above the slider to show the values realtime
+    slide: function(event, sig){
+      $("#sig_value").text("Signal strength: " + sig.values[0] + " - " + sig.values[1]);
+    },
+    // on slider stop, it tries to delete the old layer and creates a new layer with the slider values
+    stop: function(event, sig){
+      if(signallayer){
+        map.removeLayer(signallayer);
+      }
+      OpenLayers.Layer.OSM.Overlay = OpenLayers.Class(OpenLayers.Layer.OSM, {
+        initialize: function(name, options) {
+          var url = [
+            "/website/tile/${z}/${x},${y}.png?colour=0,255,0&signaal__gte=" + sig.values[0] + "&signaal__lte=" + sig.values[1]
+          ];
+          options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
+          var newArguments = [name, url, options];
+          OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+        },
+      CLASS_NAME: "OpenLayers.Layer.Overlay"
+      });
+      signallayer = new OpenLayers.Layer.OSM.Overlay("Signal strength: " + sig.values[0] + " - " + sig.values[1], {isBaseLayer: false, visibility: true});
+      map.addLayer(signallayer);
+    },
+  });
+
+  // menu toggle
+  $("#menu_filter").click(function(){
+    $("#filter").slideToggle("fast");
+    $("#info").slideUp("fast"); 
+  });
+  $("#menu_info").click(function(){
+    $("#filter").slideUp("fast");
+    $("#info").slideToggle("fast"); 
+  });
 
   // Fastest?: http://stackoverflow.com/questions/170986/what-is-the-best-way-to-add-options-to-a-select-from-an-array-with-jquery

src/django_gheat/website/templates/home.html

@@ -11 +11 @@
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}colorpicker.js"></script>
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}jquery-ui-1.8.13.custom.min.js"></script>
-  <script language="javascript" type="text/javascript">
-    $(function(){
-      $("#colour").colorPicker();
-      $("#start_date").datepicker({
-        dateFormat: "dd/mm/yy",
-        onSelect: function(dateValue, inst){
-          $("#end_date").datepicker("option", "minDate", dateValue);
-        }
-      });
-      var signallayer = '';
-      $("#slider").slider({
-        range: true,
-        min: 0,
-        max: 100,
-        values: [0, 100],
-        slide: function(event, sig){
-          $("#sig_value").text("Signal strength: " + sig.values[0] + " - " + sig.values[1]);
-        },
-        stop: function(event, sig){
-          if(signallayer){
-            map.removeLayer(signallayer);
-          }
-          OpenLayers.Layer.OSM.Overlay = OpenLayers.Class(OpenLayers.Layer.OSM, {
-            initialize: function(name, options) {
-              var url = [
-                "/website/tile/${z}/${x},${y}.png?colour=0,255,0&signaal__gte=" + sig.values[0] + "&signaal__lte=" + sig.values[1]
-              ];
-              options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
-              var newArguments = [name, url, options];
-              OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
-            },
-          CLASS_NAME: "OpenLayers.Layer.Overlay"
-          });
-          signallayer = new OpenLayers.Layer.OSM.Overlay("Signal strength: " + sig.values[0] + " - " + sig.values[1], {isBaseLayer: false, visibility: true});
-          map.addLayer(signallayer);
-        },
-      });
-
-      $("#end_date").datepicker({
-        dateFormat: "dd/mm/yy",
-      });
-
-      $("#menu_filter").click(function(){
-        $("#filter").slideToggle("fast");
-        $("#info").slideUp("fast"); 
-      });
-      $("#menu_info").click(function(){
-        $("#filter").slideUp("fast");
-        $("#info").slideToggle("fast"); 
-      });
-    });
-  </script>
 </head>
 <body onload="init()">