Merge pull request #434 from ox-it/browse-improvements

Browse improvements

talks/events/views.py

@@ -92,17 +92,31 @@ def browse_events(request):
         return redirect(reverse('browse_events'))
 
     events = events_search(modified_request_parameters)
-
+        
     paginator = Paginator(events, count)
     try:
         events = paginator.page(page)
     except (PageNotAnInteger, EmptyPage):
         return redirect(reverse('browse_events'))
 
+    grouped_events = {}
+    event_dates = []
+    for group_event in events:
+        key = group_event.start.date()
+        if key not in grouped_events:
+            grouped_events[key] = []
+            event_dates.append(key)
+        grouped_events[key].append(group_event)
+
+    result_events = []
+    for event_date in event_dates:
+        result_events.append({"start_date":event_date, "gr_events":grouped_events[event_date]})
+
     fragment = '&'.join(["{k}={v}".format(k=k, v=v) for k, v in args.iteritems()])
 
     context = {
         'events': events,
+        'result_events': result_events,
         'fragment': fragment,
         'browse_events_form': browse_events_form,
         'start_date': modified_request_parameters.get('start_date'),
@@ -153,14 +167,15 @@ def show_event(request, event_slug):
             'department_organiser').get(slug=event_slug)
     except Event.DoesNotExist:
         raise Http404
-
+        
     context = {
         'event': ev,
         'url': request.build_absolute_uri(reverse('show-event', args=[ev.slug])),
         'location': ev.api_location,
         'speakers': ev.speakers.all(),
         'hosts': ev.hosts.all(),
         'organisers': ev.organisers.all(),
+        'editors': ev.editor_set.all(),
     }
     if request.tuser:
         context['editable_collections'] = request.tuser.collections.filter(talksusercollection__role__in=[COLLECTION_ROLES_OWNER, COLLECTION_ROLES_EDITOR]).distinct()

talks/templates/events/browse.html

@@ -74,14 +74,18 @@ <h3>Filters</h3>
 
 
 <div class="js-upcoming-events">
-    {% if events %}
-      <ul class="list-group">
-        {% for event in events %}
-          <li class="list-group-item">
-            {% include 'events/event_teaser.html' %}
-          </li>
-        {% endfor %}
-      </ul>
+    {% if result_events %}
+      {% for result_event in result_events %}
+        <p>{{result_event.start_date}}</p>
+        <ul class="list-group">
+          {% for event in result_event.gr_events %}
+            <li class="list-group-item">
+              {{event}}
+              {% include 'events/event_teaser.html' %}
+            </li>
+          {% endfor %}
+        </ul>
+      {% endfor %}
         {% with events as page %}
             {% include 'events/_pagination.html' %}
         {% endwith %}

talks/templates/events/event-group.html

@@ -51,6 +51,7 @@ <h3 class="panel-title contains-floating-buttons">
                 {% endif %}
             </div>
         </h3>
+        Editor: {{request.user}}
     </div>
     {% if event_group.description %}
     <div class="panel-body">

talks/templates/events/event-group.txt.html

@@ -18,6 +18,7 @@
 {% block content %}
 
 <br>{{ event_group.title }}
+<br>Editor: {{request.user}}
 {% if event_group.description %}
     <br>{{ event_group.description_html | safe | striptags | linebreaksbr }}
 {% else %}

talks/templates/events/event.html

@@ -87,6 +87,12 @@ <h3 class="panel-title contains-floating-buttons event">
                 {% endif %}
             </div>
         </h3>
+        {% if editors %}
+            Editor{{ editors|pluralize }}: {% for editor in editors %}
+              {{ editor.username }}{% if not forloop.last %}, {% endif %}
+            {% endfor %}
+        {% endif %}
+
         {% if event.special_message %}
         <br>
         <div class="alert alert-info">

talks/templates/events/event.txt.html

@@ -17,6 +17,11 @@
 {% block content %}
 
 {{ event.title_display }}
+{% if editors %}
+    <br>Editor{{ editors|pluralize }}: {% for editor in editors %}
+      {{ editor.username }}{% if not forloop.last %}, {% endif %}
+    {% endfor %}
+{% endif %}
 
 {% if event.special_message %}
     <br>{{ event.special_message }}

talks/templates/events/event_teaser.html

@@ -9,25 +9,27 @@
             {% endif %}
         </strong>
          -
-        <a href="{{ event.get_absolute_url }}" class="list-group-item-heading">
+        <b><u><a href="{{ event.get_absolute_url }}" class="list-group-item-heading">
           {% if event.title %}
             {{ event.title }}
           {% else %}
             Untitled talk
           {% endif %}
-        </a>
+        </a></u></b>
         {% if event.group %}
-          - Part of: <a href="{{ event.group.get_absolute_url }}">{{ event.group.title }}</a>
+          <br>
+          Part of: <a href="{{ event.group.get_absolute_url }}">{{ event.group.title }}</a>
         {% endif %}
         {% if event.speakers %}
-            . Speaker{{ event.speakers|pluralize }}:
+            <br>
+            Speaker{{ event.speakers|pluralize }}:
             {% for speaker in event.speakers %}
-                <a href="{% url 'show-person' speaker.slug %}">{{ speaker.name}}{% if speaker.bio %} ({{ speaker.bio }}){% endif %}</a>{% if not forloop.last %}, {% endif %}
+                <b><u><a href="{% url 'show-person' speaker.slug %}">{{ speaker.name}}{% if speaker.bio %} ({{ speaker.bio }}){% endif %}</a></u></b>{% if not forloop.last %}, {% endif %}
             {% endfor %}
         {% endif %}
     </div>
     <div class="formatting-links-wrapper">
         {% include "events/event_ics_link.html" %}
     </div>
 
-</div>
+</div>