Merge branch 'master' into task/5690/generic-payment-page

Changelog

@@ -1,4 +1,5 @@
-Next:
+2.2.1: 2018-09-25
+    * feature: Change DCLNavbarPlugin to show login option only if set (PR #665)
     * bugfix: Log opennebula errors and send proper message when vm terminate is not completed in the stipulated time (PR #648)
 2.2: 2018-09-06
     * bugfix: Include price in the Stripe plan name to make it distinct and to correct pricing since version 1.9

datacenterlight/cms_models.py

@@ -180,6 +180,10 @@ class DCLNavbarPluginModel(CMSPlugin):
         default=True,
         help_text='Select to include the language selection dropdown.'
     )
+    show_login_option = models.BooleanField(
+        default=True,
+        help_text='Uncheck this if you do not want to show login/dashboard.'
+    )
 
     def get_logo_dark(self):
         # used only if atleast one logo exists

datacenterlight/migrations/0025_dclnavbarpluginmodel_show_login_option.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2018-09-25 20:27
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datacenterlight', '0024_dclcalculatorpluginmodel_vm_templates_to_show'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dclnavbarpluginmodel',
+            name='show_login_option',
+            field=models.BooleanField(default=True, help_text='Uncheck this if you do not want to show login/dashboard.'),
+        ),
+    ]

datacenterlight/templates/datacenterlight/cms/navbar.html

@@ -35,14 +35,16 @@
           {% endif %}
         </li>
       {% endif %}
-      {% if not request.user.is_authenticated %}
+      {% if instance.show_login_option %}
-        <li>
+        {% if not request.user.is_authenticated %}
-          <a href="{% url 'hosting:login' %}">{% trans "Login" %}&nbsp;&nbsp;<span class="fa fa-sign-in"></span></a>
+          <li>
-        </li>
+            <a href="{% url 'hosting:login' %}">{% trans "Login" %}&nbsp;&nbsp;<span class="fa fa-sign-in"></span></a>
-      {% else %}
+          </li>
-        <li>
+        {% else %}
-          <a href="{% url 'hosting:dashboard' %}">{% trans "Dashboard" %}</a>
+          <li>
-        </li>
+            <a href="{% url 'hosting:dashboard' %}">{% trans "Dashboard" %}</a>
+          </li>
+        {% endif %}
       {% endif %}
       {% comment %}
       <!-- to be used when more than one option for language -->