Styling sortable attributes.

media/css/reader.css

@@ -10823,12 +10823,33 @@ form.opml_import_form input {
     border: 1px solid rgba(0, 0, 0, .2);
     margin: 24px 24px 0 0;
 }
+.NB-modal-organizer .NB-feedlist .feed_title {
+    padding-right: 186px;
+}
 .NB-modal-organizer .NB-feedlist .feed {
     display: block;
 }
-.NB-modal-organizer .NB-feedlist .folder .folder_title .NB-feedlist-collapse-icon {
+.NB-modal-organizer .NB-feedlist .folder .folder_title .NB-feedlist-collapse-icon,
+.NB-modal-organizer .NB-feedlist .folder .folder_title .feed_counts_floater {
     display: none;
 }
+.NB-modal-organizer .unread_count.unread_count_positive.unread_count_full {
+    width: 24px;
+    height: 13px;
+    background-image: url('/media/embed/icons/circular/checkmark_white.png');
+    background-size: 16px;
+    background-position: center center;
+    background-repeat: no-repeat;
+}
+.NB-modal-organizer .NB-feed-organizer-sort {
+/*    display: none;*/
+    position: absolute;
+    right: 42px;
+    top: 4px;
+}
+.NB-modal-organizer .NB-feed-organizer-sort.NB-active {
+    display: block;
+}
 
 /* ================= */
 /* = Feed Selector = */

media/js/newsblur/models/feeds.js

@@ -196,6 +196,31 @@ NEWSBLUR.Models.Feed = Backbone.Model.extend({
         } else if (unread_view > 0) {
             return !!(this.get('ps'));
         }
+    },
+    
+    relative_last_story_date: function() {
+        var dateformat = NEWSBLUR.assets.preference('dateformat');
+        var date = new Date(this.get('last_story_date'));
+        var midnight_today = function() {
+            var midnight = new Date();
+            midnight.setHours(0);
+            midnight.setMinutes(0);
+            midnight.setSeconds(0);
+            return midnight;
+        };
+        var midnight_yesterday = function(midnight) {
+            return new Date(midnight - 60*60*24*1000);
+        };
+        var midnight = midnight_today();
+        var time = date.format(dateformat == "24" ? "H:i" : "g:ia");
+
+        if (date > midnight) {
+            return time;
+        } else if (date > midnight_yesterday(midnight)) {
+            return "Yesterday, " + time;
+        } else {
+            return date.format("d M Y");
+        }
     }
     
 });

media/js/newsblur/reader/reader_organizer.js

@@ -74,8 +74,8 @@ _.extend(NEWSBLUR.ReaderOrganizer.prototype, {
         // Make sure all folders are visible
         $('.NB-folder.NB-hidden', $feeds).removeClass('NB-hidden');
         
-        $('.unread_count_positive', $feeds).text('On');
-        $('.unread_count_negative', $feeds).text('Off');
+        $('.unread_count_positive', $feeds).text('');
+        $('.unread_count_negative', $feeds).text('');
         
         $('.selected', $feeds).removeClass('selected');
         

media/js/newsblur/views/feed_title_view.js

@@ -111,16 +111,16 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({
           <div class="NB-feedlist-manage-icon"></div>\
           <div class="NB-feed-highlight"></div>\
           <% if (organizer) { %>\
-              <div class="NB-feed-organizer-subscribers">\
+              <div class="NB-feed-organizer-sort NB-feed-organizer-subscribers">\
                 <%= pluralize("subscriber", feed.get("num_subscribers"), true) %>\
               </div>\
-              <div class="NB-feed-organizer-laststory">\
-                <%= feed.get("last_story_date") %>\
+              <div class="NB-feed-organizer-sort NB-feed-organizer-laststory">\
+                <%= feed.relative_last_story_date() %>\
               </div>\
-              <div class="NB-feed-organizer-monthlycount">\
+              <div class="NB-feed-organizer-sort NB-feed-organizer-monthlycount">\
                 <%= pluralize("story", feed.get("average_stories_per_month"), true) %> per month\
               </div>\
-              <div class="NB-feed-organizer-opens">\
+              <div class="NB-feed-organizer-sort NB-feed-organizer-opens">\
                 <%= pluralize("open", feed.get("feed_opens"), true) %>\
               </div>\
           <% } %>\
@@ -210,7 +210,8 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({
         }
         this.counts_view = new NEWSBLUR.Views.UnreadCount({
             model: this.model,
-            include_starred: true
+            include_starred: true,
+            feed_chooser: this.options.feed_chooser
         }).render();
         this.$('.feed_counts').html(this.counts_view.el);
         if (this.options.type == 'story') {
@@ -339,6 +340,7 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({
     },
     
     dblclick_mark_feed_as_read: function(e) {
+        if (this.options.feed_chooser) return;
         if (NEWSBLUR.assets.preference('doubleclick_unread') == "ignore") return;
         
         return this.mark_feed_as_read(e);

media/js/newsblur/views/unread_count_view.js

@@ -4,7 +4,7 @@ NEWSBLUR.Views.UnreadCount = Backbone.View.extend({
     
     initialize: function() {
         _.bindAll(this, 'render');
-        if (!this.options.stale) {
+        if (!this.options.stale && !this.options.feed_chooser) {
             if (this.model) {
                 var starred_feed = NEWSBLUR.assets.starred_feeds.get_feed(this.model.id);
                 if (starred_feed) {