public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-08-05 16:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving NewsBlur counts to beginning of title.

Browse source
This commit is contained in:
Samuel Clay 2011-11-17 22:33:00 -08:00
parent 86f5265209
commit 5e4cc2a944
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fabfile.py vendored
View file

@ -34,7 +34,7 @@ env.roledefs ={
'app': ['app01.newsblur.com', 'app02.newsblur.com'], 'app': ['app01.newsblur.com', 'app02.newsblur.com'],
'web': ['www.newsblur.com', 'app02.newsblur.com'], 'web': ['www.newsblur.com', 'app02.newsblur.com'],
'db': ['db01.newsblur.com', 'db02.newsblur.com', 'db03.newsblur.com'], 'db': ['db01.newsblur.com', 'db02.newsblur.com', 'db03.newsblur.com'],
'task': ['task01.newsblur.com', 'task02.newsblur.com', 'task03.newsblur.com', 'db02.newsblur.com'], 'task': ['task01.newsblur.com', 'task02.newsblur.com', 'task03.newsblur.com'],
} }
# ================ # ================
@ -78,7 +78,6 @@ def deploy():
run('curl -s http://%s/api/add_site_load_script/ABCDEF > /dev/null' % env.host) run('curl -s http://%s/api/add_site_load_script/ABCDEF > /dev/null' % env.host)
compress_media() compress_media()
@roles('web')
def deploy_full(): def deploy_full():
with cd(env.NEWSBLUR_PATH): with cd(env.NEWSBLUR_PATH):
run('git pull') run('git pull')
@ -89,19 +88,16 @@ def deploy_full():
run('curl -s http://www.newsblur.com/m/ > /dev/null') run('curl -s http://www.newsblur.com/m/ > /dev/null')
compress_media() compress_media()
@roles('web')
def restart_gunicorn(): def restart_gunicorn():
with cd(env.NEWSBLUR_PATH): with cd(env.NEWSBLUR_PATH):
with settings(warn_only=True): with settings(warn_only=True):
run('sudo supervisorctl restart gunicorn') run('sudo supervisorctl restart gunicorn')
@roles('web')
def gunicorn_stop(): def gunicorn_stop():
with cd(env.NEWSBLUR_PATH): with cd(env.NEWSBLUR_PATH):
with settings(warn_only=True): with settings(warn_only=True):
run('sudo supervisorctl stop gunicorn') run('sudo supervisorctl stop gunicorn')
@roles('web')
def staging(): def staging():
with cd('~/staging'): with cd('~/staging'):
run('git pull') run('git pull')
@ -110,7 +106,6 @@ def staging():
run('curl -s http://dev.newsblur.com/m/ > /dev/null') run('curl -s http://dev.newsblur.com/m/ > /dev/null')
compress_media() compress_media()
@roles('web')
def staging_full(): def staging_full():
with cd('~/staging'): with cd('~/staging'):
run('git pull') run('git pull')
@ -120,27 +115,23 @@ def staging_full():
run('curl -s http://dev.newsblur.com/m/ > /dev/null') run('curl -s http://dev.newsblur.com/m/ > /dev/null')
compress_media() compress_media()
@roles('task')
def celery(): def celery():
with cd(env.NEWSBLUR_PATH): with cd(env.NEWSBLUR_PATH):
run('git pull') run('git pull')
celery_stop() celery_stop()
celery_start() celery_start()
@roles('task')
def celery_stop(): def celery_stop():
with cd(env.NEWSBLUR_PATH): with cd(env.NEWSBLUR_PATH):
run('sudo supervisorctl stop celery') run('sudo supervisorctl stop celery')
with settings(warn_only=True): with settings(warn_only=True):
run('./utils/kill_celery.sh') run('./utils/kill_celery.sh')
@roles('task')
def celery_start(): def celery_start():
with cd(env.NEWSBLUR_PATH): with cd(env.NEWSBLUR_PATH):
run('sudo supervisorctl start celery') run('sudo supervisorctl start celery')
run('tail logs/newsblur.log') run('tail logs/newsblur.log')
@roles('task')
def kill_celery(): def kill_celery():
with cd(env.NEWSBLUR_PATH): with cd(env.NEWSBLUR_PATH):
run('ps aux | grep celeryd | egrep -v grep | awk \'{print $2}\' | sudo xargs kill -9') run('ps aux | grep celeryd | egrep -v grep | awk \'{print $2}\' | sudo xargs kill -9')
@ -160,12 +151,10 @@ def compress_media():
# = Backups = # = Backups =
# =========== # ===========
@roles('app')
def backup_mongo(): def backup_mongo():
with cd(os.path.join(env.NEWSBLUR_PATH, 'utils/backups')): with cd(os.path.join(env.NEWSBLUR_PATH, 'utils/backups')):
run('./mongo_backup.sh') run('./mongo_backup.sh')
@roles('db')
def backup_postgresql(): def backup_postgresql():
with cd(os.path.join(env.NEWSBLUR_PATH, 'utils/backups')): with cd(os.path.join(env.NEWSBLUR_PATH, 'utils/backups')):
run('./postgresql_backup.sh') run('./postgresql_backup.sh')
@ -423,7 +412,6 @@ def update_gunicorn():
run('git pull') run('git pull')
sudo('python setup.py develop') sudo('python setup.py develop')
@roles('web')
def setup_staging(): def setup_staging():
run('git clone https://github.com/samuelclay/NewsBlur.git staging') run('git clone https://github.com/samuelclay/NewsBlur.git staging')
with cd('~/staging'): with cd('~/staging'):

4
media/js/newsblur/reader.js
View file

@ -1874,7 +1874,7 @@
}); });
if (this.model.preference('show_unread_counts_in_title')) { if (this.model.preference('show_unread_counts_in_title')) {
var title = 'NewsBlur ('; var title = '(';
var counts = []; var counts = [];
var unread_view = _.isNumber(unread_view) && unread_view || this.model.preference('unread_view'); var unread_view = _.isNumber(unread_view) && unread_view || this.model.preference('unread_view');
if (unread_view <= -1) { if (unread_view <= -1) {
@ -1886,7 +1886,7 @@
if (unread_view <= 1) { if (unread_view <= 1) {
counts.push(unread_counts['positive']); counts.push(unread_counts['positive']);
} }
title += counts.join('/') + ')'; title += counts.join('/') + ') NewsBlur';
document.title = title; document.title = title;
} }
}, },