created a new single feed action bar with a "Return to Home" button and edited the "Refresh" button to refresh the single feed only instead of going back to /news

jasonngpt · jasonngpt · commit 53bced350765 · 2013-10-27T12:18:33.000+08:00
diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
@@ -14,6 +14,8 @@ class Stringer < Sinatra::Base
     @stories = StoryRepository.feed(params[:feed_id])
     @unread_stories = @stories.find_all {|story| !story.is_read }
 
+	@feed_id = params[:feed_id]
+
     erb :feed
   end
 
diff --git a/app/views/feed.erb b/app/views/feed.erb
@@ -5,7 +5,7 @@
 <% end %>
 
 <div id="action-bar">
-  <%= render_partial :action_bar, { stories: @unread_stories } %>
+  <%= render_partial :single_feed_action_bar, { stories: @unread_stories } %>
 </div>
 
 <div id="feed-title">
@@ -17,4 +17,4 @@
 <div id="stories">
   <ul id="story-list">
   </ul>
-</div>
+</div>
diff --git a/app/views/partials/_single_feed_action_bar.erb b/app/views/partials/_single_feed_action_bar.erb
@@ -0,0 +1,54 @@
+<div class="row-fluid">
+  <div class="pull-left">
+	<a class="btn" id="home" href="/news" title="<%= t('partials.feed_action_bar.home') %>">
+		<i class="icon-reply"></i>
+	</a>
+    <a class="btn" id="mark-all" title="<%= t('partials.action_bar.mark_all') %>">
+      <i class="icon-ok"></i>
+      <%= render_partial :mark_all_as_read_form,
+                        {stories: stories} %>
+    </a>
+	<a class="btn" href="/feed/<%= @feed_id %>" id="refresh" title="<%= t('partials.action_bar.refresh') %>">
+      <i class="icon-repeat"></i>
+    </a>
+  </div>
+
+  <div class="pull-right">
+    <a class="btn btn-primary" id="starred" href="/starred" title="<%= t('partials.action_bar.starred_stories') %>">
+      <i class="icon-star"></i>
+    </a>
+    <a class="btn btn-primary" id="archive" href="/archive" title="<%= t('partials.action_bar.archived_stories') %>">
+      <i class="icon-time"></i>
+    </a>
+    <a class="btn btn-primary" id="feeds" href="/feeds" title="<%= t('partials.action_bar.view_feeds') %>">
+      <i class="icon-list"></i>
+    </a>
+    <a class="btn btn-primary" id="add-feed" href="/feeds/new" title="<%= t('partials.action_bar.add_feed') %>">
+      <i class="icon-plus"></i>
+    </a>
+  </div>
+</div>
+
+<script type="text/javascript">
+  $(document).ready(function() {
+    $("#mark-all").click(function(e) {
+      e.preventDefault();
+
+      $("form#mark-all-as-read").submit();
+    });
+    
+    Mousetrap.bind("r", function() {
+      var refresh = $("a#refresh")[0];
+      if (refresh) refresh.click();
+    });
+
+    Mousetrap.bind("a", function() {
+      var add_feed = $("a#add-feed")[0];
+      if (add_feed) add_feed.click();
+    });
+
+    Mousetrap.bind("shift+a", function() {
+      $("form#mark-all-as-read").submit();
+    });
+  });
+</script>
