From: Radek Czajka Date: Tue, 12 Nov 2013 11:57:43 +0000 (+0100) Subject: Merge branch 'master' into rwd X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03 Merge branch 'master' into rwd Conflicts: apps/wolnelektury_core/templates/superbase.html --- 7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03 diff --cc apps/wolnelektury_core/templates/superbase.html index 65b9e0a82,e97ede609..9ee206f57 --- a/apps/wolnelektury_core/templates/superbase.html +++ b/apps/wolnelektury_core/templates/superbase.html @@@ -28,26 -34,46 +28,27 @@@ {% block bodycontent %} + {% funding link=1 closeable=1 add_class="funding-top-header" %} -

- -

- -

-

- -

-

- -

- - {% cache 60 tagline LANGUAGE_CODE %} - {% url 'book_list' as b %} - {% url 'infopage' 'prawa' as r %} - {% count_books book_count %} - {% blocktrans count book_count as c %} - {{c}} free reading you have right to - {% plural %} - {{c}} free readings you have right to - {% endblocktrans %} - {% endcache %} - -

- -

+