From b252211a69079e5fceb47ffe62fd765e8a0676fe Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 20 Mar 2018 02:34:20 +0530 Subject: [PATCH 01/10] header btn target accepts id, navbar optional lang dropdown --- datacenterlight/cms_models.py | 4 ++++ ..._dclnavbarpluginmodel_language_dropdown.py | 20 +++++++++++++++++++ .../templates/datacenterlight/cms/navbar.html | 16 ++++++++------- .../migrations/0020_auto_20180320_0216.py | 20 +++++++++++++++++++ ungleich_page/models.py | 9 ++++++--- ...der_with_background_video_slider_item.html | 2 +- 6 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 datacenterlight/migrations/0014_dclnavbarpluginmodel_language_dropdown.py create mode 100644 ungleich_page/migrations/0020_auto_20180320_0216.py diff --git a/datacenterlight/cms_models.py b/datacenterlight/cms_models.py index df54589e..627c49ba 100644 --- a/datacenterlight/cms_models.py +++ b/datacenterlight/cms_models.py @@ -132,6 +132,10 @@ class DCLNavbarPluginModel(CMSPlugin): related_name="dcl_navbar_logo_dark", ) logo_url = models.URLField(max_length=300, null=True, blank=True) + language_dropdown = models.BooleanField( + default=True, + help_text='Select to include the language selection dropdown.' + ) def get_logo_dark(self): # used only if atleast one logo exists diff --git a/datacenterlight/migrations/0014_dclnavbarpluginmodel_language_dropdown.py b/datacenterlight/migrations/0014_dclnavbarpluginmodel_language_dropdown.py new file mode 100644 index 00000000..2c5e6306 --- /dev/null +++ b/datacenterlight/migrations/0014_dclnavbarpluginmodel_language_dropdown.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2018-03-19 20:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('datacenterlight', '0013_dclnavbarpluginmodel'), + ] + + operations = [ + migrations.AddField( + model_name='dclnavbarpluginmodel', + name='language_dropdown', + field=models.BooleanField(default=True, help_text='Select to include the language selection dropdown.'), + ), + ] diff --git a/datacenterlight/templates/datacenterlight/cms/navbar.html b/datacenterlight/templates/datacenterlight/cms/navbar.html index fdb28529..cc8ec96b 100644 --- a/datacenterlight/templates/datacenterlight/cms/navbar.html +++ b/datacenterlight/templates/datacenterlight/cms/navbar.html @@ -27,13 +27,15 @@ {% render_plugin plugin %} {% endfor %} -
  • - {% if LANGUAGE_CODE == 'en-us'%} - Deutsch   - {% else %} - English   - {% endif %} -
    • + {% if instance.language_dropdown %} +
  • + {% if LANGUAGE_CODE == 'en-us'%} + Deutsch   + {% else %} + English   + {% endif %} +
    • + {% endif %} {% if not request.user.is_authenticated %}
  • {% trans "Login" %}   diff --git a/ungleich_page/migrations/0020_auto_20180320_0216.py b/ungleich_page/migrations/0020_auto_20180320_0216.py new file mode 100644 index 00000000..1dbd46d2 --- /dev/null +++ b/ungleich_page/migrations/0020_auto_20180320_0216.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2018-03-19 20:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0019_merge'), + ] + + operations = [ + migrations.AlterField( + model_name='ungleichheaderwithbackgroundvideoslideritem', + name='btn_link', + field=models.CharField(blank=True, help_text='Url or #id to navigate on click. If this field is left empty, no button would be displayed.', max_length=100, null=True), + ), + ] diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 4ffd1a33..6e25501f 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -125,9 +125,12 @@ class UngleichHeaderWithBackgroundVideoSliderItem(CMSPlugin): blank=True, null=True, help_text='An optional description for this slide.' ) - btn_link = models.URLField( - blank=True, null=True, - help_text='If this field is left empty, no button would be displayed.' + btn_link = models.CharField( + max_length=100, blank=True, null=True, + help_text=( + 'Url or #id to navigate on click. If this field is left empty, no ' + 'button would be displayed.' + ) ) btn_text = models.CharField( blank=True, null=True, max_length=50, diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_video_slider_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_video_slider_item.html index 78bb7ad8..f1edba16 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_video_slider_item.html +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_video_slider_item.html @@ -22,6 +22,6 @@ {% endif %} {% if instance.btn_link %} {% trans "Learn More" as default_btn_text %} - {{ instance.btn_text|default:default_btn_text }} + {{ instance.btn_text|default:default_btn_text }} {% endif %} From e29865b31050d39ef6890ef63ca858572cf52e34 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 21 Mar 2018 00:27:35 +0530 Subject: [PATCH 02/10] fix banner list image size, lead text size --- .../datacenterlight/css/landing-page.css | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 6361ea21..ceb6612b 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -58,6 +58,10 @@ textarea { min-width: 180px; } +.lead { + font-size: 18px; +} + /* Top navbar */ @@ -429,17 +433,20 @@ textarea { } .split-section.left .split-description { -/* width: 90%; */ margin-right: auto; } .split-section .split-description .lead { color: #3a3a3a; - font-size: 21px; } -.split-section .space .split-description .lead { - font-size: 20px; +@media (min-width: 768px) { + .split-section .split-description .lead { + font-size: 21px; + } + .split-section .space .split-description .lead { + font-size: 20px; + } } .split-section.right .split-description { @@ -764,17 +771,11 @@ textarea { .ssdimg { margin: 0 15px; - /* vertical-align: middle; */ - /* display: inline-block; */ -} - -.ssdimg img { - max-width: 125px; } @media (max-width: 767px) { .ssdimg img { - width: 100px; + max-height: 120px; } } From 39d67c84a18b84836fa57049bbec42f2c3cf492f Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 21 Mar 2018 00:46:22 +0530 Subject: [PATCH 03/10] fix lead text size --- datacenterlight/static/datacenterlight/css/landing-page.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index ceb6612b..6985145a 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -62,6 +62,12 @@ textarea { font-size: 18px; } +@media (min-width: 768px) { + .lead { + font-size: 21px; + } +} + /* Top navbar */ From 759b96f25c29c38b56e0110a4e5913c23d525791 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 21 Mar 2018 00:55:20 +0530 Subject: [PATCH 04/10] banner list item text set max-width --- datacenterlight/static/datacenterlight/css/landing-page.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 6985145a..9c49de19 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -1197,7 +1197,7 @@ footer { max-width: 430px; } .flex-row-rev .desc-text { - max-width: 710px; + max-width: 510px; text-align: left; } .flex-row-rev .percent-text { From 076aaac604dd3e5989ee0f49681cc956aa123fb2 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 21 Mar 2018 00:57:03 +0530 Subject: [PATCH 05/10] banner list item text set max-width --- datacenterlight/static/datacenterlight/css/landing-page.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9c49de19..3cc28c46 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -1197,7 +1197,7 @@ footer { max-width: 430px; } .flex-row-rev .desc-text { - max-width: 510px; + max-width: 600px; text-align: left; } .flex-row-rev .percent-text { From db99a4005958a9f545f7a1d10c0e0464d6c2d1a9 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 21 Mar 2018 22:26:43 +0530 Subject: [PATCH 06/10] break long words to multiple lines --- datacenterlight/static/datacenterlight/css/landing-page.css | 1 + 1 file changed, 1 insertion(+) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 6361ea21..5495fea2 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -536,6 +536,7 @@ textarea { padding-top: 20px; display: inline-block; color: #999 !important; + word-break: break-all; } .price-calc-section .card { From 049cf5afa29c4d2bcc3cac1581ebd0abcfa473c2 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 22 Mar 2018 00:52:59 +0530 Subject: [PATCH 07/10] fix dcl navbar link navigation --- datacenterlight/static/datacenterlight/js/main.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index 10412824..5e919045 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -107,10 +107,14 @@ var href = $(this).attr('href'); $('.navbar-collapse').removeClass('in'); $('.navbar-collapse').addClass('collapsing'); - if ($(href).length) { - $('html, body').animate({ - scrollTop: $(href).offset().top - 50 - }, 1000); + if (href[0] === "#") { + if ($(href).length) { + $('html, body').animate({ + scrollTop: $(href).offset().top - 50 + }, 1000); + } + } else if (href) { + window.location = href; } }); } From 389d16931b3f0c91f35f108d76daecbb259bc827 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 22 Mar 2018 01:04:41 +0530 Subject: [PATCH 08/10] Update Changelog --- Changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog b/Changelog index 537af052..088f7ab1 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +1.5.5: 2018-03-22 + * #4278: [dcl cms] edit options for cms navbar and header plugins + * bgfix: [dcl cms] fix link plugin issues and section image alignment 1.5.4: 2018-03-17 * bgfix: [dcl cms] update DCLNavbarPlugin to allow change of brand logo and url 1.5.3: 2018-03-16 From f9bedf20e0cb863441edf01ca33a79147d7672ed Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 22 Mar 2018 01:18:21 +0530 Subject: [PATCH 09/10] Update navbar.html change default url to `/` from `datacenterlight:index` --- .../templates/datacenterlight/cms/navbar.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/cms/navbar.html b/datacenterlight/templates/datacenterlight/cms/navbar.html index cc8ec96b..bfa3e086 100644 --- a/datacenterlight/templates/datacenterlight/cms/navbar.html +++ b/datacenterlight/templates/datacenterlight/cms/navbar.html @@ -10,13 +10,12 @@ - {% url 'datacenterlight:index' as default_logo_url %} {% if instance.logo_dark or instance.logo_light %} - - + + {% else %} - - + + {% endif %}