Home : Add events

diff --git a/app/organization/pages/forms.py b/app/organization/pages/forms.py
index 778167243d63517b297bef3f01ea886451e398b1..69247ffbeb380b10034b19a7fc8435fa26c32da2 100644 (file)
--- a/app/organization/pages/forms.py
+++ b/app/organization/pages/forms.py
@@ -10,7 +10,7 @@ from mezzanine.core.models import Orderable
 from organization.magazine.models import Article, Topic, Brief
 from organization.pages.models import CustomPage
 from organization.pages.models import DynamicContentHomeSlider, DynamicContentHomeBody
-
+from organization.agenda.models import Event
 
 class DynamicContentHomeSliderForm(autocomplete.FutureModelForm):
 
@@ -18,6 +18,7 @@ class DynamicContentHomeSliderForm(autocomplete.FutureModelForm):
         queryset=autocomplete.QuerySetSequence(
             Article.objects.all(),
             CustomPage.objects.all(),
+            Event.objects.all()
         ),
         required=False,
         widget=dal_select2_queryset_sequence.widgets.QuerySetSequenceSelect2('dynamic-content-home-slider'),
@@ -35,6 +36,7 @@ class DynamicContentHomeBodyForm(autocomplete.FutureModelForm):
             Article.objects.all(),
             CustomPage.objects.all(),
             Brief.objects.all(),
+            Event.objects.all()
         ),
         required=False,
         widget=dal_select2_queryset_sequence.widgets.QuerySetSequenceSelect2('dynamic-content-home-body'),

diff --git a/app/organization/pages/views.py b/app/organization/pages/views.py
index eb14813d7bd7ca40ebe083d1c6e8fbf911f4bf31..feb8c47ecb8fa1408a8a532ed30fac3991552aac 100644 (file)
--- a/app/organization/pages/views.py
+++ b/app/organization/pages/views.py
@@ -6,12 +6,11 @@ from dal import autocomplete
 from dal_select2_queryset_sequence.views import Select2QuerySetSequenceView
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
-# from mezzanine_agenda.models import Event
 from organization.pages.models import CustomPage
 from organization.core.views import SlugMixin
 from organization.magazine.models import Article, Topic, Brief
 from organization.pages.models import Home
-
+from organization.agenda.models import Event
 
 class HomeView(SlugMixin, ListView):
 
@@ -38,14 +37,14 @@ class DynamicContentHomeSliderView(Select2QuerySetSequenceView):
 
         articles = Article.objects.all()
         custompage = CustomPage.objects.all()
-        # events = Event.objects.all()
+        events = Event.objects.all()
 
         if self.q:
             articles = articles.filter(title__icontains=self.q)
             custompage = custompage.filter(title__icontains=self.q)
-            # events = events.filter(title__icontains=self.q)
+            events = events.filter(title__icontains=self.q)
 
-        qs = autocomplete.QuerySetSequence(articles, custompage ) #, events
+        qs = autocomplete.QuerySetSequence(articles, custompage, events)
 
         if self.q:
             # This would apply the filter on all the querysets
@@ -64,16 +63,16 @@ class DynamicContentHomeBodyView(Select2QuerySetSequenceView):
 
         articles = Article.objects.all()
         custompage = CustomPage.objects.all()
-        # events = Event.objects.all()
+        events = Event.objects.all()
         briefs = Brief.objects.all()
 
         if self.q:
             articles = articles.filter(title__icontains=self.q)
             custompage = custompage.filter(title__icontains=self.q)
-            # events = events.filter(title__icontains=self.q)
+            events = events.filter(title__icontains=self.q)
             briefs = briefs.filter(title__icontains=self.q)
 
-        qs = autocomplete.QuerySetSequence(articles, custompage, briefs) #, events
+        qs = autocomplete.QuerySetSequence(articles, custompage, briefs, events)
 
         if self.q:
             # This would apply the filter on all the querysets

diff --git a/app/templates/home/inc/generic_card.html b/app/templates/home/inc/generic_card.html
index 3594b48fa5c8266cfed27eb4ed40e1a79e09f993..7a03c0b7e819c737555bdc8c05e6b673ee744efe 100644 (file)
--- a/app/templates/home/inc/generic_card.html
+++ b/app/templates/home/inc/generic_card.html
@@ -21,7 +21,7 @@
                 {% endif %}
             </div>
         {% elif body.content_type.model == 'event' %}
-            <!-- TODO: Add event type tags -->
+            {% trans 'Event' %}
         {% endif %}
     </div>
 
@@ -36,7 +36,18 @@
                     <strong>{{ category }}</strong>
                 {% endfor %}
             {% elif body.content_type.model == 'event' %}
-                <!-- TODO: Add event type categories -->
+                {% if body.content_object.start %}
+                    {% if body.content_object.end %}
+                        {% trans "From" %}
+                    {% endif %}
+                    {{ body.content_object.start }}
+                    {% if body.content_object.end %}
+                        {% trans "to" %} {{ body.content_object.end }}
+                    {% endif %}
+                {% endif %}
+                {% if body.content_object.location %}
+                    {{ body.content_object.location }}
+                {% endif %}
             {% endif %}
         </div>
         <div class="article-box__desc">

diff --git a/app/templates/home/inc/slider.html b/app/templates/home/inc/slider.html
index 4383b0fa67b208ae89e346a84864c8b83e089520..3460f5d82b86276a9d46dd36702b1bf0d17f3cee 100644 (file)
--- a/app/templates/home/inc/slider.html
+++ b/app/templates/home/inc/slider.html
@@ -1,5 +1,4 @@
 {% load i18n pages_tags mezzanine_tags media_tags organization_tags %}
-
 <div class="slider-home">
     <ul data-slider-home>
         {% for slider in home.dynamiccontenthomeslider_set.all %}
@@ -17,15 +16,32 @@
                                                       {{ slider.content_object.department.name }}
                                                     </div>
                                                 {% endif %}
+                                                {% if slider.content_type.model == 'article' %}
                                                 <div class="tag tag--category">
                                                     {% trans 'News' %}
                                                 </div>
+                                                {% elif slider.content_type.model == 'event' %}
+                                                <div class="tag tag--category">
+                                                    {% trans 'Event' %}
+                                                </div>
+                                                {% endif %}
 
                                                 <div class="article-box__content tal">
                                                     <h3 class="article-box__title">{{ slider.content_object.title }}</h3>
                                                     <div class="article-box__subtitle">
                                                         <strong>{{ slider.content_object.sub_title }}</strong>
                                                     </div>
+                                                    <div>
+                                                        {% if slider.content_object.start %}
+                                                            {% if slider.content_object.end %}
+                                                                {% trans "From" %}
+                                                            {% endif %}
+                                                            {{ slider.content_object.start }}
+                                                            {% if slider.content_object.end %}
+                                                                {% trans "to" %} {{ slider.content_object.end }}
+                                                            {% endif %}
+                                                        {% endif %}
+                                                    </div>
                                                     <div class="article-box__desc">
                                                         {{ slider.content_object.description|richtext_filters|safe|truncatechars_html:200 }}
                                                     </div>