From 1a3a3f06b5c8fc0a264818c2ecef68e3cafee0e4 Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Fri, 23 Mar 2018 16:53:10 +0100 Subject: [PATCH] portal cms apphook and various fixes --- private/scss/modules/_control-panel.scss | 13 +++++++ private/scss/modules/_footer.scss | 2 +- private/scss/modules/plugins/_form.scss | 2 +- settings.py | 14 ++++++-- src/portal/cms_apps.py | 11 ++++++ src/portal/templates/portal/overview.html | 11 +++--- src/project/cms_plugins.py | 10 +++++- src/project/migrations/0006_introimage.py | 35 +++++++++++++++++++ src/project/models.py | 9 +++++ src/project/templates/main.html | 16 +++++---- src/project/templates/project/content.html | 4 ++- .../project/includes/header_button_menu.html | 11 ++++-- .../project/includes/navigation.html | 18 ++++++---- .../project/newsletter/subscription.html | 4 +++ .../project/plugins/content/intro_image.html | 5 +++ .../plugins/content/section_title.html | 2 +- src/project/urls.py | 5 ++- src/project/views.py | 17 +++++++++ 18 files changed, 161 insertions(+), 28 deletions(-) create mode 100644 src/portal/cms_apps.py create mode 100644 src/project/migrations/0006_introimage.py create mode 100644 src/project/templates/project/plugins/content/intro_image.html diff --git a/private/scss/modules/_control-panel.scss b/private/scss/modules/_control-panel.scss index 4c080df..7505091 100644 --- a/private/scss/modules/_control-panel.scss +++ b/private/scss/modules/_control-panel.scss @@ -3,6 +3,16 @@ padding: em(100px) 0 0; will-change: transform, height; text-align: left; + .section__title { + padding-left: 75%; + } +} + +.control_panel, .downloads__frame { + .section__title { + position: relative; + z-index: -1; + } } .information__form { @@ -189,6 +199,9 @@ padding: em(150px) 0; position: relative; will-change: transform; + .section__title { + padding-left: 25%; + } .downloads { li { width: 33.3333%; diff --git a/private/scss/modules/_footer.scss b/private/scss/modules/_footer.scss index 5811e77..beac7dc 100644 --- a/private/scss/modules/_footer.scss +++ b/private/scss/modules/_footer.scss @@ -60,7 +60,7 @@ width: em(12px); height: em(12px); top: em(-1px); - margin-right: em(10px); + margin-left: em(10px); } } @media screen and (max-width: $medium_breakpoint) { diff --git a/private/scss/modules/plugins/_form.scss b/private/scss/modules/plugins/_form.scss index 0eba100..11edfc6 100644 --- a/private/scss/modules/plugins/_form.scss +++ b/private/scss/modules/plugins/_form.scss @@ -172,7 +172,7 @@ } .form__field--icon { - input { + input[type="text"], input[type="email"], input[type="number"], input[type="password"] { height: em(70px); padding: 0 em(90px) 0 em(15px); } diff --git a/settings.py b/settings.py index 054f23b..4b1aac7 100644 --- a/settings.py +++ b/settings.py @@ -33,8 +33,7 @@ INSTALLED_APPS.extend([ 'image_cropping', ]) - -LOGIN_REDIRECT_URL = 'portal:overview' +LOGIN_REDIRECT_URL = 'login_redirect' MIDDLEWARE_CLASSES.extend([ # add your own middlewares here @@ -92,7 +91,18 @@ CMS_PLACEHOLDER_CONF = { 'plugins': ['TimetablePlugin'], }, 'social_media': { + 'name': 'Social Media', 'plugins': ['SocialMediaListPlugin'], + 'limits': { + 'global': 1, + }, + }, + 'portal_intro': { + 'name': 'Portal Intro', + 'plugins': ['IntroImagePlugin'], + 'limits': { + 'global': 1, + }, }, } diff --git a/src/portal/cms_apps.py b/src/portal/cms_apps.py new file mode 100644 index 0000000..5ef4747 --- /dev/null +++ b/src/portal/cms_apps.py @@ -0,0 +1,11 @@ +from cms.app_base import CMSApp +from cms.apphook_pool import apphook_pool + + +@apphook_pool.register +class PortalApphook(CMSApp): + name = 'Portal' + app_name = 'portal' + + def get_urls(self, page=None, language=None, **kwargs): + return ['portal.urls'] diff --git a/src/portal/templates/portal/overview.html b/src/portal/templates/portal/overview.html index b701947..09870c8 100644 --- a/src/portal/templates/portal/overview.html +++ b/src/portal/templates/portal/overview.html @@ -1,5 +1,5 @@ {% extends 'main.html' %} -{% load i18n static %} +{% load i18n static cms_tags %} {% block title %}{% trans 'Mitgliederbereich' %}{% endblock %} @@ -14,8 +14,7 @@ {% trans 'Logout' %} -
+ {% static_placeholder 'portal_intro' %}
@@ -88,10 +87,12 @@ {% endfor %}
+ {% trans 'Einstellungen' as settings_section_title %} + {% include 'project/plugins/content/section_title.html' with section_title=settings_section_title %}
-
+

{% trans 'Downloads' %}

@@ -110,6 +111,8 @@ {% include 'project/plugins/content/download_section.html' with instance=section %}
{% endfor %} + {% trans 'Downloads' as downloads_section_title %} + {% include 'project/plugins/content/section_title.html' with section_title=downloads_section_title %}
diff --git a/src/project/cms_plugins.py b/src/project/cms_plugins.py index d888278..53473aa 100644 --- a/src/project/cms_plugins.py +++ b/src/project/cms_plugins.py @@ -12,7 +12,7 @@ from mailchimp3 import MailChimp from project.forms import NewsletterSubscriptionForm from project.models import Section, Quote, SliderItem, SectionText, Video, DownloadSection, DownloadSectionFolder, \ TextSliderItem, HighlightListItem, ReferenceListItem, SocialMediaList, SocialMediaListItem, Timetable, \ - TimetableItem, Partner, HighlightList, Image, TitleListItem, TitleList + TimetableItem, Partner, HighlightList, Image, TitleListItem, TitleList, IntroImage @plugin_pool.register_plugin @@ -37,6 +37,14 @@ class SectionTitlePlugin(CMSPluginBase): render_template = 'project/plugins/content/section_title.html' +@plugin_pool.register_plugin +class IntroImagePlugin(CMSPluginBase): + model = IntroImage + module = 'Intro' + name = 'Intro Image' + render_template = 'project/plugins/content/intro_image.html' + + plugin_pool.unregister_plugin(_TextPlugin) diff --git a/src/project/migrations/0006_introimage.py b/src/project/migrations/0006_introimage.py new file mode 100644 index 0000000..68e3cf6 --- /dev/null +++ b/src/project/migrations/0006_introimage.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.11 on 2018-03-23 10:12 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import image_cropping.fields +import project.utils + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.FILER_IMAGE_MODEL), + ('cms', '0018_pagenode'), + ('project', '0005_auto_20180322_1612'), + ] + + operations = [ + migrations.CreateModel( + name='IntroImage', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='project_introimage', serialize=False, to='cms.CMSPlugin')), + ('cropping', image_cropping.fields.ImageRatioField('image', '1000x1000', adapt_rotation=False, allow_fullsize=False, free_crop=True, help_text=None, hide_image_field=False, size_warning=False, verbose_name='cropping')), + ('image', project.utils.CroppableFilerImageField(on_delete=django.db.models.deletion.CASCADE, to=settings.FILER_IMAGE_MODEL, verbose_name='Bild')), + ], + options={ + 'abstract': False, + 'verbose_name_plural': 'intro Bilder', + 'verbose_name': 'Intro Bild', + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/src/project/models.py b/src/project/models.py index 15f8319..2b2fa3d 100644 --- a/src/project/models.py +++ b/src/project/models.py @@ -42,6 +42,15 @@ class SectionText(CMSPlugin): verbose_name_plural = 'Section Texts' +class IntroImage(CMSPlugin): + image = CroppableFilerImageField(verbose_name='Bild') + cropping = ImageRatioField('image', '1000x1000', free_crop=True) + + class Meta(CMSPlugin.Meta): + verbose_name = 'Intro Bild' + verbose_name_plural = 'intro Bilder' + + class Video(CMSPlugin): vimeo_id = models.IntegerField(verbose_name='Vimeo ID', help_text='e.g. https://vimeo.com/131766159') thumbnail = CroppableFilerImageField(verbose_name='Vorschaubild') diff --git a/src/project/templates/main.html b/src/project/templates/main.html index 5d9cad4..e68e274 100644 --- a/src/project/templates/main.html +++ b/src/project/templates/main.html @@ -121,12 +121,16 @@
- + {% page_url 'cta' as cta_url %} + {% if cta_url %} + + {% endif %}
{% show_menu_below_id 'footer' 0 0 0 0 'project/includes/header_button_menu.html' %} {% static_placeholder 'social_media' %} diff --git a/src/project/templates/project/content.html b/src/project/templates/project/content.html index b6d4588..834b34b 100644 --- a/src/project/templates/project/content.html +++ b/src/project/templates/project/content.html @@ -11,7 +11,9 @@
- {% block navigation_title %}{{ request.current_page }}{% endblock %} + {% block navigation_title %} + {% if request.current_page %}{{ request.current_page }}{% endif %} + {% endblock %}
diff --git a/src/project/templates/project/includes/header_button_menu.html b/src/project/templates/project/includes/header_button_menu.html index 08f1fd5..b6cd271 100644 --- a/src/project/templates/project/includes/header_button_menu.html +++ b/src/project/templates/project/includes/header_button_menu.html @@ -1,8 +1,15 @@ -{% load menu_tags %} +{% load i18n cms_tags menu_tags %} {% for child in children %} {{ child.get_menu_title }} -{% endfor %} \ No newline at end of file +{% endfor %} +{% page_url 'portal' as portal_url %} +{% if portal_url %} + + {% trans 'Login' %} + +{% endif %} \ No newline at end of file diff --git a/src/project/templates/project/includes/navigation.html b/src/project/templates/project/includes/navigation.html index 811702e..f1e8a7e 100644 --- a/src/project/templates/project/includes/navigation.html +++ b/src/project/templates/project/includes/navigation.html @@ -5,6 +5,18 @@
{% include 'project/includes/meta_navigation.html' %} + + {% page_url 'cta' as cta_url %} + {% if cta_url %} + + {% endif %} +
{% show_menu_below_id 'footer' 0 0 0 0 'project/includes/header_button_menu.html' %}
@@ -18,11 +30,5 @@ {% endfor %}
-
\ No newline at end of file diff --git a/src/project/templates/project/newsletter/subscription.html b/src/project/templates/project/newsletter/subscription.html index 1d23543..99f5a61 100644 --- a/src/project/templates/project/newsletter/subscription.html +++ b/src/project/templates/project/newsletter/subscription.html @@ -1,5 +1,9 @@ {% extends 'project/content.html' %} +{% block extra_meta %} + +{% endblock %} + {% block content_main %} {% include 'project/newsletter/subscription_form.html' %} {% endblock %} \ No newline at end of file diff --git a/src/project/templates/project/plugins/content/intro_image.html b/src/project/templates/project/plugins/content/intro_image.html new file mode 100644 index 0000000..457f741 --- /dev/null +++ b/src/project/templates/project/plugins/content/intro_image.html @@ -0,0 +1,5 @@ +{% load thumbnail %} + +{% thumbnail instance.image 1600x800 box=instance.cropping crop detail as thumb %} +
\ No newline at end of file diff --git a/src/project/templates/project/plugins/content/section_title.html b/src/project/templates/project/plugins/content/section_title.html index ac73b12..c40b26f 100644 --- a/src/project/templates/project/plugins/content/section_title.html +++ b/src/project/templates/project/plugins/content/section_title.html @@ -1,6 +1,6 @@
+ data-ease-multiplier="5">{{ section_title }}
\ No newline at end of file diff --git a/src/project/urls.py b/src/project/urls.py index 1d0e63f..a5780ac 100644 --- a/src/project/urls.py +++ b/src/project/urls.py @@ -3,7 +3,7 @@ from django.conf.urls import url, include from django.utils.translation import ugettext_lazy as _ from django.views.generic.base import TemplateView -from project.views import SearchView, NewsletterSubscriptionView +from project.views import SearchView, NewsletterSubscriptionView, LoginRedirectView urlpatterns = [ url(_(r'^suche/'), SearchView.as_view(), kwargs={'search': True}, name='search'), @@ -11,6 +11,5 @@ urlpatterns = [ url(r'^newsletter/subscription/success/$', TemplateView.as_view(template_name='project/newsletter/subscription.html'), kwargs={'success': True}, name='newsletter_subscription_success'), - - url(_(r'^portal/'), include('portal.urls', namespace='portal')), + url(r'^login/redirect/$', LoginRedirectView.as_view(), name='login_redirect'), ] diff --git a/src/project/views.py b/src/project/views.py index 0d5c02a..860e1f7 100644 --- a/src/project/views.py +++ b/src/project/views.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- from aldryn_search.views import AldrynSearchView +from cms.models import Page from django.core.urlresolvers import reverse_lazy +from django.views.generic import RedirectView from django.views.generic.edit import FormView from project.forms import NewsletterSubscriptionForm @@ -22,3 +24,18 @@ class NewsletterSubscriptionView(FormView): template_name = 'project/newsletter/subscription.html' form_class = NewsletterSubscriptionForm success_url = reverse_lazy('newsletter_subscription_success') + + +class LoginRedirectView(RedirectView): + + def get_redirect_url(self, *args, **kwargs): + fallback_url = '/' + try: + portal_page = Page.objects.public().get(reverse_id='portal') + portal_url = portal_page.get_public_url() + if portal_url: + return portal_url + else: + return fallback_url + except Page.DoesNotExist: + return fallback_url