From 54322439f29d58f8d230a0aae9ea8098cc2b51e3 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Tue, 30 Jul 2013 17:40:36 -0700
Subject: [PATCH] Fixing hidden story titles button in vertical story titles on
 folder.

---
 media/css/reader.css                   | 12 ++----------
 media/js/newsblur/views/folder_view.js | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/media/css/reader.css b/media/css/reader.css
index 11349bd1e..cfc80d501 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -1130,7 +1130,8 @@ background: transparent;
 .NB-feedbar .feed.NB-feed-social .feed_favicon {
     border-radius: 3px;
 }
-.NB-feedbar .feed .feed_title {
+.NB-feedbar .feed .feed_title,
+.NB-feedbar .folder_title_text {
 /*    float: left;*/
   display: block;
   margin-left: 24px;
@@ -1230,12 +1231,6 @@ background: transparent;
     background-color: rgba(0, 0, 0, .1);
 }
 
-.NB-story-pane-west .NB-feedbar .NB-feedbar-mark-feed-read {
-    position: static;
-    float: right;
-    margin: 6px 0 -2px 4px;
-}
-
 .NB-feedbar .NB-feedlist-manage-icon {
     opacity: 0;
     display: none;
@@ -1320,9 +1315,6 @@ background: transparent;
     display: block;
 }
 
-.NB-feedbar .NB-folder {
-    padding-left: 24px;
-}
 .NB-feedbar .NB-folder .NB-folder-title {
     padding: 1px 0 1px 22px;
     font-size: 14px;
diff --git a/media/js/newsblur/views/folder_view.js b/media/js/newsblur/views/folder_view.js
index 39b7194a7..e711861d9 100644
--- a/media/js/newsblur/views/folder_view.js
+++ b/media/js/newsblur/views/folder_view.js
@@ -17,6 +17,7 @@ NEWSBLUR.Views.Folder = Backbone.View.extend({
         "click .NB-feedlist-collapse-icon"  : "collapse_folder",
         "click .NB-feedbar-mark-feed-read"  : "mark_folder_as_read",
         "click .NB-feedbar-options"         : "open_options_popover",
+        "click .NB-story-title-indicator"   : "show_hidden_story_titles",
         "mouseenter"                        : "add_hover_inverse",
         "mouseleave"                        : "remove_hover_inverse"
     },
@@ -102,12 +103,11 @@ NEWSBLUR.Views.Folder = Backbone.View.extend({
                 <div class="NB-folder-icon"></div>\
                 <div class="NB-feedlist-collapse-icon" title="<% if (is_collapsed) { %>Expand Folder<% } else {%>Collapse Folder<% } %>"></div>\
                 <div class="NB-feedlist-manage-icon"></div>\
-                <span class="folder_title_text"><%= folder_title %></span>\
+                <span class="folder_title_text">\
+                    <span><%= folder_title %></span>\
+                    <div class="NB-feedbar-mark-feed-read"></div>\
+                </span>\
                 <% if (feedbar) { %>\
-                    <div class="NB-story-title-indicator">\
-                        <div class="NB-story-title-indicator-count"></div>\
-                        <span class="NB-story-title-indicator-text">show hidden stories</span>\
-                    </div>\
                     <div class="NB-feedbar-options-container">\
                         <span class="NB-feedbar-options">\
                             <div class="NB-icon"></div>\
@@ -116,7 +116,10 @@ NEWSBLUR.Views.Folder = Backbone.View.extend({
                             <%= NEWSBLUR.assets.view_setting("river:"+folder_title, "order") %>\
                         </span>\
                     </div>\
-                    <div class="NB-feedbar-mark-feed-read"></div>\
+                    <div class="NB-story-title-indicator">\
+                        <div class="NB-story-title-indicator-count"></div>\
+                        <span class="NB-story-title-indicator-text">show hidden stories</span>\
+                    </div>\
               <% } %>\
             </div>\
         <% } %>\
@@ -144,7 +147,7 @@ NEWSBLUR.Views.Folder = Backbone.View.extend({
     },
     
     update_title: function() {
-        this.$('.folder_title_text').eq(0).html(this.model.get('folder_title'));
+        this.$('.folder_title_text span').eq(0).html(this.model.get('folder_title'));
     },
     
     update_selected: function() {
@@ -348,8 +351,10 @@ NEWSBLUR.Views.Folder = Backbone.View.extend({
             anchor: this.$(".NB-feedbar-options"),
             feed_id: "river:" + this.options.folder_title
         });
+    },
+    
+    show_hidden_story_titles: function() {
+        NEWSBLUR.app.story_titles_header.show_hidden_story_titles();
     }
-
-
     
 });
\ No newline at end of file