From: Aleksander Łukasz Date: Fri, 21 Jun 2013 14:02:46 +0000 (+0200) Subject: Merge branch 'master' into funding X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/5f176bb52a7a59bf88f5728e60a3a62e12fb3d54 Merge branch 'master' into funding --- 5f176bb52a7a59bf88f5728e60a3a62e12fb3d54 diff --cc apps/wolnelektury_core/templates/superbase.html index 0d1ffa6a7,3eaf96216..a338b97ff --- a/apps/wolnelektury_core/templates/superbase.html +++ b/apps/wolnelektury_core/templates/superbase.html @@@ -32,10 -32,9 +32,9 @@@ {% endblock %} - {% include "annoy.html" %} {% block bodycontent %} - + {% funding link=1 closeable=1 add_class="funding-top-header" %}

diff --cc wolnelektury/settings/__init__.py index 4300aafa5,caec10b82..8d7c00f82 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@@ -65,14 -65,9 +65,15 @@@ INSTALLED_APPS_OUR = 'waiter', 'search', 'oai', + 'funding', - 'polls' ++ 'polls', + 'libraries', ] +GETPAID_BACKENDS = ( + 'getpaid.backends.payu', +) + INSTALLED_APPS_CONTRIB = [ # external 'django.contrib.auth', diff --cc wolnelektury/settings/static.py index e5bd333f6,2ed7b3887..a3ff42430 --- a/wolnelektury/settings/static.py +++ b/wolnelektury/settings/static.py @@@ -88,9 -81,6 +84,7 @@@ PIPELINE_JS = 'sponsors/js/sponsors.js', 'player/openplayer.js', 'js/search.js', + 'funding/funding.js', - - 'js/annoy.js', ), 'output_filename': 'js/base.min.js', }, diff --cc wolnelektury/urls.py index fd8ed63bf,e99b0816a..6c254519c --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@@ -35,8 -35,7 +35,9 @@@ urlpatterns += patterns('' url(r'^ludzie/', include('social.urls')), url(r'^uzytkownik/', include('allauth.urls')), url(r'^czekaj/', include('waiter.urls')), + url(r'^wesprzyj/', include('funding.urls')), + url(r'^ankieta/', include('polls.urls')), + url(r'^biblioteki', include('libraries.urls')), # Admin panel url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),