diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index a2aacc8a1..3daebaf38 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -595,7 +595,7 @@ class Feed(models.Model): # 1 update per day = 6 hours # 2 updates = 3.5 hours # 4 updates = 2 hours - # 10 updates = 80 minutes + # 10 updates = 1 hour # 2 subscribers: # 1 update per day = 4.5 hours # 10 updates = 55 minutes diff --git a/apps/rss_feeds/tasks.py b/apps/rss_feeds/tasks.py index b718b7aab..1e2d950b0 100644 --- a/apps/rss_feeds/tasks.py +++ b/apps/rss_feeds/tasks.py @@ -1,6 +1,6 @@ from celery.task import Task from apps.rss_feeds.models import Feed -from utils import log as logging +# from utils import log as logging class UpdateFeeds(Task): name = 'update-feeds' @@ -13,7 +13,7 @@ class UpdateFeeds(Task): for feed_pk in feed_pks: feed = Feed.objects.get(pk=feed_pk) - logging.debug(' Updating: [%s] %s' % (feed_pks, feed)) + # logging.debug(' Updating: [%s] %s' % (feed_pks, feed)) feed.update() class NewFeeds(Task): diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py index 34e80a185..fbf3816b0 100644 --- a/apps/rss_feeds/views.py +++ b/apps/rss_feeds/views.py @@ -35,7 +35,7 @@ def load_feed_statistics(request): stats['premium_subscribers'] = feed.premium_subscribers stats['active_subscribers'] = feed.active_subscribers - logging.info(" ---> [%s] Statistics: %s" % (request.user, feed)) + logging.info(" ---> [%s] Statistics: %s (%s/%s/%s subs)" % (request.user, feed, feed.num_subscribers, feed.active_subscribers, feed.premium_subscribers,)) return stats diff --git a/media/css/reader.css b/media/css/reader.css index e52ba3194..e223a45f2 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -3537,4 +3537,7 @@ background: transparent; } .NB-modal-preferences .NB-preference-window input { margin-top: 4px; -} \ No newline at end of file +} +.NB-modal-preferences .NB-preference-window label img { + vertical-align: middle; + margin: 0 6px 0 2px; diff --git a/media/js/newsblur/reader_preferences.js b/media/js/newsblur/reader_preferences.js index 9b4d386c5..1cc917c1d 100644 --- a/media/js/newsblur/reader_preferences.js +++ b/media/js/newsblur/reader_preferences.js @@ -158,11 +158,17 @@ NEWSBLUR.ReaderPreferences.prototype = { $.make('div', { className: 'NB-preference-options' }, [ $.make('div', [ $.make('input', { id: 'NB-preference-window-1', type: 'radio', name: 'new_window', value: 0 }), - $.make('label', { 'for': 'NB-preference-window-1' }, 'Normally') + $.make('label', { 'for': 'NB-preference-window-1' }, [ + $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL+'/img/icons/silk/application_view_gallery.png' }), + 'Normally' + ]) ]), $.make('div', [ $.make('input', { id: 'NB-preference-window-2', type: 'radio', name: 'new_window', value: 1 }), - $.make('label', { 'for': 'NB-preference-window-2' }, 'In a new window') + $.make('label', { 'for': 'NB-preference-window-2' }, [ + $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL+'/img/icons/silk/application_side_expand.png' }), + 'In a new window' + ]) ]) ]), $.make('div', { className: 'NB-preference-label'}, [