Merge branch 'master' of https://github.com/ox-it/talks.ox

ox-it · Dec 7, 2015 · 0ac06bf · 0ac06bf
2 parents 909f771 + 1cf7615
commit 0ac06bf
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/static/css/custom.css b/static/css/custom.css
@@ -77,15 +77,16 @@ span.filter-active {
 }
 
 .event-teaser-wrapper {
-    display: -webkit-inline-flex;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
+    /*display: -webkit-inline-flex;*/
+    /*display: -ms-inline-flexbox;*/
+    /*display: inline-flex;*/
+    display: inline-block;
     width: 100%;
 }
 
 .list-group-item .event-teaser-text-wrapper {
     float: left;
-    width: 100%;
+    width: 90%;
 }
 .formatting-link {
     margin-left: 15px;

diff --git a/talks/api/serializers.py b/talks/api/serializers.py
@@ -265,7 +265,18 @@ class Meta:
 
 
 class CollectionEmbedsSerializer(serializers.ModelSerializer):
-    talks = HALEventSerializer(many=True, read_only=True, source='get_all_events')
+    talks = serializers.SerializerMethodField()
+
+    def get_talks(self,obj):
+        events = obj.get_all_events()
+        if self.context.has_key('from-date') or self.context.has_key('to-date'):
+            if self.context['from-date']:
+                events = events.filter(start__gte=self.context['from-date'])
+            if self.context['to-date']:
+                events = events.filter(end__lte=self.context['to-date'])
+
+        serializer = HALEventSerializer(events, many=True, read_only=True)
+        return serializer.data
 
     class Meta:
         model = Collection

diff --git a/talks/api/views.py b/talks/api/views.py
@@ -22,6 +22,7 @@
                                    HALEventGroupSerializer, HALSearchResultSerializer, EventSerializer, HALCollectionSerializer)
 from talks.api.services import events_search, get_event_by_slug, get_eventgroup_by_slug
 from talks.core.renderers import ICalRenderer
+from talks.core.utils import parse_date
 
 logger = logging.getLogger(__name__)
 
@@ -312,10 +313,17 @@ def api_collection(request, collection_slug):
     :param collection_slug: collection slug
     :return: DRF response object
     """
+
+    # If from and to dates have been passed as request parameters, filter the events by those dates.
+    from_date = parse_date(request.GET.get('from', ''))
+    to_date = parse_date(request.GET.get('to', ''))
     try:
         collection = Collection.objects.get(slug=collection_slug)
         if collection.public:
-            serializer = HALCollectionSerializer(collection)
+            if from_date and to_date:
+                serializer = HALCollectionSerializer(collection, context={'from-date': from_date, 'to-date': to_date})
+            else:
+                serializer = HALCollectionSerializer(collection)
             return Response(serializer.data, status=status.HTTP_200_OK)
         else:
             return Response({'error': "Collection is not public"},

diff --git a/talks/templates/base.html b/talks/templates/base.html
@@ -67,8 +67,8 @@
                         <button type="submit" class="btn btn-default">Submit</button>
                     </form>
                     <ul class="nav navbar-nav navbar-right">
+                        <li><a href="http://talksox.readthedocs.org/en/latest" target="_blank"><span class="glyphicon glyphicon-info-sign"></span> Help</a></li>
                         {% if user.is_authenticated %}
-                            <li><a href="http://talksox.readthedocs.org/en/latest/user/talk-editors.html" target="_blank"><span class="glyphicon glyphicon-info-sign"></span> Help</a></li>
                             {% if user.first_name and user.last_name %}
                                 <li><p class="navbar-text"><i class="glyphicon glyphicon-user"></i> {{ user.first_name }} {{ user.last_name }}</p></li>
                             {% elif user.email %}

diff --git a/talks/urls.py b/talks/urls.py
@@ -39,7 +39,8 @@
 
     # Mappings from old talks site
     url(r'^talk/index/(?P<index_id>[^/]+)$', old_talks_mappings, name='old-talks-mappings'),
-    url(r'^(show|list)/(index|archive|text)/(?P<index_id>[^/]+)$', old_series_mappings, name='old-series-mappings'),
+    url(r'^(feeds|show|list)/(table|minimalist|detailed|bulletin|simplewithlogo|oneday|xml|rss|ics|json|index|archive|text)/(?P<index_id>[^/]+)$', old_series_mappings, name='old-series-mappings'),
     url(r'^dates', RedirectView.as_view(pattern_name='browse_events')),
     url(r'^index', RedirectView.as_view(pattern_name='browse_events')),
+
 )