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/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index 6361ea21..3cc28c46 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -58,6 +58,16 @@ textarea {
min-width: 180px;
}
+.lead {
+ font-size: 18px;
+}
+
+@media (min-width: 768px) {
+ .lead {
+ font-size: 21px;
+ }
+}
+
/* Top navbar */
@@ -429,17 +439,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 +777,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;
}
}
@@ -1190,7 +1197,7 @@ footer {
max-width: 430px;
}
.flex-row-rev .desc-text {
- max-width: 710px;
+ max-width: 600px;
text-align: left;
}
.flex-row-rev .percent-text {
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 %}