diff --git a/apps/rss_feeds/icon_importer.py b/apps/rss_feeds/icon_importer.py index 30bce346b..7b390fba8 100644 --- a/apps/rss_feeds/icon_importer.py +++ b/apps/rss_feeds/icon_importer.py @@ -178,7 +178,7 @@ class IconImporter(object): return image, icon_file try: image, icon_file = _1(url) - except (urllib2.HTTPError, urllib2.URLError, IOError, TimeoutError): + except (urllib2.HTTPError, urllib2.URLError, IOError, TimeoutError, ValueError): return None, None return image, icon_file diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py index f4f40bd4f..d6b404175 100644 --- a/apps/rss_feeds/views.py +++ b/apps/rss_feeds/views.py @@ -66,7 +66,7 @@ def load_feed_statistics(request): stats['active_subscribers'] = feed.active_subscribers logging.info(" ---> [%s] ~FBStatistics: ~SB%s ~FG(%s/%s/%s subs)" % (request.user, feed, feed.num_subscribers, feed.active_subscribers, feed.premium_subscribers,)) - + return stats @ajax_login_required diff --git a/media/css/reader.css b/media/css/reader.css index 4c79bc22d..4628ef708 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -3651,10 +3651,10 @@ background: transparent; width: 524px; height: 180px; } -.NB-modal-statistics .NB-modal-feed-chooser-container { +.NB-modal.NB-modal-statistics .NB-modal-feed-chooser-container { margin: 3px 0 12px; } -.NB-modal-statistics .NB-modal-feed-chooser-container .NB-modal-feed-chooser { +.NB-modal.NB-modal-statistics .NB-modal-feed-chooser-container .NB-modal-feed-chooser { margin: 0 0 12px; } diff --git a/media/js/newsblur/reader_statistics.js b/media/js/newsblur/reader_statistics.js index c5f0347eb..cf99d4fcd 100644 --- a/media/js/newsblur/reader_statistics.js +++ b/media/js/newsblur/reader_statistics.js @@ -166,8 +166,9 @@ NEWSBLUR.ReaderStatistics.prototype = { ]) ]); + var count = _.isUndefined(data['subscriber_count']) && 'Loading ' || data['subscriber_count']; var $subscribers = $.make('div', { className: 'NB-statistics-subscribers' }, [ - $.make('span', { className: 'NB-statistics-subscribers-count' }, ''+data['subscriber_count']), + $.make('span', { className: 'NB-statistics-subscribers-count' }, ''+count), $.make('span', { className: 'NB-statistics-subscribers-label' }, 'subscriber' + (data['subscriber_count']==1?'':'s')) ]); $('.NB-statistics-subscribers', this.$modal).remove();