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: 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/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/cms/navbar.html b/datacenterlight/templates/datacenterlight/cms/navbar.html index 886a5009..f33c6993 100644 --- a/datacenterlight/templates/datacenterlight/cms/navbar.html +++ b/datacenterlight/templates/datacenterlight/cms/navbar.html @@ -1,7 +1,9 @@ {% load static i18n custom_tags cms_tags %} {% get_current_language as LANGUAGE_CODE %} - -