Funding: behave nicer with time conflicts.

[wolnelektury.git] / apps / funding / templates / funding / offer_list.html

diff --git a/apps/funding/templates/funding/offer_list.html b/apps/funding/templates/funding/offer_list.html
old mode 100755 (executable)
new mode 100644 (file)
index ffb6af0..feb175d
--- a/apps/funding/templates/funding/offer_list.html
+++ b/apps/funding/templates/funding/offer_list.html
@@ -13,27 +13,29 @@
 
 
 {% autopaginate object_list 10 %}
 
 
 {% autopaginate object_list 10 %}

+{% if page_obj.number == 1 %}
+    <h2>{% trans "Current fundraiser:" %}</h2>
+{% endif %}
+

 {% for offer in object_list %}
 {% with is_win=offer.is_win is_current=offer.is_current %}
 {% for offer in object_list %}
 {% with is_win=offer.is_win is_current=offer.is_current %}

-
-    {% if is_current %}
-        <h2>{% trans "Current fundraiser:" %}</h2>
-    {% elif forloop.is_first %}
+    {% if not is_current  and forloop.first and page_obj.number == 1 %}
+        <p class="normal-text">{% trans "No fundraiser is currently running." %}</p>

         <h2>{% trans "Previous fundraisers:" %}</h2>
     {% endif %}
 
         <h2>{% trans "Previous fundraisers:" %}</h2>
     {% endif %}
 

-    <div class="white-box normal-text">
-        {% offer_status offer %}
-    </div>
-
-    {% funding offer link=1 %}
-
+    {% funding offer link=1 show_title_calling=False %}

 
     <div class="white-box normal-text">
 
     <div class="white-box normal-text">

+        {% if is_current %}
+            <h3>{% trans "Help free the book!" %}</h3>
+            {{ offer.description|safe }}
+        {% endif %}
+        {% offer_status offer %}

         {% offer_status_more offer %}
     </div>
 
         {% offer_status_more offer %}
     </div>
 

-    {% if is_current and not forloop.is_last %}
+    {% if is_current and not forloop.last %}

         <h2>{% trans "Previous fundraisers:" %}</h2>
     {% endif %}
 
         <h2>{% trans "Previous fundraisers:" %}</h2>
     {% endif %}