Add event list date line

diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index 906ebeb7e562e87a867eeb3980cc798f488598f9..a512dd78c151767cf786e4be099c04c181b9c98e 100644 (file)
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -72,7 +72,7 @@
 
                     <div class="page__filters">
                         {% keywords_for mezzanine_agenda.event as tags %}
-                        {% all_events as all_events %}
+                        {# {% all_events as all_events %}#}
                         {% if tags %}
                             {% comment %}
                                 <a href="{% url 'event_list' %}" class="button{% if not tag %} button--black{% else %} button--white{% endif %}">{% trans "All events" %}</a>

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index 9082317c7bfb68a61f81fabca4ff71a9ba854c35..1b8a84ab8bcad4017485b9d36b9c185a65b242fe 100644 (file)
--- a/app/templates/agenda/includes/event_date.html
+++ b/app/templates/agenda/includes/event_date.html
@@ -39,28 +39,33 @@
         {% with event.periods.all|same_time_in_periods as same_time_in_periods %}
         {% for period in event.periods.all %}
             {% if period.date_to and period.date_to|date:"H:i" != "23:59" %}
-                {{ period.date_from|date:"l j F" }} {% trans "from" %} {{ period.date_from|date:"H\hi" }} {% trans "to" %} {{ period.date_to|date:"H\hi" }}<br>
+                {{ period.date_from|date:"l j F" }}
+                {% if period|period_is_more_than_hours:4 %}
+                    {{ period.date_from|date:"H\hi" }} {% trans "to" %} {{ period.date_to|date:"H\hi" }}<br>
+                {% else %}
+                    {{ period.date_from|date:"H\hi" }}<br>
+                {% endif %}
             {% else %}
                 {% if event.periods.all|length > 1 and not forloop.last %}
-                    {{ period.date_from|date:"l j" }}{% if event.periods.all|length == 2 %} {% trans "and" %} {% else %}, {% endif %}
+                    {{ period.date_from|date:"l j F" }}{% if event.periods.all|length == 2 %} {% trans "and" %} {% else %}, {% endif %}
                 {% else %}
                     {{ period.date_from|date:"l j F" }}
                     {% if event.periods.all|length > 1 and forloop.first %} {% trans "and" %}{% endif %}
                 {% endif %}
                 {% if same_time_in_periods and forloop.last %}
-                    <br>{{ period.date_from|date:"H\hi" }}
+                    {{ period.date_from|date:"H\hi" }}
                 {% elif not same_time_in_periods %}
-                    <br>{{ period.date_from|date:"H\hi" }}<br>
+                    {{ period.date_from|date:"H\hi" }}<br>
                 {% endif %}
             {% endif %}
         {% endfor %}
         {% endwith %}
       {% else %}
-        {% trans "from" %} {{ event.start|date:"l j F" }} {% trans "to" %} {{ event.end|date:"l j F" }}<br>{{ event.start|date:"H\hi" }} - {{ event.end|date:"H\hi" }}
+        {{ event.start|date:"l j F" }} {% trans "to" %} {{ event.end|date:"l j F" }}<br>{{ event.start|date:"H\hi" }} - {{ event.end|date:"H\hi" }}
       {% endif %}
     <!-- Start and end date are completely different  -->
     {% else %}
-        {% trans "from" %} {{ event.start|date:"j F" }} {% trans "to" %} {{ event.end|date:"j F" }}
+        {{ event.start|date:"j F" }} {% trans "to" %} {{ event.end|date:"j F" }}
     {% endif %}
 
 {% endif %}

diff --git a/app/templates/agenda/includes/event_date_line.html b/app/templates/agenda/includes/event_date_line.html
new file mode 100644 (file)
index 0000000..3e02335
--- /dev/null
+++ b/app/templates/agenda/includes/event_date_line.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% load event_tags %}
+
+{% if event.start and not event.end %}
+    {{ event.start|date:"l j F" }}<br>
+{% else %}
+    {% if event.start|date:"d.m.y" == event.end|date:"d.m.y" %}
+        {{ event.start|date:"l j F" }}<br>
+    {% else %}
+        {{ event.start|date:"j F" }} {% trans "to" %} {{ event.end|date:"j F" }}
+    {% endif %}
+{% endif %}

diff --git a/app/templates/agenda/includes/event_metainfo_line.html b/app/templates/agenda/includes/event_metainfo_line.html
index 2f25d8bc5713234bc3e096465402bd95d349f912..86349396204855df75d6958c5a15bbf98ba23ae2 100644 (file)
--- a/app/templates/agenda/includes/event_metainfo_line.html
+++ b/app/templates/agenda/includes/event_metainfo_line.html
@@ -2,7 +2,7 @@
 
 <div class="page__meta-date">
     <a href="{{ event.get_absolute_url }}">
-        {% include 'agenda/includes/event_date.html' %}
+        {% include 'agenda/includes/event_date_line.html' %}
     </a>
 </div>
 

diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 04b66f1604f971ce3b58dfa656bdadc2e57a8620..5a92509d2d9b0e5b964faa5a74328ee977c44cc7 160000 (submodule)
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 04b66f1604f971ce3b58dfa656bdadc2e57a8620
+Subproject commit 5a92509d2d9b0e5b964faa5a74328ee977c44cc7