From 028dc9e64627f7d4d3578804a830d5c33cb79957 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Wed, 6 Oct 2010 09:42:59 -0400 Subject: [PATCH] Fixing front-end issues around showing and hiding the feed chooser in different circumstances. --- apps/reader/views.py | 2 -- media/css/reader.css | 8 +++++++- media/js/newsblur/reader.js | 11 +++++++---- media/js/newsblur/reader_feedchooser.js | 13 +++++++------ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/apps/reader/views.py b/apps/reader/views.py index f821f404c..d31b31ac7 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -92,7 +92,6 @@ def load_feeds(request): user = get_user(request) feeds = {} not_yet_fetched = False - try: folders = UserSubscriptionFolders.objects.get(user=user) @@ -589,7 +588,6 @@ def login_as(request): def save_feed_chooser(request): approved_feeds = [int(feed_id) for feed_id in request.POST.getlist('approved_feeds')] activated = 0 - usersubs = UserSubscription.objects.filter(user=request.user) for sub in usersubs: if sub.feed.pk in approved_feeds: diff --git a/media/css/reader.css b/media/css/reader.css index 54d47b2e5..09181f43b 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -3120,6 +3120,9 @@ background: transparent; .NB-modal-feedchooser .NB-feedlist .folder_title { cursor: default; } +.NB-modal-feedchooser .NB-feedlist .folder_title .feed_counts_floater { + display: none; +} .NB-modal-feedchooser .NB-feedlist .feed .NB-feedlist-manage-icon:hover { background: transparent url('../img/icons/silk/bullet_arrow_right.png') no-repeat 3px 4px; @@ -3193,9 +3196,12 @@ background: transparent; background: transparent url('../img/icons/silk/pictures.png') no-repeat 0 0; } .NB-modal-feedchooser .NB-feedchooser-premium-bullets li.NB-3 .NB-feedchooser-premium-bullet-image { - background: transparent url('../img/icons/silk/lorry.png') no-repeat 0 0; + background: transparent url('../img/icons/silk/zoom.png') no-repeat 0 0; } .NB-modal-feedchooser .NB-feedchooser-premium-bullets li.NB-4 .NB-feedchooser-premium-bullet-image { + background: transparent url('../img/icons/silk/lorry.png') no-repeat 0 0; +} +.NB-modal-feedchooser .NB-feedchooser-premium-bullets li.NB-5 .NB-feedchooser-premium-bullet-image { background: transparent url('../img/icons/silk/lightbulb.png') no-repeat 0 0; } diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js index 0942ee11d..a91c95b18 100644 --- a/media/js/newsblur/reader.js +++ b/media/js/newsblur/reader.js @@ -583,7 +583,6 @@ detect_all_inactive_feeds: function() { var feeds = this.model.feeds; var has_chosen_feeds = _.any(feeds, function(feed) { - NEWSBLUR.log(['active?', feed, feed.active]); return feed.active; }); @@ -631,15 +630,18 @@ setTimeout(function() { if (is_collapsed) { $('ul.folder', $folder).css({'display': 'none'}); + $feeds.append($folder); self.collapse_folder($('.folder_title', $folder).eq(0), true); - $feeds.append($folder.fadeIn(500)); if (collapsed_parent) { $folder.parents('li.folder').each(function() { self.collapse_folder($('.folder_title', this).eq(0), true); }); } } else { - $feeds.append($folder.fadeIn(500)); + $feeds.append($folder); + } + if (self.flags['has_chosen_feeds']) { + $folder.fadeIn(500); } $('.feed', $folder).rightClick(function() { self.show_manage_menu('feed', $(this)); @@ -947,6 +949,7 @@ show_collapsed_folder_count: function($folder_title, $children) { var $counts = $('.feed_counts_floater', $folder_title); $counts.remove(); + $children = $('li.feed', $children).not('.NB-feed-inactive'); var positive_count = 0; var neutral_count = 0; @@ -1066,7 +1069,7 @@ this.flags['opening_feed'] = true; if (!$feed_link) { - $feed_link = $('.feed.selected', this.$feed_list).eq(0); + $feed_link = $('.feed.selected', this.$s.$feed_list).eq(0); } if (feed_id != this.active_feed || force) { diff --git a/media/js/newsblur/reader_feedchooser.js b/media/js/newsblur/reader_feedchooser.js index c466623d3..1a4a4f01b 100644 --- a/media/js/newsblur/reader_feedchooser.js +++ b/media/js/newsblur/reader_feedchooser.js @@ -54,7 +54,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = { $.make('div', { className: 'NB-feedchooser-info'}, [ $.make('div', { className: 'NB-feedchooser-info-type' }, [ $.make('span', { className: 'NB-feedchooser-subtitle-type-prefix' }, 'Super-Mega'), - ' Fancy Account' + ' Premium Account' ]) ]), $.make('ul', { className: 'NB-feedchooser-premium-bullets' }, [ @@ -67,11 +67,15 @@ NEWSBLUR.ReaderFeedchooser.prototype = { 'Unlimited number of sites.' ]), $.make('li', { className: 'NB-3' }, [ + $.make('div', { className: 'NB-feedchooser-premium-bullet-image' }), + 'Access to future premium-only features like search, starring, sending to Instapaper.' + ]), + $.make('li', { className: 'NB-4' }, [ $.make('div', { className: 'NB-feedchooser-premium-bullet-image' }), 'You feed my poor, hungry dog for 6 days!', $.make('img', { className: 'NB-feedchooser-premium-poor-hungry-dog', src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/shiloh.jpg' }) ]), - $.make('li', { className: 'NB-4' }, [ + $.make('li', { className: 'NB-5' }, [ $.make('div', { className: 'NB-feedchooser-premium-bullet-image' }), $.make('span', { className: 'NB-feedchooser-premium-cost-dollars' }, '$12'), '/', @@ -104,7 +108,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = { }); // Expand collapsed folders - $('ul.folder', $feeds).css({ + $('.folder', $feeds).css({ 'display': 'block', 'opacity': 1 }); @@ -149,9 +153,6 @@ NEWSBLUR.ReaderFeedchooser.prototype = { $('#simplemodal-container').corner('6px'); }, 'onClose': function(dialog) { - if (!self.approve_list.length) { - NEWSBLUR.reader.show_feed_chooser_button(); - } dialog.data.hide().empty().remove(); dialog.container.hide().empty().remove(); dialog.overlay.fadeOut(200, function() {