From b252211a69079e5fceb47ffe62fd765e8a0676fe Mon Sep 17 00:00:00 2001 From: Arvind Tiwari <tiwariav@gmail.com> Date: Tue, 20 Mar 2018 02:34:20 +0530 Subject: [PATCH 01/14] 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 %} </li> {% endfor %} - <li> - {% if LANGUAGE_CODE == 'en-us'%} - <a class="on-hover-border" href="{% change_lang 'de' %}">Deutsch <i class="fa fa-globe" aria-hidden="true"></i></a> - {% else %} - <a class="on-hover-border" href="{% change_lang 'en-us' %}">English <i class="fa fa-globe" aria-hidden="true"></i></a> - {% endif %} - </li> + {% if instance.language_dropdown %} + <li> + {% if LANGUAGE_CODE == 'en-us'%} + <a class="on-hover-border" href="{% change_lang 'de' %}">Deutsch <i class="fa fa-globe" aria-hidden="true"></i></a> + {% else %} + <a class="on-hover-border" href="{% change_lang 'en-us' %}">English <i class="fa fa-globe" aria-hidden="true"></i></a> + {% endif %} + </li> + {% endif %} {% if not request.user.is_authenticated %} <li> <a href="{% url 'hosting:login' %}">{% trans "Login" %} <span class="fa fa-sign-in"></span></a> 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 %} - <a class="btn btn-trans" href="{{ instance.btn_link }}">{{ instance.btn_text|default:default_btn_text }}</a> + <a class="btn btn-trans page-scroll url" href="{{ instance.btn_link }}">{{ instance.btn_text|default:default_btn_text }}</a> {% endif %} </div> From e29865b31050d39ef6890ef63ca858572cf52e34 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari <tiwariav@gmail.com> Date: Wed, 21 Mar 2018 00:27:35 +0530 Subject: [PATCH 02/14] 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 <tiwariav@gmail.com> Date: Wed, 21 Mar 2018 00:46:22 +0530 Subject: [PATCH 03/14] 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 <tiwariav@gmail.com> Date: Wed, 21 Mar 2018 00:55:20 +0530 Subject: [PATCH 04/14] 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 <tiwariav@gmail.com> Date: Wed, 21 Mar 2018 00:57:03 +0530 Subject: [PATCH 05/14] 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 <tiwariav@gmail.com> Date: Wed, 21 Mar 2018 22:26:43 +0530 Subject: [PATCH 06/14] 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 <tiwariav@gmail.com> Date: Thu, 22 Mar 2018 00:52:59 +0530 Subject: [PATCH 07/14] 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 <tiwariav@gmail.com> Date: Thu, 22 Mar 2018 01:04:41 +0530 Subject: [PATCH 08/14] 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 <tiwariav@gmail.com> Date: Thu, 22 Mar 2018 01:18:21 +0530 Subject: [PATCH 09/14] 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 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - {% url 'datacenterlight:index' as default_logo_url %} {% if instance.logo_dark or instance.logo_light %} - <a href="{{ instance.logo_url|default:default_logo_url }}" id="logoBlack" class="navbar-brand topnav"><img src="{{ instance.get_logo_dark }}"></a> - <a href="{{ instance.logo_url|default:default_logo_url }}" id="logoWhite" class="navbar-brand topnav"><img src="{{ instance.get_logo_light }}"></a> + <a href="{{ instance.logo_url|default:'/' }}" id="logoBlack" class="navbar-brand topnav"><img src="{{ instance.get_logo_dark }}"></a> + <a href="{{ instance.logo_url|default:'/' }}" id="logoWhite" class="navbar-brand topnav"><img src="{{ instance.get_logo_light }}"></a> {% else %} - <a href="{{ default_logo_url }}" id="logoBlack" class="navbar-brand topnav"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a> - <a href="{{ default_logo_url }}" id="logoWhite" class="navbar-brand topnav"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a> + <a href="/" id="logoBlack" class="navbar-brand topnav"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a> + <a href="/" id="logoWhite" class="navbar-brand topnav"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a> {% endif %} </div> <div class="collapse navbar-collapse" id="dcl-topnav"> From 8f895a1d5a21100d8cec6334a15a1ddf324f402c Mon Sep 17 00:00:00 2001 From: Arvind Tiwari <tiwariav@gmail.com> Date: Thu, 22 Mar 2018 01:59:45 +0530 Subject: [PATCH 10/14] Update contact.html --- datacenterlight/templates/datacenterlight/cms/contact.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/cms/contact.html b/datacenterlight/templates/datacenterlight/cms/contact.html index 63455dd0..5d745a55 100644 --- a/datacenterlight/templates/datacenterlight/cms/contact.html +++ b/datacenterlight/templates/datacenterlight/cms/contact.html @@ -1,4 +1,4 @@ -<div id="{{ instance.id }}" class="full-contact-section"> +<div id="contact" class="full-contact-section"> <div class="intro-header-2 contact-section"> <div class="container"> <div class="row"> @@ -40,4 +40,4 @@ </div> </div> </div> -</div> \ No newline at end of file +</div> From 102978f87914a0efbbd02eb066093c3837a7d0dc Mon Sep 17 00:00:00 2001 From: Arvind Tiwari <tiwariav@gmail.com> Date: Thu, 22 Mar 2018 02:29:32 +0530 Subject: [PATCH 11/14] contact section heading --- datacenterlight/static/datacenterlight/css/landing-page.css | 6 ++++++ datacenterlight/templates/datacenterlight/cms/contact.html | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 6361ea21..2779b8c7 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -107,6 +107,12 @@ textarea { text-decoration: none; } +.topnav .nav .open>a, +.topnav .nav .open>a:focus, +.topnav .nav .open>a:hover { + background: transparent; +} + .navbar .dcl-link { display: block; padding: 15px; diff --git a/datacenterlight/templates/datacenterlight/cms/contact.html b/datacenterlight/templates/datacenterlight/cms/contact.html index 63455dd0..2cf77efb 100644 --- a/datacenterlight/templates/datacenterlight/cms/contact.html +++ b/datacenterlight/templates/datacenterlight/cms/contact.html @@ -3,9 +3,9 @@ <div class="container"> <div class="row"> <div class="col-sm-6"> - {% if instance.contact_text %} + {% if instance.heading%} <div class="title"> - <h2>{{ instance.contact_text }}</h2> + <h2>{{ instance.heading}}</h2> </div> {% endif %} <div class="contact-details"> From f1a77d65c421a670eb2cce25a0cbc37a626dc209 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari <tiwariav@gmail.com> Date: Thu, 22 Mar 2018 02:43:53 +0530 Subject: [PATCH 12/14] link target with absolute path on same page scrolls --- .../static/datacenterlight/js/main.js | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index 5e919045..dc5a9108 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -104,21 +104,33 @@ }); $('.url').click(function(event) { event.preventDefault(); - var href = $(this).attr('href'); + var $this = $(this); + var href = $this.attr('href'); $('.navbar-collapse').removeClass('in'); $('.navbar-collapse').addClass('collapsing'); if (href[0] === "#") { - if ($(href).length) { - $('html, body').animate({ - scrollTop: $(href).offset().top - 50 - }, 1000); - } + scrollToElement(href); } else if (href) { - window.location = href; + var path = $(this).prop('href').split('#'); + var currentPath = window.location.origin + window.location.pathname; + if (!path[1]) { + window.location = href; + } else if (currentPath == path[0]) { + scrollToElement('#' + path[1]); + } } }); } + function scrollToElement(el) { + var $el = $(el); + if ($el.length) { + $('html, body').animate({ + scrollTop: $el.offset().top - 50 + }, 1000); + } + } + function verifiedUrl() { if (window.location.href.indexOf('#success') > -1) { form_success(); From 748a74f38bd01a87512025581c728899cde754f3 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari <tiwariav@gmail.com> Date: Thu, 22 Mar 2018 03:11:20 +0530 Subject: [PATCH 13/14] redirect from static dcl landing to cms landing --- datacenterlight/urls.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index c08d6f01..2c13abca 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,13 +1,15 @@ from django.conf.urls import url -from django.views.generic import TemplateView +from django.views.generic import TemplateView, RedirectView from .views import ( IndexView, PaymentOrderView, OrderConfirmationView, WhyDataCenterLightView, ContactUsView ) + urlpatterns = [ - url(r'^$', IndexView.as_view(), name='index'), + url(r'^$', RedirectView.as_view(url='/cms/datacenterlight/'), + name='index'), url(r'^t/$', IndexView.as_view(), name='index_t'), url(r'^g/$', IndexView.as_view(), name='index_g'), url(r'^f/$', IndexView.as_view(), name='index_f'), From 6c27e0e6ff88583b4ea632bd959e3c08e2f2eee6 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari <tiwariav@gmail.com> Date: Thu, 22 Mar 2018 03:30:43 +0530 Subject: [PATCH 14/14] redirect form view instead of url --- datacenterlight/urls.py | 5 +++-- datacenterlight/views.py | 7 +------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 2c13abca..af8e76f2 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -8,12 +8,13 @@ from .views import ( urlpatterns = [ - url(r'^$', RedirectView.as_view(url='/cms/datacenterlight/'), - name='index'), + url(r'^$', IndexView.as_view(), name='index'), url(r'^t/$', IndexView.as_view(), name='index_t'), url(r'^g/$', IndexView.as_view(), name='index_g'), url(r'^f/$', IndexView.as_view(), name='index_f'), url(r'^l/$', IndexView.as_view(), name='index_l'), + url(r'^new/$', RedirectView.as_view(url='/cms/datacenterlight/'), + name='cms_index'), url(r'^whydatacenterlight/?$', WhyDataCenterLightView.as_view(), name='whydatacenterlight'), url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'), diff --git a/datacenterlight/views.py b/datacenterlight/views.py index faa1d59c..5517abaf 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -96,12 +96,7 @@ class IndexView(CreateView): for session_var in ['specs', 'user', 'billing_address_data']: if session_var in request.session: del request.session[session_var] - - vm_templates = VMTemplate.objects.all() - context = { - 'templates': vm_templates - } - return render(request, self.template_name, context) + return HttpResponseRedirect(reverse('datacenterlight:cms_index')) def post(self, request): cores = request.POST.get('cpu')