diff --git a/Changelog b/Changelog index b85dd4ff..23a6e52a 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,16 @@ -Next: +2.4.7: 2019-01-30 + * #6213: [cms] Make ungleich product items equal heights and add option to animate or not animate the contents (MR!682 by Aatish) +2.4.6: 2019-01-09 + * #6261: Add ungleich black logo to blog template for mobile view (MR!685) +2.4.5: 2019-01-07 + * bugfix: [blog] Fix DE language option not being shown in the blog (MR!684) and revert back the RSS URL to the old one +2.4.4: 2019-01-02 + * bugfix: [blog] Create blog config for ungleich.ch and change RSS URL accordingly +2.4.3: 2018-12-24 + * #6260: Add viewport and other missing meta tags (MR!683) +2.4.2: 2018-12-23 + * Update djangcocms-blog version (0.7.0 -> 0.9.0) + * #6038: Change datacenterlight.ch message form to send email to support@ungleich.ch (MR!679) * bugfix: Use correct version of django-multisite (MR #676) 2.4.1: 2018-10-18 * bugfix: Update pycryptodome module from 3.4 to 3.6.6 (PR #674) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 445ff7cf..5dc3a3d3 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -64,7 +64,7 @@ class ContactUsView(FormView): sender=form.cleaned_data.get('email') ), 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, - 'to': [from_emails.get(from_page, 'info@ungleich.ch')], + 'to': [from_emails.get(from_page, 'support@ungleich.ch')], 'body': "\n".join( ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]), 'reply_to': [form.cleaned_data.get('email')], diff --git a/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css b/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css index 66e4c54d..c0c5f38a 100755 --- a/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css +++ b/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css @@ -402,4 +402,24 @@ body { .blog-content img { width: 100%; +} + +#logoBlack { + display: none; +} +#logoWhite { + display: block; +} +@media (max-width: 767px) { + #logoBlack { + display: block; + } + + #logoWhite { + display: none; + } +} + +.custom-black-logo { + padding: 8px 15px; } \ No newline at end of file diff --git a/digitalglarus/static/blog.ungleich.ch/img/logo_black.svg b/digitalglarus/static/blog.ungleich.ch/img/logo_black.svg new file mode 100644 index 00000000..2035ab8b --- /dev/null +++ b/digitalglarus/static/blog.ungleich.ch/img/logo_black.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 00a74354..49570143 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -56,7 +56,9 @@ dotenv.read_dotenv("{0}/.env".format(PROJECT_DIR)) from multisite import SiteID -SITE_ID = SiteID(default=1) +UNGLEICH_BLOG_SITE_ID = int_env("UNGLEICH_BLOG_SITE_ID") +SITE_ID = SiteID(default=(UNGLEICH_BLOG_SITE_ID if + UNGLEICH_BLOG_SITE_ID > 0 else 1)) APP_ROOT_ENDPOINT = "/" APPEND_SLASH = True diff --git a/requirements.txt b/requirements.txt index a14617a9..fe70299b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,7 +50,7 @@ django-templatetag-sugar==1.0 django-treebeard==4.0.1 djangocms-admin-style==1.1.1 djangocms-apphook-setup==0.1.2 -djangocms-blog==0.7.0 +djangocms-blog==0.9.0 djangocms-file==1.0 djangocms-flash==0.3.0 djangocms-googlemap==0.4.0 diff --git a/ungleich/templates/cms/ungleichch/_footer.html b/ungleich/templates/cms/ungleichch/_footer.html index 21c96b54..41bc95dc 100644 --- a/ungleich/templates/cms/ungleichch/_footer.html +++ b/ungleich/templates/cms/ungleichch/_footer.html @@ -31,7 +31,7 @@
  • - + diff --git a/ungleich/templates/cms/ungleichch/_menu.html b/ungleich/templates/cms/ungleichch/_menu.html index 6ccb043b..ea217351 100644 --- a/ungleich/templates/cms/ungleichch/_menu.html +++ b/ungleich/templates/cms/ungleichch/_menu.html @@ -10,9 +10,8 @@ - - - + + diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html b/ungleich/templates/cms/ungleichch/base_ungleich.html index 74a0b985..25fdbdc6 100644 --- a/ungleich/templates/cms/ungleichch/base_ungleich.html +++ b/ungleich/templates/cms/ungleichch/base_ungleich.html @@ -2,6 +2,11 @@ + + + + + {% block title %} {% page_attribute "page_title" %} diff --git a/ungleich_page/migrations/0021_ungleichproduct_animate.py b/ungleich_page/migrations/0021_ungleichproduct_animate.py new file mode 100644 index 00000000..28e638c3 --- /dev/null +++ b/ungleich_page/migrations/0021_ungleichproduct_animate.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2018-12-09 15:06 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0020_auto_20180320_0216'), + ] + + operations = [ + migrations.AddField( + model_name='ungleichproduct', + name='animate', + field=models.BooleanField(default=True), + ), + ] diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 6e25501f..53a433b7 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -144,6 +144,7 @@ class UngleichProductItem(ServiceItem): class UngleichProduct(Service): section_class = models.CharField(max_length=100, default="", blank=True) + animate = models.BooleanField(default=True) class UngleichCustomer(Service): diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_products.html b/ungleich_page/templates/ungleich_page/ungleich/section_products.html index aba92735..9cdc94c8 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/section_products.html +++ b/ungleich_page/templates/ungleich_page/ungleich/section_products.html @@ -8,7 +8,7 @@ </div> <div class="row"> {% for plugin in product_instance.child_plugin_instances %} - <div class="col-md-4 col-sm-6 portfolio-item wow fadeInUp" data-wow-delay="{{ forloop.counter|multiply:0.25 }}s" style="visibility: visible; animation-delay: {{ forloop.counter|multiply:0.25 }}s; animation-name: fadeInUp;"> + <div class="col-md-4 col-sm-6 portfolio-item sameheight-{{product_instance.pk}} {% if product_instance.animate %}wow fadeInUp{%endif%}" data-wow-delay="{{ forloop.counter|multiply:0.25 }}s" style="visibility: visible; animation-delay: {{ forloop.counter|multiply:0.25 }}s; animation-name: fadeInUp;"> {% render_plugin plugin %} </div> {% endfor %} @@ -16,3 +16,16 @@ </div> </div> </section> + + +<script> +$( document ).ready(function() { + var equalizer = ".sameheight-{{product_instance.pk}}" + var heights = $(equalizer).map(function() { + return $(this).height(); + }).get(), + + maxHeight = Math.max.apply(null, heights); + $(equalizer).height(maxHeight); +}); +</script> \ No newline at end of file