Changeset 9239 for src/django_gheat


Ignore:
Timestamp:
Jun 7, 2011, 5:19:17 PM (13 years ago)
Author:
dennisw
Message:

Used Rick's last Rev to make the filters work better. Will fix rest later.

Added jquery-1.6.1 to static, no more loading from sites like googleapis.com.

Location:
src/django_gheat/website
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • src/django_gheat/website/static/heatmap_extensions_test.js

    r9237 r9239  
    2020    function(json) {
    2121      $.each(json, function(i,json){
    22         gebruiker_class = json.gebruiker;
    23         $("<option value='"  + json.gebruiker + "'>" + json.gebruiker + "</option>").appendTo("#mark");
     22        $("<option value='"  + json.gebruiker + "'>" + json.gebruiker + "</option>").appendTo("#select_user");
    2423        $.each(json.meetrondje, function(m, meetrondje){
    25           $("<option class='" + gebruiker_class + "' value='" + meetrondje.naam + "'>"+ meetrondje.naam + "</option>").appendTo("#series");
     24          $("<option class='" + json.gebruiker + "' value='" + meetrondje.naam + "'>"+ meetrondje.naam + "</option>").appendTo("#select_dataset");
    2625          $.each(meetrondje.nodes, function(n, nodes){
    27             $("<option>" + nodes + "</option>").appendTo("#model");
     26            $("<option class='" + meetrondje.naam + "' value='" + nodes + "'>" + nodes + "</option>").appendTo("#select_node");
    2827          });
    2928//          $("<option>" + meetrondje.datum + "</option>").appendTo("#select_date");
    … …  
    3130      });
    3231// Initiate the chain
    33     $("#series").chained("#mark");
    34     $("#model").chained("#series");
     32    $("#select_dataset").chained("#select_user");
     33    $("#select_node").chained("#select_dataset");
    3534    }
    3635  );

  • src/django_gheat/website/templates/home.html

    r9237 r9239  
    22<head>
    33  <link href="{{ STATIC_URL }}style.css" rel="stylesheet" type="text/css" media="screen" />
    4   <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
     4  <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}jquery-1.6.1.min.js"></script>
    55  <!-- Disable during debugging, if you do not need the map to be displayed -->
    66  <!--
    … …  
    4242      <p>Create your custom layer by choosing the desired filter options on the right and adding it the layer to the list.</p>
    4343      <p>For instance, you can choose to create a layer with data measured only by yourself, or with a certain node from Wireless Leiden only.</p>
    44 <select id="mark">
    45   <option value="">--</option>
    46   <option value="bmw">BMW</option>
    47   <option value="audi">Audi</option>
    48 </select>
    49 <select id="series">
    50   <option value="">--</option>
    51   <option value="series-3" class="bmw">3 series</option>
    52   <option value="series-5" class="bmw">5 series</option>
    53   <option value="series-6" class="bmw">6 series</option>
    54   <option value="a3" class="audi">A3</option>
    55   <option value="a4" class="audi">A4</option>
    56   <option value="a5" class="audi">A5</option>
    57 </select>
    58 <select id="model">
    59   <option value="">--</option>
    60   <option value="coupe" class="series-3 series-6 a5">Coupe</option>
    61   <option value="cabrio" class="series-3 series-6 a3 a5">Cabrio</option>
    62   <option value="sedan" class="series-3 series-5 a3 a4">Sedan</option>
    63   <option value="sportback" class="a3 a5">Sportback</option>
    64 </select>
    65 
    66 
    67 </div>
     44      </div>
    6845      <div id="filter_list">
     46        <form method="get" action="">
     47          <select id="select_date" style="width:104px"><option>All</option></select> Date<br />
     48          <select id="select_user" style="width:104px"><option>All</option></select> User<br />
     49          <select id="select_dataset" style="width:104px"><option>All</option></select> Dataset<br />
     50          <select id="select_node" style="width:104px"><option>All</option></select> Node<br />
     51          <select id="select_encryption" style="width:104px"><option>All</option></select> Encryption<br />
     52          <input type="text" id="lname" name="lname" size="10"/> Layername<br />
     53          <input type="text" id="colour" name="colour" size="10"/> Colour<br />
     54          <input type="button" id="add_filter" value="Add filter"/>
     55        </form>
    6956      </div>
    70 
    7157    </div>
    7258  </div>
Note: See TracChangeset for help on using the changeset viewer.