diff --git a/media/css/reader.css b/media/css/reader.css
index 7893ce498..bb1735290 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -581,9 +581,6 @@ a img {
color: #A0A0A0;
}
-.NB-feedlist .feed.NB-feed-inactive {
- display: none;
-}
.NB-feedlist .feed.NB-feed-self-blurblog,
.NB-feedlist-hide-read-feeds .NB-feedlist .feed.NB-feed-self-blurblog {
display: block;
@@ -866,26 +863,30 @@ a img {
.NB-feedlist-hide-read-feeds .NB-feedlist .feed {
display: none;
}
-.NB-feedlist-hide-read-feeds .NB-sidebar.unread_view_starred .unread_starred {
+.NB-feedlist-hide-read-feeds .unread_view_starred .unread_starred {
display: block;
}
-.NB-feedlist-hide-read-feeds .NB-sidebar.unread_view_positive .unread_positive {
+.NB-feedlist-hide-read-feeds .unread_view_positive .unread_positive {
display: block;
}
-.NB-feedlist-hide-read-feeds .NB-sidebar.unread_view_neutral .unread_positive,
-.NB-feedlist-hide-read-feeds .NB-sidebar.unread_view_neutral .unread_neutral {
+.NB-feedlist-hide-read-feeds .unread_view_neutral .unread_positive,
+.NB-feedlist-hide-read-feeds .unread_view_neutral .unread_neutral {
display: block;
}
-
-.NB-feedlist-hide-read-feeds .NB-sidebar.unread_view_negative .unread_positive,
-.NB-feedlist-hide-read-feeds .NB-sidebar.unread_view_negative .unread_neutral,
-.NB-feedlist-hide-read-feeds .NB-sidebar.unread_view_negative .unread_negative {
+.NB-feedlist-hide-read-feeds .unread_view_negative .unread_positive,
+.NB-feedlist-hide-read-feeds .unread_view_negative .unread_neutral,
+.NB-feedlist-hide-read-feeds .unread_view_negative .unread_negative {
display: block;
}
.NB-feedlist-hide-read-feeds .NB-feedlist .feed.NB-empty {
display: block;
}
+
+.NB-feedlist-hide-read-feeds .unread_view_neutral .NB-feed-inactive,
+.NB-feedlist-hide-read-feeds .unread_view_positive .NB-feed-inactive {
+ display: none;
+}
.NB-feedlist-hide-read-feeds .NB-feedlist .feed.selected {
display: block;
}
@@ -1096,7 +1097,27 @@ a img {
.NB-starred-folder .unread_starred .unread_count_positive {
display: block;
}
-
+.unread_view_neutral .NB-feed-inactive.unread_neutral .unread_count_neutral,
+.unread_view_neutral .NB-feed-inactive.unread_positive .unread_count_positive,
+.unread_view_positive .NB-feed-inactive.unread_positive .unread_count_positive {
+ display: none;
+}
+.NB-feed-inactive .NB-muted-icon {
+ display: block;
+ float: right;
+ width: 20px;
+ height: 14px;
+ margin: 4px 1px;
+ background-image: url(/media/img/reader/mute_black.png);
+ background-repeat: no-repeat;
+ background-position: center center;
+ background-size: 13px;
+ background-color: inherit;
+ border: none;
+}
+.NB-modal-feedchooser .NB-muted-icon {
+ display: none;
+}
/* ====================== */
/* = Feeds Progress Bar = */
/* ====================== */
diff --git a/media/img/reader/mute_black.png b/media/img/reader/mute_black.png
new file mode 100644
index 000000000..aba230a04
Binary files /dev/null and b/media/img/reader/mute_black.png differ
diff --git a/media/img/reader/mute_white.png b/media/img/reader/mute_white.png
new file mode 100644
index 000000000..475057e74
Binary files /dev/null and b/media/img/reader/mute_white.png differ
diff --git a/media/js/newsblur/models/feeds.js b/media/js/newsblur/models/feeds.js
index f64be37bc..9f086e9c0 100644
--- a/media/js/newsblur/models/feeds.js
+++ b/media/js/newsblur/models/feeds.js
@@ -171,7 +171,6 @@ NEWSBLUR.Models.Feed = Backbone.Model.extend({
unread_counts: function() {
var starred_feed = NEWSBLUR.assets.starred_feeds.get_feed(this.id);
-
return {
ps: this.get('ps') || 0,
nt: this.get('nt') || 0,
diff --git a/media/js/newsblur/models/folders.js b/media/js/newsblur/models/folders.js
index 18a047d4c..3835168ce 100644
--- a/media/js/newsblur/models/folders.js
+++ b/media/js/newsblur/models/folders.js
@@ -65,9 +65,12 @@ NEWSBLUR.Models.FeedOrFolder = Backbone.Model.extend({
return this.feed.id;
}
}
- if (this.feed.get('active')) {
- return this.feed.id;
- }
+
+ // if (!this.feed.get('active')) {
+ // return;
+ // }
+
+ return this.feed.id;
} else if (this.is_folder()) {
return this.folders.feed_ids_in_folder(options);
}
diff --git a/media/js/newsblur/views/feed_list_view.js b/media/js/newsblur/views/feed_list_view.js
index cd2875838..c910d4e11 100644
--- a/media/js/newsblur/views/feed_list_view.js
+++ b/media/js/newsblur/views/feed_list_view.js
@@ -305,7 +305,11 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
var url = $.getQueryString('url') || $.getQueryString('add');
if (url) {
NEWSBLUR.reader.open_add_feed_modal({url: url});
- route_found = true;
+
+ // Only trim the ?add=url if authenticated, otherwise keep it
+ if (!NEWSBLUR.Globals.is_authenticated) {
+ route_found = true;
+ }
}
// This removes the query string from the URL.
diff --git a/media/js/newsblur/views/folder_view.js b/media/js/newsblur/views/folder_view.js
index 5c5f88d83..1705bf06a 100644
--- a/media/js/newsblur/views/folder_view.js
+++ b/media/js/newsblur/views/folder_view.js
@@ -82,7 +82,7 @@ NEWSBLUR.Views.Folder = Backbone.View.extend({
if (!this.options.only_title) {
var $feeds = _.compact(this.collection.map(function(item) {
if (item.is_feed()) {
- if (!feed_chooser && !item.feed.get('active')) return;
+ // if (!feed_chooser && !item.feed.get('active')) return;
var feed_title_view = _.detect(item.feed.views, function(view) {
if (view.options.feed_chooser == feed_chooser &&
view.options.folder_title == folder_title) {
diff --git a/media/js/newsblur/views/unread_count_view.js b/media/js/newsblur/views/unread_count_view.js
index 514be7e9e..c2297009c 100644
--- a/media/js/newsblur/views/unread_count_view.js
+++ b/media/js/newsblur/views/unread_count_view.js
@@ -13,6 +13,7 @@ NEWSBLUR.Views.UnreadCount = Backbone.View.extend({
this.model.bind('change:ps', this.render, this);
this.model.bind('change:nt', this.render, this);
this.model.bind('change:ng', this.render, this);
+ this.model.bind('change:active', this.render, this);
} else if (this.collection) {
this.collection.bind('change:counts', this.render, this);
}
@@ -26,8 +27,10 @@ NEWSBLUR.Views.UnreadCount = Backbone.View.extend({
render: function() {
var unread_class = "";
var counts;
+ var muted = false;
if (this.model) {
counts = this.model.unread_counts();
+ if (!this.model.get('active')) muted = true;
} else if (this.collection) {
counts = this.collection.unread_counts();
}
@@ -44,11 +47,15 @@ NEWSBLUR.Views.UnreadCount = Backbone.View.extend({
if ((counts['st'] && this.options.include_starred) || (this.model && this.model.is_starred())) {
unread_class += ' unread_starred';
}
+ if (muted) {
+ unread_class += ' NB-muted-count';
+ }
this.$el.html(this.template({
ps : this.options.feed_chooser ? "On" : counts['ps'],
nt : counts['nt'],
ng : this.options.feed_chooser ? "Off" : counts['ng'],
+ muted : muted,
st : this.options.include_starred && counts['st'],
unread_class : unread_class
}));
@@ -76,6 +83,9 @@ NEWSBLUR.Views.UnreadCount = Backbone.View.extend({
\
<%= ng %>\
\
+ <% if (muted) { %>\
+ \
+ <% } %>\
<% if (st) { %>\
\
<%= st %>\