mirror of
https://github.com/viq/NewsBlur.git
synced 2025-08-05 16:49:45 +00:00
Small visual tweaks as well as tightening up some logging.
This commit is contained in:
parent
9803dfaf09
commit
3865cb77fa
5 changed files with 16 additions and 7 deletions
|
@ -595,7 +595,7 @@ class Feed(models.Model):
|
||||||
# 1 update per day = 6 hours
|
# 1 update per day = 6 hours
|
||||||
# 2 updates = 3.5 hours
|
# 2 updates = 3.5 hours
|
||||||
# 4 updates = 2 hours
|
# 4 updates = 2 hours
|
||||||
# 10 updates = 80 minutes
|
# 10 updates = 1 hour
|
||||||
# 2 subscribers:
|
# 2 subscribers:
|
||||||
# 1 update per day = 4.5 hours
|
# 1 update per day = 4.5 hours
|
||||||
# 10 updates = 55 minutes
|
# 10 updates = 55 minutes
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
from celery.task import Task
|
from celery.task import Task
|
||||||
from apps.rss_feeds.models import Feed
|
from apps.rss_feeds.models import Feed
|
||||||
from utils import log as logging
|
# from utils import log as logging
|
||||||
|
|
||||||
class UpdateFeeds(Task):
|
class UpdateFeeds(Task):
|
||||||
name = 'update-feeds'
|
name = 'update-feeds'
|
||||||
|
@ -13,7 +13,7 @@ class UpdateFeeds(Task):
|
||||||
|
|
||||||
for feed_pk in feed_pks:
|
for feed_pk in feed_pks:
|
||||||
feed = Feed.objects.get(pk=feed_pk)
|
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()
|
feed.update()
|
||||||
|
|
||||||
class NewFeeds(Task):
|
class NewFeeds(Task):
|
||||||
|
|
|
@ -35,7 +35,7 @@ def load_feed_statistics(request):
|
||||||
stats['premium_subscribers'] = feed.premium_subscribers
|
stats['premium_subscribers'] = feed.premium_subscribers
|
||||||
stats['active_subscribers'] = feed.active_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
|
return stats
|
||||||
|
|
||||||
|
|
|
@ -3537,4 +3537,7 @@ background: transparent;
|
||||||
}
|
}
|
||||||
.NB-modal-preferences .NB-preference-window input {
|
.NB-modal-preferences .NB-preference-window input {
|
||||||
margin-top: 4px;
|
margin-top: 4px;
|
||||||
}
|
}
|
||||||
|
.NB-modal-preferences .NB-preference-window label img {
|
||||||
|
vertical-align: middle;
|
||||||
|
margin: 0 6px 0 2px;
|
||||||
|
|
|
@ -158,11 +158,17 @@ NEWSBLUR.ReaderPreferences.prototype = {
|
||||||
$.make('div', { className: 'NB-preference-options' }, [
|
$.make('div', { className: 'NB-preference-options' }, [
|
||||||
$.make('div', [
|
$.make('div', [
|
||||||
$.make('input', { id: 'NB-preference-window-1', type: 'radio', name: 'new_window', value: 0 }),
|
$.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('div', [
|
||||||
$.make('input', { id: 'NB-preference-window-2', type: 'radio', name: 'new_window', value: 1 }),
|
$.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'}, [
|
$.make('div', { className: 'NB-preference-label'}, [
|
||||||
|
|
Loading…
Add table
Reference in a new issue