change virtualenv path in fabfile

fix caching in waiter
query for email to suggest username on social signup
add temporary info in footer

diff --git a/apps/waiter/views.py b/apps/waiter/views.py
index e38bd8f..6e076b3 100644 (file)
--- a/apps/waiter/views.py
+++ b/apps/waiter/views.py
@@ -3,7 +3,10 @@ from waiter.models import WaitedFile
 from waiter.settings import WAITER_URL
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponse
 from waiter.settings import WAITER_URL
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponse

+from django.views.decorators.cache import never_cache

 
 

+
+@never_cache

 def wait(request, path):
     if WaitedFile.exists(path):
         file_url = join(WAITER_URL, path)
 def wait(request, path):
     if WaitedFile.exists(path):
         file_url = join(WAITER_URL, path)

diff --git a/apps/wolnelektury_core/templates/superbase.html b/apps/wolnelektury_core/templates/superbase.html
index f67d9f3..f596c43 100644 (file)
--- a/apps/wolnelektury_core/templates/superbase.html
+++ b/apps/wolnelektury_core/templates/superbase.html
@@ -171,6 +171,7 @@
                 e-mail: <a href="mailto:fundacja@nowoczesnapolska.org.pl">fundacja@nowoczesnapolska.org.pl</a>
                                {% endblocktrans %}
             </p>
                 e-mail: <a href="mailto:fundacja@nowoczesnapolska.org.pl">fundacja@nowoczesnapolska.org.pl</a>
                                {% endblocktrans %}
             </p>

+            <p>Nowa strona biblioteki Wolne Lektury powstała dzięki środkom otrzymanym w ramach Programu Operacyjnego Fundusz Inicjatyw Obywatelskich, Senatu RP (zadanie realizowane w ramach zlecania przez Kancelarię Senatu zadań w zakresie opieki nad Polonią i Polakami za granicą w 2011 r.) oraz Narodowego Instytutu Audiowizualnego w ramach programu Dziedzictwo Cyfrowe.</p>

 
             {% block add_footer %}{% endblock %}
 
 
             {% block add_footer %}{% endblock %}
 

diff --git a/fabfile.py b/fabfile.py
index 3d1be71..84605a2 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -131,7 +131,7 @@ def install_requirements():
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'
     require('release', provided_by=[deploy])
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'
     require('release', provided_by=[deploy])

-    run('cd %(path)s; %(pip)s install -E . -r %(path)s/releases/%(release)s/requirements.txt' % env, pty=True)
+    run('cd %(path)s; %(pip)s install -E ve -r %(path)s/releases/%(release)s/requirements.txt' % env, pty=True)

 
 def copy_localsettings():
     "Copy localsettings.py from root directory to release directory (if this file exists)"
 
 def copy_localsettings():
     "Copy localsettings.py from root directory to release directory (if this file exists)"


@@ -156,9 +156,9 @@ def migrate():
     print '>>> migrate'
     require('project_name', provided_by=[staging, production])
     with cd('%(path)s/releases/current/%(project_name)s' % env):
     print '>>> migrate'
     require('project_name', provided_by=[staging, production])
     with cd('%(path)s/releases/current/%(project_name)s' % env):

-        run('../../../bin/python manage.py syncdb --noinput' % env, pty=True)
+        run('../../../ve/bin/python manage.py syncdb --noinput' % env, pty=True)

         if env.use_south:
         if env.use_south:

-            run('../../../bin/python manage.py migrate' % env, pty=True)
+            run('../../../ve/bin/python manage.py migrate' % env, pty=True)

 
 def restart_webserver():
     "Restart the web server"
 
 def restart_webserver():
     "Restart the web server"

diff --git a/wolnelektury-celery.conf.template b/wolnelektury-celery.conf.template
index 67ac74a..c262c41 100644 (file)
--- a/wolnelektury-celery.conf.template
+++ b/wolnelektury-celery.conf.template
@@ -4,7 +4,7 @@
 ; =========================================
 
 [program:celery.%(project_name)s]
 ; =========================================
 
 [program:celery.%(project_name)s]

-command=%(path)s/bin/python %(path)s/releases/current/%(project_name)s/manage.py celeryd --loglevel=INFO
+command=%(path)s/ve/bin/python %(path)s/releases/current/%(project_name)s/manage.py celeryd --loglevel=INFO

 directory=%(path)s/releases/current/%(project_name)s
 user=%(user)s
 numprocs=2
 directory=%(path)s/releases/current/%(project_name)s
 user=%(user)s
 numprocs=2

diff --git a/wolnelektury.wsgi.template b/wolnelektury.wsgi.template
index 6a56ad7..033bab1 100644 (file)
--- a/wolnelektury.wsgi.template
+++ b/wolnelektury.wsgi.template
@@ -1,6 +1,6 @@
 #!%(python)s
 import site
 #!%(python)s
 import site

-site.addsitedir('%(path)s/lib/python2.6/site-packages')
+site.addsitedir('%(path)s/ve/lib/python2.6/site-packages')

 
 import os
 from os.path import abspath, dirname, join
 
 import os
 from os.path import abspath, dirname, join

diff --git a/wolnelektury/settings/auth.py b/wolnelektury/settings/auth.py
index 21210c0..3b703bc 100644 (file)
--- a/wolnelektury/settings/auth.py
+++ b/wolnelektury/settings/auth.py
@@ -7,4 +7,5 @@ LOGIN_URL = '/uzytkownik/login/'
 
 LOGIN_REDIRECT_URL = '/'
 
 
 LOGIN_REDIRECT_URL = '/'
 

-SOCIALACCOUNT_AUTO_SIGNUP = False
\ No newline at end of file
+SOCIALACCOUNT_AUTO_SIGNUP = False
+SOCIALACCOUNT_QUERY_EMAIL = True