From 3b6e5d448b62f89e65ab762d9b4d2ba959169690 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 24 Dec 2019 09:06:17 +0530
Subject: [PATCH 1/6] Add show non transparent navbar always option

---
 datacenterlight/cms_models.py                 |  5 +++++
 ...odel_show_non_transparent_navbar_always.py | 20 +++++++++++++++++++
 .../templates/datacenterlight/cms/navbar.html |  2 +-
 .../datacenterlight/includes/_navbar.html     |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 datacenterlight/migrations/0030_dclnavbarpluginmodel_show_non_transparent_navbar_always.py

diff --git a/datacenterlight/cms_models.py b/datacenterlight/cms_models.py
index 2d1a98b5..d1c5c259 100644
--- a/datacenterlight/cms_models.py
+++ b/datacenterlight/cms_models.py
@@ -184,6 +184,11 @@ class DCLNavbarPluginModel(CMSPlugin):
         default=True,
         help_text='Uncheck this if you do not want to show login/dashboard.'
     )
+    show_non_transparent_navbar_always = models.BooleanField(
+        default=False,
+        help_text='Check this if you want to show non transparent navbar only.'
+                  '(Useful when we want to setup a simple page)'
+    )
 
     def get_logo_dark(self):
         # used only if atleast one logo exists
diff --git a/datacenterlight/migrations/0030_dclnavbarpluginmodel_show_non_transparent_navbar_always.py b/datacenterlight/migrations/0030_dclnavbarpluginmodel_show_non_transparent_navbar_always.py
new file mode 100644
index 00000000..f3e3ec09
--- /dev/null
+++ b/datacenterlight/migrations/0030_dclnavbarpluginmodel_show_non_transparent_navbar_always.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2019-12-24 03:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datacenterlight', '0029_auto_20190420_1022'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dclnavbarpluginmodel',
+            name='show_non_transparent_navbar_always',
+            field=models.BooleanField(default=False, help_text='Check this if you want to show non transparent navbar only.(Useful when we want to setup a simple page)'),
+        ),
+    ]
diff --git a/datacenterlight/templates/datacenterlight/cms/navbar.html b/datacenterlight/templates/datacenterlight/cms/navbar.html
index 886a5009..8000ec54 100644
--- a/datacenterlight/templates/datacenterlight/cms/navbar.html
+++ b/datacenterlight/templates/datacenterlight/cms/navbar.html
@@ -1,7 +1,7 @@
 {% load static i18n custom_tags cms_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 
-<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
+<nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always is False %}navbar-transparent{% endif %}">
   <!-- Brand and toggle get grouped for better mobile display -->
   <div class="navbar-header">
     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#dcl-topnav">
diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html
index 27792d4a..7013091e 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html
@@ -1,7 +1,7 @@
 {% load staticfiles i18n custom_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 
-<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
+<nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always is False %}navbar-transparent{% endif %}">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">

From f1821954eb20828c195a635f3b262af2c28561f2 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 24 Dec 2019 10:37:24 +0530
Subject: [PATCH 2/6] Set js for non transparent navbar always

---
 .../static/datacenterlight/js/main.js         | 22 ++++++++++---------
 .../datacenterlight/includes/_navbar.html     |  4 +++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js
index 65db1d6b..8fea438a 100644
--- a/datacenterlight/static/datacenterlight/js/main.js
+++ b/datacenterlight/static/datacenterlight/js/main.js
@@ -77,16 +77,18 @@
     }
 
     function _navScroll() {
-        if ($(window).scrollTop() > 10) {
-            $(".navbar").removeClass("navbar-transparent");
-            $(".navbar-default .btn-link").css("color", "#777");
-            $(".dropdown-menu").removeClass("navbar-transparent");
-            $(".dropdown-menu > li > a").css("color", "#777");
-        } else {
-            $(".navbar").addClass("navbar-transparent");
-            $(".navbar-default .btn-link").css("color", "#fff");
-            $(".dropdown-menu").addClass("navbar-transparent");
-            $(".dropdown-menu > li > a").css("color", "#fff");
+        if (!window.non_transparent_navbar_always) {
+            if ($(window).scrollTop() > 10) {
+                $(".navbar").removeClass("navbar-transparent");
+                $(".navbar-default .btn-link").css("color", "#777");
+                $(".dropdown-menu").removeClass("navbar-transparent");
+                $(".dropdown-menu > li > a").css("color", "#777");
+            } else {
+                $(".navbar").addClass("navbar-transparent");
+                $(".navbar-default .btn-link").css("color", "#fff");
+                $(".dropdown-menu").addClass("navbar-transparent");
+                $(".dropdown-menu > li > a").css("color", "#fff");
+            }
         }
     }
 
diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html
index 7013091e..ab9f07c6 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html
@@ -1,6 +1,8 @@
 {% load staticfiles i18n custom_tags %}
 {% get_current_language as LANGUAGE_CODE %}
-
+{% if instance.show_non_transparent_navbar_always %}
+<script>window.non_transparent_navbar_always=true;</script>
+{% endif %}
 <nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always is False %}navbar-transparent{% endif %}">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">

From 3a0fe87a8e44a22d973262c647200ebabcd54308 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 24 Dec 2019 10:42:34 +0530
Subject: [PATCH 3/6] Use correct comparison format

---
 datacenterlight/templates/datacenterlight/cms/navbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacenterlight/templates/datacenterlight/cms/navbar.html b/datacenterlight/templates/datacenterlight/cms/navbar.html
index 8000ec54..88bf8fdd 100644
--- a/datacenterlight/templates/datacenterlight/cms/navbar.html
+++ b/datacenterlight/templates/datacenterlight/cms/navbar.html
@@ -1,7 +1,7 @@
 {% load static i18n custom_tags cms_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 
-<nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always is False %}navbar-transparent{% endif %}">
+<nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always  != True %}navbar-transparent{% endif %}">
   <!-- Brand and toggle get grouped for better mobile display -->
   <div class="navbar-header">
     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#dcl-topnav">

From 3b7183fc63484347fdf47b50e477048a77022520 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 24 Dec 2019 10:49:12 +0530
Subject: [PATCH 4/6] Set js in correct file

---
 datacenterlight/templates/datacenterlight/cms/navbar.html     | 4 +++-
 .../templates/datacenterlight/includes/_navbar.html           | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/cms/navbar.html b/datacenterlight/templates/datacenterlight/cms/navbar.html
index 88bf8fdd..f33c6993 100644
--- a/datacenterlight/templates/datacenterlight/cms/navbar.html
+++ b/datacenterlight/templates/datacenterlight/cms/navbar.html
@@ -1,6 +1,8 @@
 {% load static i18n custom_tags cms_tags %}
 {% get_current_language as LANGUAGE_CODE %}
-
+{% if instance.show_non_transparent_navbar_always %}
+<script>window.non_transparent_navbar_always=true;</script>
+{% endif %}
 <nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always  != True %}navbar-transparent{% endif %}">
   <!-- Brand and toggle get grouped for better mobile display -->
   <div class="navbar-header">
diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html
index ab9f07c6..7b036b9e 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html
@@ -1,8 +1,5 @@
 {% load staticfiles i18n custom_tags %}
 {% get_current_language as LANGUAGE_CODE %}
-{% if instance.show_non_transparent_navbar_always %}
-<script>window.non_transparent_navbar_always=true;</script>
-{% endif %}
 <nav class="navbar navbar-default navbar-fixed-top topnav {% if instance.show_non_transparent_navbar_always is False %}navbar-transparent{% endif %}">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">

From 3ff9f25a7f54c8e909cb4b7995b450424c0c2eb7 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 24 Dec 2019 12:44:46 +0530
Subject: [PATCH 5/6] Update Changelog for 2.8.1

---
 Changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Changelog b/Changelog
index 45c650be..208d2d7a 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2.8.1: 2019-12-24
+   * [dcl cms navbar plugin]: Provide an option to show non transparent navar always
 2.8: 2019-12-20
    * ldap_migration: Migrate django users to Ldap
      Notes for deployment:

From 7b7f8fb191ae6a2c4587f3af420483dc35c59d0c Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 24 Dec 2019 17:57:14 +0530
Subject: [PATCH 6/6] Set the calculator's post action url explicitly

---
 .../templates/datacenterlight/includes/_calculator_form.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/includes/_calculator_form.html b/datacenterlight/templates/datacenterlight/includes/_calculator_form.html
index f9896f17..f64a9500 100644
--- a/datacenterlight/templates/datacenterlight/includes/_calculator_form.html
+++ b/datacenterlight/templates/datacenterlight/includes/_calculator_form.html
@@ -14,7 +14,7 @@
     </script>
 {% endif %}
 
-<form id="order_form" method="POST" action="{{calculator_form_url}}" data-toggle="validator" role="form">
+<form id="order_form" method="POST" action="{% url 'datacenterlight:index' %}" data-toggle="validator" role="form">
     {% csrf_token %}
     <input type="hidden" name="pid" value="{{instance.id}}">
     <div class="title">
@@ -102,4 +102,4 @@
     </div>
     <input type="hidden" name="pricing_name" value="{% if vm_pricing.name %}{{vm_pricing.name}}{% else %}unknown{% endif%}"></input>
     <input type="submit" class="btn btn-primary disabled" value="{% trans 'Continue' %}"></input>
-</form>
+</form>
\ No newline at end of file