more events, 1 booking button per event

diff --git a/app/sandbox/local_settings.py b/app/sandbox/local_settings.py
index 56afbd3eaa92fba33ffccd78123e8a415cb954f6..87d033935d2b228be83c5fc578a2391727f8e0d7 100644 (file)
--- a/app/sandbox/local_settings.py
+++ b/app/sandbox/local_settings.py
@@ -97,7 +97,7 @@ warnings.filterwarnings(
         RuntimeWarning, r'django\.db\.models\.fields')
 
 EVENT_GOOGLE_MAPS_DOMAIN = 'maps.google.fr'
-EVENT_PER_PAGE = 8
+EVENT_PER_PAGE = 50
 EVENT_USE_FEATURED_IMAGE = True
 EVENT_SHOP_URL = 'http://eve.ircam.fr/manifeste.php/manifestation/'
 

diff --git a/app/templates/agenda/event_booking.html b/app/templates/agenda/event_booking.html
index a808c1b62d008036baf6e1baba9e781f86c2223f..05812b252b173998dc76a7d0f0e4b10f26f6e967 100644 (file)
--- a/app/templates/agenda/event_booking.html
+++ b/app/templates/agenda/event_booking.html
@@ -1,7 +1,7 @@
 {% extends "agenda/event_detail.html" %}
 {% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags festival_tags %}
 
-{% block booking %}
+{% block event_detail_postedby %}
 {% endblock %}
 
 {% block event_detail_content %}

diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index 3cef8fc55b21ea3379ab2c1acb0d16063be30648..f266570c425d296819750000a5e2c592b0a164b5 100644 (file)
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -25,16 +25,17 @@
 
 {% block event_detail_postedby %}
 {% editable event.start event.end event.location %}
+{% with True as unit_booking %}
  {% include 'agenda/includes/event_metainfo.html' %}
+ {% for child in event.children.all %}
+  {% with child as event %}
+   {% include "agenda/includes/event_metainfo.html" %}
+  {% endwith %}
+ {% endfor %}
+{% endwith %}
 {% endeditable %}
 {% endblock %}
 
-{% block booking %}
-<a href="{% url 'event_booking' event.slug %}" class="btn event__meta__btn">
-    <i class="icon icon__bookmark"></i> {% trans "Booking" %}
-</a>
-{% endblock %}
-
 {% block event_detail_commentlink %}
 <p>
     {% if event.allow_comments %}

diff --git a/app/templates/agenda/includes/event_card.html b/app/templates/agenda/includes/event_card.html
index cb6e7d1d8f5c5ac566173fba729b9ca9b9fdb5c4..f1510ce03c366a8568fd33fc355181791792d998 100644 (file)
--- a/app/templates/agenda/includes/event_card.html
+++ b/app/templates/agenda/includes/event_card.html
@@ -15,12 +15,14 @@
 {% endblock %}
 
 {% block event_list_event_metainfo %}
+  {% with False as unit_booking %}
      {% include "agenda/includes/event_metainfo.html" %}
     {% for child in event.children.all %}
      {% with child as event %}
       {% include "agenda/includes/event_metainfo.html" %}
      {% endwith %}
     {% endfor %}
+  {% endwith %}
 {% endblock %}
 
 {% block event_list_event_content %}

diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html
index 462d02e16b8f7f94186744c69f3dc931e02cd64a..4fdee43ba6e992b29fae87cadcecc06dae629c46 100644 (file)
--- a/app/templates/agenda/includes/event_metainfo.html
+++ b/app/templates/agenda/includes/event_metainfo.html
@@ -7,7 +7,13 @@
         {% if event.end|date == event.start|date and event.end.hour|subtract:event.start.hour > 3 %}{{ event.end|time:"TIME_FORMAT" }}{% endif %}
         {% endif %}
         {% if event.location %}
-        <a href="{% url "event_list_location" event.location.slug %}" class="event__meta__location">{{ event.location }}</a>
+        {# <a href="{% url "event_list_location" event.location.slug %}" class="event__meta__location">{{ event.location }}</a>#}
+        <span class="event__meta__location">{{ event.location }}</span>
+        {% if unit_booking %}
+        <a href="{% url 'event_booking' event.slug %}" class="btn event__meta__btn">
+            <i class="icon icon__bookmark"></i> {% trans "Booking" %}
+        </a>
+        {% endif %}
         {% endif %}
     </div>
 </div>