concerto_weather 0.0.4 → 0.0.5

data/app/assets/javascripts/concerto_weather/weather.js

@@ -2,8 +2,10 @@
 // attach handler to woeid so when it loses focus we can look it up
 // not dry, but no middle man
 function attachWoeidHandlers() {
-  $('input#weather_config_woeid').on('blur', getWoeidInfo);
+  console.log('attaching woeid handlers');
 
+  $('input#weather_config_woeid').on('keyup', getWoeidInfo);
+  
   function getWoeidInfo() {
     // will place name, district-county, province-state, country, woeid into 'div.woeid-info'
 
@@ -46,13 +48,13 @@ function attachWoeidHandlers() {
             // });
 
             // icky html table construction (with classes for bootstrap)
-            places = "<table class=\"table table-striped table-condensed table-bordered\">";
+            places = "<table class=\"table table-condensed\">";
             places += "<thead><tr><th>Name</th><th>Type</th><th>District/County/Region</th><th>Province/State</th><th>Country</th><th>WOEID</th></th></thead>";
             places += "<tbody>";
             tbody = "";
             j.forEach(function(item) {
               // todo: need htmlencoding
-              tbody += "<tr><td>" + htmlEncode(item.name) + "</td><td>" + 
+              tbody += "<tr class=\"link-hl\" data-woeid=\"" + item.woeid + "\"><td>" + htmlEncode(item.name) + "</td><td>" + 
                 htmlEncode(item.placeTypeName.content) + "</td><td>" + 
                 htmlEncode((item.admin1 ? item.admin1.content : '')) + "</td><td>" + 
                 htmlEncode((item.admin2 ? item.admin2.content : '')) + "</td><td>" + 
@@ -63,6 +65,18 @@ function attachWoeidHandlers() {
             info = places;
           } 
           $(info_el).empty().html(info);
+          // wire up the clicks on the rows to populate the woeid and name fields
+          $(info_el).find('tr').on('click', function (e) {
+            $('input#weather_config_woeid').val($(this).data('woeid'));
+            var name = "";
+            $(this).find('td').slice(2,5).each(function () {
+              text = $(this).text().trim();
+              if (text != "") {
+                name += (name != "" ? ", " : "") + text;
+              }
+            });
+            $('input#weather_name').val(name);
+          });
         },
         error: function (xoptions, textStatus)  {
           $(info_el).empty().html(info);

data/app/assets/stylesheets/concerto_weather/weather.css.scss

@@ -0,0 +1,3 @@
+.woeid-info tbody td:hover {
+  cursor: pointer;
+}

data/app/views/contents/weather/_form_top.html.erb

@@ -1,4 +1,5 @@
 <%= javascript_include_tag "concerto_weather/application" %>
+<%= stylesheet_link_tag "concerto_weather/weather" %>
 
 <fieldset>
   <legend><span>Weather</span></legend>
@@ -8,7 +9,7 @@
       <div class="clearfix">
         <%= config.label :woeid, "Where On Earth ID (WOEID)" %>
         <div class="input">
-          <%= config.text_field :woeid, :placeholder => '12180', :class => "input-small", :value => @content.config['woeid'] %>
+          <%= config.text_field :woeid, :placeholder => '2508215', :class => "input-small", :value => @content.config['woeid'] %>
           <br/>
           <i class="woeid-name"><%= @content.config['name'] %></i>
         </div>

data/app/views/contents/weather/_render_default.html.erb

@@ -1,4 +1,5 @@
 <dl>
+  <h1>Weather</h1>
   <dt>WOEID</dt>
   <dd><%= content.config['woeid'] %> - <%= content.config['name'] %></dd>
   <dt>Units</dt>

data/lib/concerto_weather/version.rb

@@ -1,3 +1,3 @@
 module ConcertoWeather
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concerto_weather
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 -04:00
+date: 2013-08-22 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70178862100900 !ruby/object:Gem::Requirement
+  requirement: &70156158473160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *70178862100900
+  version_requirements: *70156158473160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70178862100220 !ruby/object:Gem::Requirement
+  requirement: &70156158472180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70178862100220
+  version_requirements: *70156158472180
 description: Show the current weather and a short forecast in the sidebar of Concerto
   2.
 email:
@@ -45,6 +45,7 @@ files:
 - app/assets/javascripts/concerto_weather/application.js
 - app/assets/javascripts/concerto_weather/weather.js
 - app/assets/stylesheets/concerto_weather/application.css
+- app/assets/stylesheets/concerto_weather/weather.css.scss
 - app/controllers/concerto_weather/application_controller.rb
 - app/helpers/concerto_weather/application_helper.rb
 - app/models/weather.rb