fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45632ae 4519647)
Merge branch 'master' into funding
authorAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Fri, 21 Jun 2013 14:02:46 +0000 (16:02 +0200)
committerAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Fri, 21 Jun 2013 14:02:46 +0000 (16:02 +0200)
1  2 
apps/pdcounter/templates/pdcounter/author_detail.html patch | diff1 | diff2 | blob | history
apps/pdcounter/templates/pdcounter/book_stub_detail.html patch | diff1 | diff2 | blob | history
apps/wolnelektury_core/static/css/main_page.css patch | diff1 | diff2 | blob | history
apps/wolnelektury_core/templates/superbase.html patch | diff1 | diff2 | blob | history
wolnelektury/settings/__init__.py patch | diff1 | diff2 | blob | history
wolnelektury/settings/static.py patch | diff1 | diff2 | blob | history
wolnelektury/urls.py patch | diff1 | diff2 | blob | history

diff --cc apps/wolnelektury_core/templates/superbase.html
index 0d1ffa6,3eaf962..a338b97
--- 1/apps/wolnelektury_core/templates/superbase.html
--- 2/apps/wolnelektury_core/templates/superbase.html
+++ b/apps/wolnelektury_core/templates/superbase.html
@@@ -32,10 -32,9 +32,9 @@@
          {% endblock %}
      </head>
      <body id="{% block bodyid %}base{% endblock %}">
-         {% include "annoy.html" %}
  
          {% block bodycontent %}
 -
 +        {% funding link=1 closeable=1 add_class="funding-top-header" %}
                <div id="header-bg"></div>
  
          <div id="header">
diff --cc wolnelektury/settings/__init__.py
index 4300aaf,caec10b..8d7c00f
--- 1/wolnelektury/settings/__init__.py
--- 2/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@@ -65,14 -65,9 +65,15 @@@ INSTALLED_APPS_OUR = 
      'waiter',
      'search',
      'oai',
-     'polls'
 +    'funding',
++    'polls',
+     'libraries',
      ]
  
 +GETPAID_BACKENDS = (
 +    'getpaid.backends.payu',
 +)
 +
  INSTALLED_APPS_CONTRIB = [
      # external
      'django.contrib.auth',
diff --cc wolnelektury/settings/static.py
index e5bd333,2ed7b38..a3ff424
--- 1/wolnelektury/settings/static.py
--- 2/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',
-             
-             'js/annoy.js',
 +            'funding/funding.js',
              ),
          'output_filename': 'js/base.min.js',
      },
diff --cc wolnelektury/urls.py
index fd8ed63,e99b081..6c25451
--- 1/wolnelektury/urls.py
--- 2/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'),