[Vertigo] add images to home

diff --git a/app/organization/pages/admin.py b/app/organization/pages/admin.py
index 285935cb10616dcfe49115687db15078a5e88fc8..351a08ff436b0548d3c246a87f53708e96b9acd3 100644 (file)
--- a/app/organization/pages/admin.py
+++ b/app/organization/pages/admin.py
@@ -132,9 +132,15 @@ class DynamicContentHomeMediaInline(TabularDynamicInlineAdmin):
     form = DynamicContentHomeMediaForm
 
 
+class HomeImageInline(TabularDynamicInlineAdmin):
+
+    model = HomeImage
+
+
 class HomeAdminDisplayable(BaseTranslationModelAdmin):
 
-    inlines = [ DynamicContentHomeSliderInline,
+    inlines = [ HomeImageInline,
+                DynamicContentHomeSliderInline,
                 DynamicContentHomeMediaInline,
                 DynamicContentHomeBodyInline,
                 ]

diff --git a/app/organization/pages/migrations/0020_homeimage.py b/app/organization/pages/migrations/0020_homeimage.py
new file mode 100644 (file)
index 0000000..910adcf
--- /dev/null
+++ b/app/organization/pages/migrations/0020_homeimage.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-03-14 11:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import mezzanine.core.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-pages', '0019_auto_20170214_1643'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HomeImage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
+                ('title', models.CharField(max_length=1024, verbose_name='title')),
+                ('description', models.TextField(blank=True, verbose_name='description')),
+                ('file', mezzanine.core.fields.FileField(max_length=1024, verbose_name='Image')),
+                ('credits', models.CharField(blank=True, max_length=256, null=True, verbose_name='credits')),
+                ('type', models.CharField(choices=[('logo', 'logo'), ('logo_white', 'logo white'), ('logo_black', 'logo black'), ('logo_header', 'logo header'), ('logo_footer', 'logo footer'), ('slider', 'slider'), ('card', 'card'), ('page_slider', 'page - slider'), ('page_featured', 'page - featured')], max_length=64, verbose_name='type')),
+                ('home', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='images', to='organization-pages.Home', verbose_name='home')),
+            ],
+            options={
+                'verbose_name': 'image',
+                'verbose_name_plural': 'images',
+                'ordering': ('_order',),
+            },
+        ),
+    ]

diff --git a/app/organization/pages/models.py b/app/organization/pages/models.py
index 30b0f9d997aee4ad8a225dca39475ec77fb9e05b..a711de420558a4ece739acc14b07a457206d7752 100644 (file)
--- a/app/organization/pages/models.py
+++ b/app/organization/pages/models.py
@@ -129,6 +129,16 @@ class DynamicContentHomeMedia(DynamicContent, Orderable):
         verbose_name = 'Media'
 
 
+class HomeImage(Image):
+
+    home = models.ForeignKey("home", verbose_name=_('home'), related_name='images', blank=True, null=True, on_delete=models.SET_NULL)
+
+    class Meta:
+        verbose_name = _("image")
+        verbose_name_plural = _("images")
+        order_with_respect_to = "home"
+
+
 class Home(Displayable):
 
     class Meta:

diff --git a/app/organization/pages/translation.py b/app/organization/pages/translation.py
index 7f26381d80b8798d245085283f115daa6f9ff919..a5b7d86c6a8a92dbd50ac79825d88e688a960055 100644 (file)
--- a/app/organization/pages/translation.py
+++ b/app/organization/pages/translation.py
@@ -89,9 +89,15 @@ class DynamicContentPageTranslationOptions(TranslationOptions):
 class LinkImageTranslationOptions(TranslationOptions):
 
     pass
-    
+
 
 @register(PageRelatedTitle)
 class PageRelatedTitleTranslationOptions(TranslationOptions):
 
     fields = ('title',)
+
+
+@register(HomeImage)
+class HomeImageTranslationOptions(TranslationOptions):
+
+    fields = ()

diff --git a/app/themes/vertigo_starts_eu/templates/index.html b/app/themes/vertigo_starts_eu/templates/index.html
index 908751013cdf76b9973b8eeadbf4f910a5f664a7..2d5d5acfe38defb1b97d184898ed5f68c53774e4 100644 (file)
--- a/app/themes/vertigo_starts_eu/templates/index.html
+++ b/app/themes/vertigo_starts_eu/templates/index.html
@@ -13,7 +13,7 @@
 
 {% block main %}
 
-    {% include "home/inc/hero.html" %}
+    {% include "vertigo_starts_eu/home/inc/hero.html" %}
 
     {% include "home/inc/slider.html" %}
 

diff --git a/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/home/inc/hero.html b/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/home/inc/hero.html
new file mode 100644 (file)
index 0000000..59a1113
--- /dev/null
+++ b/app/themes/vertigo_starts_eu/templates/vertigo_starts_eu/home/inc/hero.html
@@ -0,0 +1,52 @@
+{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags organization_tags %}
+
+{% with home.images.all|get_type:'page_featured' as images %}
+    {% if images %}
+        <div class="hero" style="background-image: url({{ MEDIA_URL}}{{ images.first.file }})">
+    {% else %}
+        <div class="hero">
+    {% endif %}
+
+    <div class="Background">
+        <canvas class="Background-canvas"></canvas>
+    </div>
+
+    <div class="container">
+
+        <div class="row">
+
+            <div class="col-xs-7 col-xs-push-1 hero__left">
+                <img src="{% static "img/vertigo/hero-left.png" %}" />
+                <img class="hero__date" src="{% static "img/vertigo/hero-left-date.png" %}" />
+            </div>
+
+            <div class="col-xs-7 col-xs-push-1 hero__right">
+                <img src="{% static "img/vertigo/hero-right.png" %}" />
+
+                <p>
+
+                </p>
+            </div>
+
+        </div>
+
+        <div class="row">
+
+            <div class="col-xs-16">
+
+                <div class="hero__logo">
+                    <img src="{% static "img/vertigo/hero-logo.png" %}" />
+                </div>
+
+            </div>
+
+        </div>
+
+        <div class="hero__title">
+            <img src="{% static "img/vertigo/hero-title.png" %}" />
+        </div>
+
+    </div>
+
+</div>
+{% endwith %}