From 612cd5c7793c06197d00dbf65439ab9c73df3db6 Mon Sep 17 00:00:00 2001
From: Oly <oliver.marks@influentialsoftware.com>
Date: Tue, 14 Feb 2017 14:00:37 +0000
Subject: [PATCH] Banner on homepage now enabled

---
 .../base/management/commands/generate_test_data.py   |  2 +-
 mhackspace/base/models.py                            |  6 +++++-
 mhackspace/base/templatetags/banner_images.py        |  2 +-
 mhackspace/templates/pages/home.html                 | 10 +++++++++-
 mhackspace/templates/partials/banner_list.html       | 12 +++++++-----
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/mhackspace/base/management/commands/generate_test_data.py b/mhackspace/base/management/commands/generate_test_data.py
index 7daebe2..1a5c5e6 100644
--- a/mhackspace/base/management/commands/generate_test_data.py
+++ b/mhackspace/base/management/commands/generate_test_data.py
@@ -6,7 +6,7 @@ from mhackspace.users.models import User
 
 
 class Command(BaseCommand):
-    help = 'Imports the RSS feeds from active blogs'
+    help = 'Build test data for development environment'
 
     def handle(self, *args, **options):
         users = AutoFixture(User)
diff --git a/mhackspace/base/models.py b/mhackspace/base/models.py
index 822cade..bb36d3b 100644
--- a/mhackspace/base/models.py
+++ b/mhackspace/base/models.py
@@ -5,6 +5,8 @@ from django.db import models
 from django.utils import timezone
 from stdimage.models import StdImageField
 from stdimage.utils import UploadToAutoSlugClassNameDir
+from stdimage.validators import MinSizeValidator
+
 
 
 class BannerImages(models.Model):
@@ -20,7 +22,9 @@ class BannerImages(models.Model):
             'home': {
                 "width": 530,
                 "height": 220,
-                "crop": True}})
+                "crop": True}},
+        validators=[
+            MinSizeValidator(800, 600))
 
     caption = models.TextField()
     date = models.DateTimeField(default=timezone.now)
diff --git a/mhackspace/base/templatetags/banner_images.py b/mhackspace/base/templatetags/banner_images.py
index 77b4a31..2111129 100644
--- a/mhackspace/base/templatetags/banner_images.py
+++ b/mhackspace/base/templatetags/banner_images.py
@@ -6,5 +6,5 @@ register = template.Library()
 
 @register.inclusion_tag('partials/banner_list.html')
 def show_banner_images():
-    return {'banner_list': BannerImages.objects.filter(displayed=True)}
+    return {'bannerlist': BannerImages.objects.all(), 'test': 'abc'}
 
diff --git a/mhackspace/templates/pages/home.html b/mhackspace/templates/pages/home.html
index d00288d..d1d485e 100644
--- a/mhackspace/templates/pages/home.html
+++ b/mhackspace/templates/pages/home.html
@@ -4,7 +4,6 @@
 {% load static from staticfiles %}
 
 {% block content %}
-  <img src="{% static 'images/logo.svg' %}" class="img-fluid" alt="Responsive image">
 
   {% show_banner_images %}
 
@@ -13,3 +12,12 @@
 
   {% show_feeds %}
 {% endblock content %}
+
+{% block javascript %}
+{{ block.super }}
+<script type="text/javascript">
+ $(document).ready(function(){
+     $('.carousel').carousel();
+ });
+</script>
+{% endblock %}
diff --git a/mhackspace/templates/partials/banner_list.html b/mhackspace/templates/partials/banner_list.html
index f003930..f7ebc89 100644
--- a/mhackspace/templates/partials/banner_list.html
+++ b/mhackspace/templates/partials/banner_list.html
@@ -1,14 +1,16 @@
 {% load static %}
+<div id="carouselExampleSlidesOnly" class="carousel slide" data-ride="carousel">
+<div class="carousel-inner" role="listbox">
+  {% for banner in bannerlist %}
 
-<div class="card-columns" id="banners">
-  {% for banner in banners %}
-    <div class="carousel-item">
-      <img src="{{ banner.scaled_image }}" alt="">
+    <div class="carousel-item {% if forloop.first %}active{% endif %}">
+      <img class="img-fluid" src="{{ banner.scaled_image.url }}" alt="">
       <div class="carousel-caption d-none d-md-block">
         <h3>{{ banner.title }}</h3>
-        <p>{{ banner.description }}</p>
+        <p>{{ banner.description |truncatewords:30}}</p>
       </div>
     </div>
   {% endfor %}
 </div>
+</div>