From 8c0906fbff39e45b57e3f46609bb46a1c8d1e35e Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 3 Sep 2011 23:10:46 -0700
Subject: [PATCH] Changing scroll speed. Adding authenticated info to every
 request.

---
 fabfile.py                  | 11 ++++++++++-
 media/js/newsblur/reader.js |  6 +++---
 requirements.txt            | 15 ---------------
 utils/json_functions.py     |  2 ++
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/fabfile.py b/fabfile.py
index b0f6bc9f0..cf2450784 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -110,11 +110,20 @@ def staging_full():
 
 @roles('task')
 def celery():
+    run('git pull')
+    celery_stop()
+    celery_start()
+
+@roles('task')
+def celery_stop():
     with cd(env.NEWSBLUR_PATH):
-        run('git pull')
         run('sudo supervisorctl stop celery')
         with settings(warn_only=True):
             run('./utils/kill_celery.sh')
+
+@roles('task')
+def celery_start():
+    with cd(env.NEWSBLUR_PATH):
         run('sudo supervisorctl start celery')
         run('tail logs/newsblur.log')
 
diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js
index 66e3b2d6b..142549ea1 100644
--- a/media/js/newsblur/reader.js
+++ b/media/js/newsblur/reader.js
@@ -820,9 +820,9 @@
             }
             // NEWSBLUR.log(['page_in_story', this.$s.$story_pane, direction, page_height, scroll_height]);
             if (this.story_view == 'page') {
-                this.$s.$feed_iframe.scrollTo({top:dir+'='+scroll_height, left:'+=0'}, 150);
+                this.$s.$feed_iframe.scrollTo({top:dir+'='+scroll_height, left:'+=0'}, 260);
             } else if (this.story_view == 'feed') {
-                this.$s.$feed_stories.scrollTo({top:dir+'='+scroll_height, left:'+=0'}, 150);
+                this.$s.$feed_stories.scrollTo({top:dir+'='+scroll_height, left:'+=0'}, 370);
             }
         },
         
@@ -6032,7 +6032,7 @@
             });
             $document.bind('keydown', 'space', function(e) {
                 e.preventDefault();
-                self.page_in_story(0.4, 1);
+                self.page_in_story(0.2, 1);
             });
             $document.bind('keydown', 'shift+space', function(e) {
                 e.preventDefault();
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index a2aff7f66..000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-django
-mongoengine
-django-celery
-django-compress
-South
-django-extensions
-psycopg2
-BeautifulSoup
-pyyaml
-nltk
-lxml
-oauth2
-pytz
-boto
-gunicorn
diff --git a/utils/json_functions.py b/utils/json_functions.py
index 6456abb08..765e59f3a 100644
--- a/utils/json_functions.py
+++ b/utils/json_functions.py
@@ -102,6 +102,8 @@ def json_view(func):
                 response = dict(response)
                 if 'result' not in response:
                     response['result'] = 'ok'
+                authenticated = request.user.is_authenticated()
+                response['authenticated'] = authenticated
         except KeyboardInterrupt:
             # Allow keyboard interrupts through for debugging.
             raise