Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions app/models/feed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ 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
end
6 changes: 6 additions & 0 deletions app/views/feeds/index.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion app/views/partials/_feed.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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 %> tooltip-js" title="<%= t("partials.feed.status_bubble.#{feed.status_bubble}") %>" data-placement="left"></i>
<a href="<%= feed.url %>"><%= feed.name %></a>
</p>
</div>
Expand Down
4 changes: 4 additions & 0 deletions config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions config/locales/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions config/locales/nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions config/locales/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions config/locales/zh_CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ zh_CN:
add_feed: "添加新订阅"
feed:
last_updated: "最后更新于"
status_bubble:
green: "成功"
yellow: "解析 (可能是短暂的) 时出现错误"
red: "错误分析 (和它从未合作过,要么)"
feed_action_bar:
home: "返回未读故事列表"
feeds: "查看订阅列表"
Expand Down