diff --git a/apps/reader/views.py b/apps/reader/views.py index 57fd4ce95..1266d2a3c 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -71,13 +71,14 @@ def refresh_feeds(feeds, force=False): def load_feeds(request): user = get_user(request) - us = UserSubscriptionFolders.objects.filter( + us = UserSubscriptionFolders.objects.select_related('feed', 'usersubscription').filter( user=user ) - + logging.info('UserSubs: %s' % us) feeds = [] folders = [] for sub in us: + logging.info("UserSub: %s" % sub) try: sub.feed.unread_count = sub.user_sub.count_unread() except: @@ -101,7 +102,7 @@ def load_feeds(request): context = feeds data = json_encode(context) - return HttpResponse(data, mimetype='application/json') + return HttpResponse(data, mimetype='text/html') def load_single_feed(request): user = get_user(request) diff --git a/media/css/reader.css b/media/css/reader.css index 076923624..8c87212a5 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -171,6 +171,13 @@ a img { display: block; padding: 4px 0px; } + +#story_titles .story .story_title .NB-storytitles-author { + padding-left: 12px; + color: #808080; + font-size: 9px; +} + #story_titles .story .story_id { display: none; } @@ -282,12 +289,6 @@ a img { border-top: 4px solid #404040; } -#story_pane .story_title .NB-storytitles-author { - padding-left: 4px; - color: #808080; - font-size: 12px; -} - #story_pane .story_title a { text-decoration: none; color: #101050; diff --git a/media/js/newsblur/assetmodel.js b/media/js/newsblur/assetmodel.js index d27608aed..8d351cbe9 100644 --- a/media/js/newsblur/assetmodel.js +++ b/media/js/newsblur/assetmodel.js @@ -41,16 +41,20 @@ NEWSBLUR.AssetModel.Reader.prototype = { type: 'POST', success: function(o) { var log_regex = /\s+