From c2326accdd5b58478636449d1de9f562ff59db1f Mon Sep 17 00:00:00 2001
From: Danielle Sucher <dsucher@gmail.com>
Date: Sat, 11 May 2013 18:06:03 -0400
Subject: [PATCH 1/3] Add explanatory tooltip to status bubble in feed partial

---
 app/models/feed.rb           | 13 +++++++++----
 app/views/partials/_feed.erb |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/feed.rb b/app/models/feed.rb
index 95dc81126..183e3cc18 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -5,6 +5,10 @@ class Feed < ActiveRecord::Base
 
   STATUS = { green: 0, yellow: 1, red: 2 }
 
+  STATUS_TEXT = { green: "Success!", 
+                  yellow: "Error parsing (probably temporary)", 
+                  red: "Error parsing (and it ain't never worked before, either)" }
+
   def status
     STATUS.key(read_attribute(:status))
   end
@@ -14,10 +18,11 @@ def status=(s)
   end
 
   def status_bubble
-    if status == :red
-      return :yellow unless stories.empty?
-    end
-
+    return :yellow if status == :red && stories.any?
     status
   end
+
+  def status_bubble_text
+    STATUS_TEXT[status_bubble]
+  end
 end
\ No newline at end of file
diff --git a/app/views/partials/_feed.erb b/app/views/partials/_feed.erb
index 7e4d25a9a..2903e8dc7 100644
--- a/app/views/partials/_feed.erb
+++ b/app/views/partials/_feed.erb
@@ -2,7 +2,7 @@
   <div class="row-fluid feed-line">
     <div class="span7 feed-title-container">
       <p class="feed-title">
-        <i class="icon-circle status <%= feed.status_bubble %>"></i>
+        <i class="icon-circle status <%= feed.status_bubble %>" title="<%= feed.status_bubble_text %>"></i>
         <a href="<%= feed.url %>"><%= feed.name %></a>
       </p>
     </div>

From 8d69407dc97d5496b7bf4d80bca62b59293c3389 Mon Sep 17 00:00:00 2001
From: Danielle Sucher <dsucher@gmail.com>
Date: Sat, 11 May 2013 23:46:37 -0400
Subject: [PATCH 2/3] Internationalize status bubble tooltip text

---
 app/models/feed.rb           | 8 --------
 app/views/partials/_feed.erb | 2 +-
 config/locales/de.yml        | 4 ++++
 config/locales/en.yml        | 4 ++++
 config/locales/es.yml        | 4 ++++
 config/locales/fr.yml        | 4 ++++
 config/locales/it.yml        | 4 ++++
 config/locales/nl.yml        | 4 ++++
 config/locales/pt.yml        | 4 ++++
 config/locales/zh_CN.yml     | 4 ++++
 10 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/models/feed.rb b/app/models/feed.rb
index 183e3cc18..dea625807 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -5,10 +5,6 @@ class Feed < ActiveRecord::Base
 
   STATUS = { green: 0, yellow: 1, red: 2 }
 
-  STATUS_TEXT = { green: "Success!", 
-                  yellow: "Error parsing (probably temporary)", 
-                  red: "Error parsing (and it ain't never worked before, either)" }
-
   def status
     STATUS.key(read_attribute(:status))
   end
@@ -21,8 +17,4 @@ def status_bubble
     return :yellow if status == :red && stories.any?
     status
   end
-
-  def status_bubble_text
-    STATUS_TEXT[status_bubble]
-  end
 end
\ No newline at end of file
diff --git a/app/views/partials/_feed.erb b/app/views/partials/_feed.erb
index 2903e8dc7..21c31e58b 100644
--- a/app/views/partials/_feed.erb
+++ b/app/views/partials/_feed.erb
@@ -2,7 +2,7 @@
   <div class="row-fluid feed-line">
     <div class="span7 feed-title-container">
       <p class="feed-title">
-        <i class="icon-circle status <%= feed.status_bubble %>" title="<%= feed.status_bubble_text %>"></i>
+        <i class="icon-circle status <%= feed.status_bubble %>" title="<%= t("partials.feed.status_bubble.#{feed.status_bubble}") %>"></i>
         <a href="<%= feed.url %>"><%= feed.name %></a>
       </p>
     </div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index ecbf98c35..22cf7d509 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -33,6 +33,10 @@ de:
       add_feed: "Füge einen Feed hinzu"
     feed:
       last_updated: "Zuletzt aktualisiert um"
+      status_bubble:
+        green: "Erfolg!"
+        yellow: "Fehler beim analysieren der (wahrscheinlich temporäre)"
+        red: "Fehler beim analysieren (und es funktionierte nie vor, entweder)"
     feed_action_bar:
       home: "Zurück zu den Geschichten"
       feeds: "Zeige Feeds an"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0238203c6..aad8d88c7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -34,6 +34,10 @@ en:
       archived_stories: "Archived stories"
     feed:
       last_updated: "Last updated at"
+      status_bubble:
+        green: "Success!"
+        yellow: "Error parsing (probably temporary)"
+        red: "Error parsing (and it ain't never worked before, either)"
     feed_action_bar:
       home: "Return to Stories"
       feeds: "View feeds"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7b8d7bc56..b04991151 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -28,6 +28,10 @@ es:
       archived_stories: "Archived stories"
     feed:
       last_updated: "Última actualización"
+      status_bubble:
+        green: "¡ Un éxito!"
+        yellow: "Error de análisis (probablemente temporal)"
+        red: "Error de análisis (y nunca funcionó antes, tampoco)"
     feed_action_bar:
       home: "Volver a historias"
       feeds: "Ver feeds"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3fa53607c..605b11d5e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -34,6 +34,10 @@ fr:
       archived_stories: "Articles archivés"
     feed:
       last_updated: "Dernière mise-à-jour à"
+      status_bubble:
+        green: "Succès !"
+        yellow: "Erreur d'analyse (probablement temporaire)"
+        red: "Erreur d'analyse (et il n'a jamais travaillé avant, non plus)"
     feed_action_bar:
       home: "Revenir aux Articles"
       feeds: "Voir les flux"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 74455bdb4..a6f3a8477 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -27,6 +27,10 @@ it:
       add_feed: "Aggiungi un feed"
     feed:
       last_updated: "Ultimo aggiornamento il"
+      status_bubble:
+        green: "Successo!"
+        yellow: "Errore di analisi (probabilmente temporanea)"
+        red: "Errore di analisi (e mai lavorato prima, neanche)"
     feed_action_bar:
       home: "Ritorna alle Storie"
       feeds: "Mostra i feed"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d35158568..a81a99fdb 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -33,6 +33,10 @@ nl:
       add_feed: "Feed toevoegen"
     feed:
       last_updated: "Laatst bijgewerkt op"
+      status_bubble:
+        green: "Succes!"
+        yellow: "Fout ontleden (waarschijnlijk tijdelijke)"
+        red: "Fout ontleden (en het nooit gewerkt voordat, ofwel)"
     feed_action_bar:
       home: "Terug naar artikelen"
       feeds: "Feeds bekijken"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index f61656592..07611b3a8 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -28,6 +28,10 @@ pt:
       archived_stories: "Archived stories"
     feed:
       last_updated: "Atualizado da última vez em"
+      status_bubble:
+        green: "Sucesso!"
+        yellow: "Erro de análise (provavelmente temporária)"
+        red: "Erro de análise (e ele nunca trabalhou antes, tampouco)"
     feed_action_bar:
       home: "Retornar para Histórias"
       feeds: "Ver feeds"
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 8545aa3d7..389732fe2 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -33,6 +33,10 @@ zh_CN:
       add_feed: "添加新订阅"
     feed:
       last_updated: "最后更新于"
+      status_bubble:
+        green: "成功"
+        yellow: "解析 （可能是短暂的) 时出现错误"
+        red: "错误分析 (和它从未合作过，要么)"
     feed_action_bar:
       home: "返回未读故事列表"
       feeds: "查看订阅列表"

From a3820dacab24e74973f4b41715363a2cd0a13138 Mon Sep 17 00:00:00 2001
From: Danielle Sucher <dsucher@gmail.com>
Date: Sat, 11 May 2013 23:57:42 -0400
Subject: [PATCH 3/3] Use Twitter Bootstrap tooltips for status bubble text

---
 app/views/feeds/index.erb    | 6 ++++++
 app/views/partials/_feed.erb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/feeds/index.erb b/app/views/feeds/index.erb
index 1f180dc4e..443380544 100644
--- a/app/views/feeds/index.erb
+++ b/app/views/feeds/index.erb
@@ -15,3 +15,9 @@
     <p><%= t('feeds.index.add_some_feeds', :add => '<a href="/feeds/new">'+t('feeds.index.add')+'</a>') %></p>
   </div>
 <% end %>
+
+<script type="text/javascript">
+  $(document).ready(function () {
+    $(".tooltip-js").tooltip();
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/partials/_feed.erb b/app/views/partials/_feed.erb
index 21c31e58b..f859bf04d 100644
--- a/app/views/partials/_feed.erb
+++ b/app/views/partials/_feed.erb
@@ -2,7 +2,7 @@
   <div class="row-fluid feed-line">
     <div class="span7 feed-title-container">
       <p class="feed-title">
-        <i class="icon-circle status <%= feed.status_bubble %>" title="<%= t("partials.feed.status_bubble.#{feed.status_bubble}") %>"></i>
+        <i class="icon-circle status <%= feed.status_bubble %> tooltip-js" title="<%= t("partials.feed.status_bubble.#{feed.status_bubble}") %>" data-placement="left"></i>
         <a href="<%= feed.url %>"><%= feed.name %></a>
       </p>
     </div>