fixes

[wolnelektury.git] / src / funding / templates / funding / offer_detail.html

diff --git a/src/funding/templates/funding/offer_detail.html b/src/funding/templates/funding/offer_detail.html
index bf21f3d..05e2d7b 100644 (file)
--- a/src/funding/templates/funding/offer_detail.html
+++ b/src/funding/templates/funding/offer_detail.html
@@ -1,11 +1,11 @@
 {% extends "base/base.html" %}
-{% load url from future %}
 {% load i18n static %}
 {% load pagination_tags %}
 {% load fnp_share %}
 {% load thumbnail %}
 {% load build_absolute_uri from fnp_common %}
-{% load ssi_include from ssify %}
+{% load fundings from funding_tags %}
+{% load chunks %}
 
 
 {% block titleextra %}{{ object }}{% endblock %}
@@ -18,7 +18,7 @@
 {% block body %}
   <h1>{{ object }}</h1>
 
-  {% ssi_include 'funding_detail_bar' pk=object.pk %}
+  {{ object.detail_bar }}
   <div class="white-box">
     <div class="funding-details-intro">
       {% if object.cover %}
@@ -28,13 +28,7 @@
       <div class="normal-text">
         <h3>{% trans "Help free the book!" %}</h3>
         {{ object.description|safe }}
-        {% ssi_include 'funding_status' pk=object.pk %}
-        <a href='//nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/' target="_blank" style='float:right;border:1px solid #ddd;padding: 1em;margin:0 0 1em 1em;background:#eee;'><img src='//nowoczesnapolska.org.pl/wp-content/themes/koed/annoy/procent.png' alt='1%' style='float:left;margin-right: 1em;margin-top:.2em;'>Możesz też przekazać<br/>1% podatku na rozwój biblioteki. &rarr;</a>
-        {% ssi_include 'funding_status_more' pk=object.pk %}
-        <p><a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.</p>
       </div>
-
-      <div style="clear:both;"></div>
     </div>
 
     {% if object.is_current %}
@@ -55,7 +49,13 @@
                 </tr>
               {% endif %}
             {% endfor %}
-            <tr><td></td><td><label>{{ form.agree_newsletter }} {{ form.agree_newsletter.label }}</label></td></tr>
+            <tr>
+              <td></td>
+              <td>
+                <label>{{ form.agree_newsletter }} {{ form.agree_newsletter.label }}</label>
+                <br/><span class="helptext">{{ form.data_processing }}</span>
+              </td>
+            </tr>
             <tr>
               <td></td>
               <td>
@@ -68,9 +68,17 @@
         </form>
       </div>
 
+      {% chunk "funding_form_bottom" %}
+
+         {{ object.status }}
+        <a href='//nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/' target="_blank" style='float:right;border:1px solid #ddd;padding: 1em;margin:0 0 1em 1em;background:#eee;'><img src='//nowoczesnapolska.org.pl/wp-content/themes/koed/annoy/procent.png' alt='1%' style='float:left;margin-right: 1em;margin-top:.2em;'>Możesz też przekazać<br/>1% podatku na rozwój biblioteki. &rarr;</a>
+        {{ object.status_more }}
+        <p><a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.</p>
+
       {% url 'funding_current' object.slug as current %}
       <p class="normal-text">{% trans "Tell your friends!" %}</p>
       <p class="share">{% share current _("Support Wolne Lektury!") "big" %}</p>
+      <div style="clear:both;"></div>
     {% endif %}
 
     <p class="normal-text"><a href="{% url 'funding' %}">{% trans "See all fundraisers." %}</a></p>
@@ -79,6 +87,6 @@
   <h2>{% trans "Supporters" %}:</h2>
 
   <div class="white-box normal-text">
-    {% ssi_include 'funding_fundings' pk=object.pk page=page %}
+    {% fundings object %}
   </div>
 {% endblock %}