Merge branch 'django-1.5'
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 9 Apr 2013 09:12:01 +0000 (11:12 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 9 Apr 2013 09:12:01 +0000 (11:12 +0200)
1  2 
apps/catalogue/templates/catalogue/book_text.html
apps/lesmianator/templates/lesmianator/poem.html
apps/wolnelektury_core/templates/main_page.html
apps/wolnelektury_core/templates/superbase.html

@@@ -1,5 -1,4 +1,4 @@@
  {% load i18n %}
- {% load url from future %}
  {% load static from staticfiles %}
  {% load chunks compressed catalogue_tags %}
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
          </div>
          {{ book.html_file.read|safe }}
          {{ piwik_tag|safe }}
 -        <script type="text/javascript">
 -        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 -        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
 -        </script>
 -        <script type="text/javascript">
 -        var pageTracker = _gat._getTracker("UA-2576694-1");
 -        pageTracker._trackPageview();
 -        </script>
      </body>
  </html>
@@@ -16,7 -16,7 +16,7 @@@
                  {# shelf or global mixing #}
                  <a href='' class='menu-link'>Twórzże się jeszcze raz!</a>
              {% else %}{% if book %} 
-                 <a href='{% url poem_from_book book.slug %}' class='menu-link'>Twórzże się jeszcze raz!</a>
+                 <a href='{% url "poem_from_book" book.slug %}' class='menu-link'>Twórzże się jeszcze raz!</a>
              {% endif %}{% endif %}
              <span style='float: right'>Wolne Lektury przepuszczone przez mikser.</a>
          </div>
@@@ -39,8 -39,8 +39,8 @@@
              {% if book %}
                  <p>Tekst powstał przez zmiksowanie utworu
                  <a href="{{ book.get_absolute_url }}">{{ book.title }}</a>.<br/>
-                 <a href="{% url poem_from_book book.slug %}">Zmiksuj go ponownie</a>
-                 albo <a href="{% url lesmianator %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
+                 <a href="{% url 'poem_from_book' book.slug %}">Zmiksuj go ponownie</a>
+                 albo <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
              {% else %}{% if books %}
                  <p>Tekst powstał przez zmiksowanie utworów:</p>
                  <ul>
                      <a href="">Zmiksuj</a>
                      półkę <a href="{{ shelf.get_absolute_url }}">{{ shelf.name }}</a>
                      jeszcze raz, albo
-                     <a href="{% url lesmianator %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
+                     <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
                  {% else %}
-                     <p><a href="{% url lesmianator %}">Zobacz</a>,
+                     <p><a href="{% url 'lesmianator' %}">Zobacz</a>,
                      jak łatwo możesz stworzyć własny wierszmiks.</p>
                  {% endif %}
              {% else %}
                  <p>Wiersz powstał przez zmiksowanie ze sobą całej liryki z Wolnych Lektur.
                  <a href="">Spróbuj jeszcze raz</a>, albo
-                 <a href="{% url lesmianator %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
+                 <a href="{% url 'lesmianator' %}">zobacz</a>, co jeszcze możesz zamieszać.</p>
              {% endif %}{% endif %}
              <div>
          </div>
          </div>
          {{ piwik_tag|safe }}
 -        <script type="text/javascript">
 -        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 -        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
 -        </script>
 -        <script type="text/javascript">
 -        var pageTracker = _gat._getTracker("UA-2576694-1");
 -        pageTracker._trackPageview();
 -        </script>
      </body>
  </html>
          <h2><span class='mono'>{% trans "Utilities" %}</span></h2>
  
          <ul>
-             <li><a href="{% url suggest %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
+             <li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
              <!--li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li-->
-             <li><a href="{% url reporting_catalogue_pdf %}">
+             <li><a href="{% url 'reporting_catalogue_pdf' %}">
                        {% trans "Download the catalogue in PDF format." %}
                </a></li>
-             <!--li><a href="{% url infopage "widget" %}">{% trans "Widget" %}</a></li-->
-             <li><a href="{% url suggest_publishing %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
-             <li><a href="{% url publish_plan %}">{% trans "Publishing plan" %}</a></li>
-             <li><a href="{% url api %}">API</a></li>
-             <li><a href="{% url oaipmh %}">OAI-PMH</a></li>
-             <li><a href="{% url lesmianator %}" lang="pl">Leśmianator</a></li>
+             <!--li><a href="{% url 'infopage' "widget" %}">{% trans "Widget" %}</a></li-->
+             <li><a href="{% url 'suggest_publishing' %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
+             <li><a href="{% url 'publish_plan' %}">{% trans "Publishing plan" %}</a></li>
+             <li><a href="{% url 'api' %}">API</a></li>
+             <li><a href="{% url 'oaipmh' %}">OAI-PMH</a></li>
+             <li><a href="{% url 'lesmianator' %}" lang="pl">Leśmianator</a></li>
              <li><a href="http://polski.wolnelektury.pl" lang="pl">Materiały do nauki j. polskiego</a></li>
              
          </ul>
  
      <div class="infopages-box">
          <h2><span class='mono'>{% trans "Information" %}</span></h2>
 +        <ul>
 +            <li><a href="http://nowoczesnapolska.org.pl/prywatnosc/">{% trans "Privacy policy" %}</a></li>
          {% cache 60 infopages-on-main LANGUAGE_CODE %}
              {% infopages_on_main %}
          {% endcache %}
 +        </ul>
  
          <div class="social-links">
              <a href="http://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268"
@@@ -50,8 -50,8 +50,8 @@@
              <div id="tagline">
                  <span>
                  {% 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 %}
                      <a href='{{b}}'>{{c}}</a> free reading you have <a href='{{r}}'>right to</a>
                  {% if user.is_authenticated %}
                      {% trans "Welcome" %}, 
                        <span class="hidden-box-wrapper">
-                               <a href="{% url user_settings %}" class="hidden-box-trigger">
+                               <a href="{% url 'user_settings' %}" class="hidden-box-trigger">
                                        <strong>{{ user.username }}</strong>
                                </a>
                                <span id="user-menu" class="hidden-box">
-                                       <a href="{% url account_set_password %}">{% trans "Password" %}</a><br/>
-                                       <a href="{% url account_email %}">{% trans "E-mail" %}</a><br/>
-                                       <a href="{% url socialaccount_connections %}">{% trans "Social accounts" %}</a><br/>
+                                       <a href="{% url 'account_set_password' %}">{% trans "Password" %}</a><br/>
+                                       <a href="{% url 'account_email' %}">{% trans "E-mail" %}</a><br/>
+                                       <a href="{% url 'socialaccount_connections' %}">{% trans "Social accounts" %}</a><br/>
                                </span>
                        </span>
-                     | <a href="{% url social_my_shelf %}" id="user-shelves-link">{% trans "My shelf" %}</a>
+                     | <a href="{% url 'social_my_shelf' %}" id="user-shelves-link">{% trans "My shelf" %}</a>
                      {% if user.is_staff %}
                      | <a href="/admin/">{% trans "Administration" %}</a>
                      {% endif %}
-                     | <a href="{% url logout %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
+                     | <a href="{% url 'logout' %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
                  {% else %}
-                     <a href="{% url login %}?next={{ request.path }}"
+                     <a href="{% url 'login' %}?next={{ request.path }}"
                          id="login" class="ajaxable">
                              {% trans "Sign in" %}</a>
                      /
-                     <a href="{% url register %}?next={{ request.path }}"
+                     <a href="{% url 'register' %}?next={{ request.path }}"
                          id="register" class="ajaxable">
                              {% trans "Register" %}</a>
                  {% endif %}
  
  
  
-             <form id="search-area" action="{% url search %}" class="hidelabels">
+             <form id="search-area" action="{% url 'search' %}" class="hidelabels">
                  
                  <div id="search-field" class="grid-line">
                        <label for="search">{{search_form.q.label}}</label>
                      {% trans "Language versions" %}</span>
                  <div id="lang-menu-items">
                  {% for lang in LANGUAGES %}
-                     <form action="{% url django.views.i18n.set_language %}" method="post">
+                     <form action="{% url 'django.views.i18n.set_language' %}" method="post">
                      {% csrf_token %}
                      <input type="hidden" name="language" value="{{ lang.0 }}" />
                      <button type="submit"
          {% compressed_js "base" %}
  
          {{ piwik_tag|safe }}
 -        <script type="text/javascript">
 -        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 -        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
 -        </script>
 -        <script type="text/javascript">
 -        var pageTracker = _gat._getTracker("UA-2576694-1");
 -        pageTracker._trackPageview();
 -        </script>
  
                {% block extrabody %}
                {% endblock %}