From c891694dc00fd7c871880e7d5a36c11e3c285ad4 Mon Sep 17 00:00:00 2001 From: Malcolm Anyakee Date: Sat, 25 Aug 2018 23:13:16 +0200 Subject: [PATCH 1/5] Update Bugfix Fixed bugs and fixed typo --- hosting/locale/de/LC_MESSAGES/django.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index a9e33644..4cdfc6f6 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -209,7 +209,7 @@ msgstr "Du hast eine neue virtuelle Maschine bestellt!" #, python-format msgid "Your order of %(vm_name)s has been charged." -msgstr "Deine Bestellung von %(vm_name)s wurde erhoben." +msgstr "Deine Bestellung von %(vm_name)s wurde entgegengenommen." msgid "You can view your VM detail by clicking the button below." msgstr "Um die Rechnung zu sehen, klicke auf den Button unten." @@ -222,7 +222,7 @@ msgstr "Dein Data Center Light Team" #, python-format msgid "Your order of %(vm_name)s has been charged." -msgstr "Deine Bestellung von %(vm_name)s wurde erhoben." +msgstr "Deine Bestellung von %(vm_name)s wurde entgegengenommen." msgid "You can view your VM detail by following the link below." msgstr "Um die Rechnung zu sehen, klicke auf den Link unten." @@ -249,7 +249,7 @@ msgstr "VM Kündigung" #, python-format msgid "" -"You are receiving this email because your virutal machine " +"You are receiving this email because your virtual machine " "%(vm_name)s has been cancelled." msgstr "" "Du erhälst diese E-Mail, da deine virtuelle Maschine %(vm_name)s Date: Tue, 25 Sep 2018 22:29:54 +0200 Subject: [PATCH 2/5] Change DCLNavbarPlugin to show login option only if set --- datacenterlight/cms_models.py | 4 ++++ ..._dclnavbarpluginmodel_show_login_option.py | 20 +++++++++++++++++++ .../templates/datacenterlight/cms/navbar.html | 18 +++++++++-------- 3 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 datacenterlight/migrations/0025_dclnavbarpluginmodel_show_login_option.py diff --git a/datacenterlight/cms_models.py b/datacenterlight/cms_models.py index 62a7b312..69f45507 100644 --- a/datacenterlight/cms_models.py +++ b/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 diff --git a/datacenterlight/migrations/0025_dclnavbarpluginmodel_show_login_option.py b/datacenterlight/migrations/0025_dclnavbarpluginmodel_show_login_option.py new file mode 100644 index 00000000..e9ec57ba --- /dev/null +++ b/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.'), + ), + ] diff --git a/datacenterlight/templates/datacenterlight/cms/navbar.html b/datacenterlight/templates/datacenterlight/cms/navbar.html index ae6643aa..886a5009 100644 --- a/datacenterlight/templates/datacenterlight/cms/navbar.html +++ b/datacenterlight/templates/datacenterlight/cms/navbar.html @@ -35,14 +35,16 @@ {% endif %} {% endif %} - {% if not request.user.is_authenticated %} -
  • - {% trans "Login" %}   -
    • - {% else %} -
  • - {% trans "Dashboard" %} -
    • + {% if instance.show_login_option %} + {% if not request.user.is_authenticated %} +
  • + {% trans "Login" %}   +
    • + {% else %} +
  • + {% trans "Dashboard" %} +
    • + {% endif %} {% endif %} {% comment %} From ce2ac4524c1b694adfb357a15a763fcb4aaa0a02 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 25 Sep 2018 22:49:31 +0200 Subject: [PATCH 3/5] Update Changelog for release 2.2.1 --- Changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index d373a4e8..051a0a7b 100644 --- a/Changelog +++ b/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 From 4feeec23d40f2119f1a531370cb7fb3503e671d5 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 26 Sep 2018 20:50:19 +0200 Subject: [PATCH 4/5] Correct spelling: virutal -> virtual --- hosting/templates/hosting/emails/vm_canceled.html | 2 +- hosting/templates/hosting/emails/vm_canceled.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html index 9c2ec4c2..78781d5c 100644 --- a/hosting/templates/hosting/emails/vm_canceled.html +++ b/hosting/templates/hosting/emails/vm_canceled.html @@ -25,7 +25,7 @@

    - {% blocktrans %}You are receiving this email because your virutal machine {{ vm_name }} has been cancelled.{% endblocktrans %} + {% blocktrans %}You are receiving this email because your virtual machine {{ vm_name }} has been cancelled.{% endblocktrans %}

    {% blocktrans %}You can always order a new VM by clicking the button below.{% endblocktrans %} diff --git a/hosting/templates/hosting/emails/vm_canceled.txt b/hosting/templates/hosting/emails/vm_canceled.txt index 9149a554..43263c40 100644 --- a/hosting/templates/hosting/emails/vm_canceled.txt +++ b/hosting/templates/hosting/emails/vm_canceled.txt @@ -2,7 +2,7 @@ {% trans "Virtual Machine Cancellation" %} -{% blocktrans %}You are receiving this email because your virutal machine {{vm_name}} has been cancelled.{% endblocktrans %} +{% blocktrans %}You are receiving this email because your virtual machine {{vm_name}} has been cancelled.{% endblocktrans %} {% blocktrans %}You can always order a new VM by following the link below.{% endblocktrans %} {{ base_url }}{% url 'hosting:create_virtual_machine' %} From efae2b1d9ac0815b5c7fa6f74d21e605ead557a6 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 26 Sep 2018 21:17:35 +0200 Subject: [PATCH 5/5] Update Changelog --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index 051a0a7b..db20e920 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +Next: + * bugfix: Fix some typos and correct DE translations (PR #667) 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)