index.erb in attack-barometer-0.5.0

- old
+ new

@@ -15,10 +15,11 @@
     <br/>
     Source :
       <input type="checkbox" name="query[source]" value="wunderground" checked="checked" /> Wunderground
       <input type="checkbox" name="query[source]" value="yahoo" /> Yahoo
       <input type="checkbox" name="query[source]" value="google" /> Google
+      <input type="checkbox" name="query[source]" value="weather_dot_com" /> Weather.com
     <br/>
     Force Geocode? :
       <input id="query_geocode" name="query[geocode]" type="checkbox" value="1" checked="checked" />
   </div>
 </form>
@@ -58,19 +59,25 @@
   
   <% if @barometer.query %>
   <h3>Query</h3>
   <p>
     <ul>
+      <%= data("Query", @barometer.query.q) %>
       <%= data("Format", @barometer.query.format) %>
-      <% if @barometer.query.geo %>
+      <%= data("Country Code", @barometer.query.country_code) %>
+    </ul>  
+    <% if @barometer.query.geo %>
+    <ul> - Geo -
+      <%= data("Query", @barometer.query.geo.query) %>
+      <%= data("Address", @barometer.query.geo.address) %>
       <%= data("Locality", @barometer.query.geo.locality) %>
       <%= data("Region", @barometer.query.geo.region) %>
       <%= data("Country", @barometer.query.geo.country) %>
       <%= data("Country Code", @barometer.query.geo.country_code) %>
       <%= data("Latitude", @barometer.query.geo.latitude) %>
       <%= data("Longitude", @barometer.query.geo.longitude) %>
-      <% end %>
-    </ul>
+    </ul>  
+    <% end %>
   </p>
   <% end %>
 
   <% @weather.measurements.each do |measurement| %>
     <%= erb(:measurement, :locals => { :measurement => measurement }, :layout => false) %>
\ No newline at end of file