Merge pull request #593 from tiwariav/bugfix/dcl_cms_plugins

Bugfix/ dcl cms plugins

datacenterlight/static/datacenterlight/css/landing-page.css

@@ -117,6 +117,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;

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) {
+                scrollToElement(href);
-                    $('html, body').animate({
-                        scrollTop: $(href).offset().top - 50
-                    }, 1000);
-                }
             } 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();

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">