From: Radek Czajka Date: Wed, 10 Apr 2013 08:00:34 +0000 (+0200) Subject: Merge branch 'master' into funding X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/6d7b11e4a01b2314c0527d94d91f3159c0bd34ce?hp=-c Merge branch 'master' into funding Conflicts: requirements.txt --- 6d7b11e4a01b2314c0527d94d91f3159c0bd34ce diff --combined apps/wolnelektury_core/templates/superbase.html index a54cb4bca,182d2b096..2aa653a7e --- a/apps/wolnelektury_core/templates/superbase.html +++ b/apps/wolnelektury_core/templates/superbase.html @@@ -2,7 -2,7 +2,7 @@@ {% load cache compressed i18n %} {% load static from staticfiles %} - {% load catalogue_tags reporting_stats sponsor_tags %} + {% load catalogue_tags funding_tags reporting_stats sponsor_tags %} @@@ -50,8 -50,8 +50,8 @@@
{% cache 60 tagline LANGUAGE_CODE %} - {% url book_list as b %} - {% url infopage 'prawa' as r %} + {% 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 @@@ -66,26 -66,26 +66,26 @@@ {% if user.is_authenticated %} {% trans "Welcome" %}, - + {{ user.username }} - {% trans "Password" %}
- {% trans "E-mail" %}
- {% trans "Social accounts" %}
+ {% trans "Password" %}
+ {% trans "E-mail" %}
+ {% trans "Social accounts" %}
 - | {% trans "My shelf" %} + | {% trans "My shelf" %} {% if user.is_staff %} | {% trans "Administration" %} {% endif %} - | {% trans "Logout" %} + | {% trans "Logout" %} {% else %} - {% trans "Sign in" %} / - {% trans "Register" %} {% endif %} @@@ -102,7 -102,7 +102,7 @@@ -
+
@@@ -121,8 -121,9 +121,8 @@@
-
- + {% funding link=1 %}