From: Emilie Date: Tue, 14 Mar 2017 11:52:19 +0000 (+0100) Subject: [Vertigo] add images to home X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2a21eb7848cee796c5c061bdda8444aea263fbf5;p=mezzo.git [Vertigo] add images to home --- diff --git a/app/organization/pages/admin.py b/app/organization/pages/admin.py index 285935cb..351a08ff 100644 --- 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 index 00000000..910adcfb --- /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 30b0f9d9..a711de42 100644 --- 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 7f26381d..a5b7d86c 100644 --- 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 90875101..2d5d5acf 100644 --- 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 index 00000000..59a1113b --- /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 %} +
+ {% else %} +
+ {% endif %} + +
+ +
+ +
+ +
+ +
+ + +
+ +
+ + +

+ +

+
+ +
+ +
+ +
+ + + +
+ +
+ +
+ +
+ +
+ +
+{% endwith %}