From 33898034934e9f643550009ddc7c7b771d847df2 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 20 Feb 2018 11:54:42 +0100 Subject: [PATCH 01/17] Remove /beta-program url from dcl --- datacenterlight/urls.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 2cd0723f..a1eed2ae 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url from .views import ( - IndexView, BetaProgramView, LandingProgramView, BetaAccessView, + IndexView, LandingProgramView, BetaAccessView, SuccessView, PaymentOrderView, OrderConfirmationView, WhyDataCenterLightView, ContactUsView ) @@ -17,7 +17,6 @@ urlpatterns = [ url(r'^l/$', IndexView.as_view(), name='index_l'), url(r'^whydatacenterlight/?$', WhyDataCenterLightView.as_view(), name='whydatacenterlight'), - url(r'^beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^landing/?$', LandingProgramView.as_view(), name='landing'), url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'), url(r'^order-confirmation/?$', OrderConfirmationView.as_view(), From cc2e18a7d2d6f2b408cc1b23e9d19d9a06123272 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 20 Feb 2018 11:58:29 +0100 Subject: [PATCH 02/17] Remove /beta_access url from dcl --- datacenterlight/urls.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index a1eed2ae..b6497f50 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url from .views import ( - IndexView, LandingProgramView, BetaAccessView, + IndexView, LandingProgramView, SuccessView, PaymentOrderView, OrderConfirmationView, WhyDataCenterLightView, ContactUsView ) @@ -22,9 +22,7 @@ urlpatterns = [ url(r'^order-confirmation/?$', OrderConfirmationView.as_view(), name='order_confirmation'), url(r'^order-success/?$', SuccessView.as_view(), name='order_success'), - url(r'^beta_access?$', BetaAccessView.as_view(), name='beta_access'), url(r'^contact/?$', ContactUsView.as_view(), name='contact_us'), - url(r'glasfaser/?$', TemplateView.as_view(template_name='ungleich_page/glasfaser.html'), name='glasfaser'), From 4f1c5d7c776fb59b72af04a03d3f2a1bdab8041b Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 20 Feb 2018 12:19:30 +0100 Subject: [PATCH 03/17] Remove BetaProgramView --- datacenterlight/views.py | 57 +--------------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index fda8c9c9..5e950bbc 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -26,7 +26,7 @@ from utils.mailer import BaseEmail from utils.stripe_utils import StripeUtils from utils.tasks import send_plain_email_task from .forms import BetaAccessForm, ContactForm -from .models import BetaAccess, BetaAccessVMType, BetaAccessVM, VMTemplate +from .models import BetaAccess, VMTemplate logger = logging.getLogger(__name__) @@ -142,61 +142,6 @@ class BetaAccessView(FormView): return render(self.request, 'datacenterlight/beta_success.html', {}) -class BetaProgramView(CreateView): - template_name = "datacenterlight/beta.html" - model = BetaAccessVM - fields = '__all__' - # form_class = BetaAccessForm - # success_url = "/datacenterlight#requestform" - success_message = "Thank you, we will contact you as soon as possible" - - def get_success_url(self): - success_url = reverse('datacenterlight:beta') - success_url += "#success" - return success_url - - def get_context_data(self, **kwargs): - vms = BetaAccessVMType.objects.all() - context = super(BetaProgramView, self).get_context_data(**kwargs) - - # templates = OpenNebulaManager().get_templates() - # data = VirtualMachineTemplateSerializer(templates, many=True).data - - context.update({ - 'base_url': "{0}://{1}".format(self.request.scheme, - self.request.get_host()), - 'vms': vms - }) - return context - - def post(self, request, *args, **kwargs): - data = request.POST - vms = BetaAccessVM.create(data) - - context = { - 'base_url': "{0}://{1}".format(self.request.scheme, - self.request.get_host()), - 'email': data.get('email'), - 'name': data.get('name'), - 'vms': vms - } - - email_data = { - 'subject': 'DatacenterLight Beta Access Request', - 'from_address': '(datacenterlight) datacenterlight Support ', - 'to': 'info@ungleich.ch', - 'context': context, - 'template_name': 'request_beta_access_notification', - 'template_path': 'datacenterlight/emails/' - } - email = BaseEmail(**email_data) - email.send() - - messages.add_message(self.request, messages.SUCCESS, - self.success_message) - return HttpResponseRedirect(self.get_success_url()) - - class IndexView(CreateView): template_name = "datacenterlight/index.html" model = BetaAccess From 3cdf915b8651fd4958b4f0fba70fcdc583c1b8da Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 20 Feb 2018 15:06:24 +0100 Subject: [PATCH 04/17] Remove more classes related to Beta --- datacenterlight/views.py | 95 +++------------------------------------- 1 file changed, 5 insertions(+), 90 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 5e950bbc..b2937d12 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -1,5 +1,5 @@ -import logging import json +import logging from django import forms from django.conf import settings @@ -14,19 +14,18 @@ from django.views.decorators.cache import cache_control from django.views.generic import FormView, CreateView, TemplateView, DetailView from datacenterlight.tasks import create_vm_task -from hosting.models import HostingOrder from hosting.forms import HostingUserLoginForm +from hosting.models import HostingOrder from membership.models import CustomUser, StripeCustomer from opennebula_api.serializers import VMTemplateSerializer from utils.forms import ( BillingAddressForm, BillingAddressFormSignup ) from utils.hosting_utils import get_vm_price -from utils.mailer import BaseEmail from utils.stripe_utils import StripeUtils from utils.tasks import send_plain_email_task -from .forms import BetaAccessForm, ContactForm -from .models import BetaAccess, VMTemplate +from .forms import ContactForm +from .models import VMTemplate logger = logging.getLogger(__name__) @@ -99,53 +98,8 @@ class SuccessView(TemplateView): return render(request, self.template_name) -class BetaAccessView(FormView): - template_name = "datacenterlight/beta_access.html" - form_class = BetaAccessForm - success_message = "Thank you, we will contact you as soon as possible" - - def form_valid(self, form): - context = { - 'base_url': "{0}://{1}".format(self.request.scheme, - self.request.get_host()) - } - - email_data = { - 'subject': 'DatacenterLight Beta Access Request', - 'from_address': '(datacenterlight) datacenterlight Support ', - 'to': form.cleaned_data.get('email'), - 'from': '(datacenterlight) DatacenterLight Support support@datacenterlight.ch', - 'context': context, - 'template_name': 'request_access_confirmation', - 'template_path': 'datacenterlight/emails/' - } - email = BaseEmail(**email_data) - email.send() - - context.update({ - 'email': form.cleaned_data.get('email') - }) - - email_data = { - 'subject': 'DatacenterLight Beta Access Request', - 'from_address': '(datacenterlight) datacenterlight Support ', - 'to': 'info@ungleich.ch', - 'context': context, - 'template_name': 'request_access_notification', - 'template_path': 'datacenterlight/emails/' - } - email = BaseEmail(**email_data) - email.send() - - messages.add_message(self.request, messages.SUCCESS, - self.success_message) - return render(self.request, 'datacenterlight/beta_success.html', {}) - - class IndexView(CreateView): template_name = "datacenterlight/index.html" - model = BetaAccess - form_class = BetaAccessForm success_url = "/datacenterlight#requestform" success_message = "Thank you, we will contact you as soon as possible" @@ -237,48 +191,9 @@ class IndexView(CreateView): }) return context - def form_valid(self, form): - - context = { - 'base_url': "{0}://{1}".format(self.request.scheme, - self.request.get_host()) - } - - email_data = { - 'subject': 'DatacenterLight Beta Access Request', - 'from_address': '(datacenterlight) datacenterlight Support ', - 'to': form.cleaned_data.get('email'), - 'from': '(datacenterlight) DatacenterLight Support support@datacenterlight.ch', - 'context': context, - 'template_name': 'request_access_confirmation', - 'template_path': 'datacenterlight/emails/' - } - email = BaseEmail(**email_data) - email.send() - - context.update({ - 'email': form.cleaned_data.get('email') - }) - - email_data = { - 'subject': 'DatacenterLight Beta Access Request', - 'from_address': '(datacenterlight) datacenterlight Support ', - 'to': 'info@ungleich.ch', - 'context': context, - 'template_name': 'request_access_notification', - 'template_path': 'datacenterlight/emails/' - } - email = BaseEmail(**email_data) - email.send() - - messages.add_message(self.request, messages.SUCCESS, - self.success_message) - return super(IndexView, self).form_valid(form) - class WhyDataCenterLightView(IndexView): template_name = "datacenterlight/whydatacenterlight.html" - model = BetaAccess class PaymentOrderView(FormView): @@ -518,7 +433,7 @@ class OrderConfirmationView(DetailView): stripe_subscription_obj = subscription_result.get('response_object') # Check if the subscription was approved and is active if (stripe_subscription_obj is None - or stripe_subscription_obj.status != 'active'): + or stripe_subscription_obj.status != 'active'): msg = subscription_result.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') From a90bc3b3ce4e2c18d325d0f58f254480d0847e65 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 20 Feb 2018 15:11:09 +0100 Subject: [PATCH 05/17] Remove BetaAccess related forms --- datacenterlight/forms.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/datacenterlight/forms.py b/datacenterlight/forms.py index 3ffe403c..b697f694 100644 --- a/datacenterlight/forms.py +++ b/datacenterlight/forms.py @@ -1,26 +1,9 @@ from django import forms -from .models import BetaAccess, ContactUs - - -class BetaAccessForm(forms.ModelForm): - email = forms.CharField(widget=forms.EmailInput()) - - class Meta: - fields = ['name', 'email'] - model = BetaAccess +from .models import ContactUs class ContactForm(forms.ModelForm): - class Meta: fields = ['name', 'email', 'message'] model = ContactUs - - -# class BetaAccessVMForm(forms.ModelForm): -# type = forms.CharField(widget=forms.EmailInput()) - -# class Meta: -# fields = ['email'] -# model = BetaAccessVM From 5f136a9dfe5e615a9e04ef8df634a3272cfd27e7 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 20 Feb 2018 15:13:12 +0100 Subject: [PATCH 06/17] Remove BetaAccess related models --- datacenterlight/admin.py | 9 ------- datacenterlight/models.py | 50 --------------------------------------- 2 files changed, 59 deletions(-) delete mode 100644 datacenterlight/admin.py diff --git a/datacenterlight/admin.py b/datacenterlight/admin.py deleted file mode 100644 index 7a846c71..00000000 --- a/datacenterlight/admin.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.contrib import admin - -from .models import BetaAccess, BetaAccessVMType, BetaAccessVM -# Register your models here. - - -admin.site.register(BetaAccess) -admin.site.register(BetaAccessVMType) -admin.site.register(BetaAccessVM) diff --git a/datacenterlight/models.py b/datacenterlight/models.py index e2de41e1..2fbed5c8 100644 --- a/datacenterlight/models.py +++ b/datacenterlight/models.py @@ -1,56 +1,6 @@ from django.db import models -class BetaAccessVMType(models.Model): - ssd = models.IntegerField() - ram = models.IntegerField() - cpu = models.IntegerField() - price = models.FloatField() - - def __str__(self): - return "ID: %s - SSD %s - RAM %s - CPU %s - Price %s " % \ - (self.id, str(self.ssd), self.ram, self.cpu, self.price) - - -class BetaAccess(models.Model): - email = models.CharField(max_length=250) - name = models.CharField(max_length=250) - - # vm = models.ForeignKey(BetaAccessVM) - - def __str__(self): - vms = self.betaaccessvm_set.all() - rep = "Email: %s " % self.email - for vm in vms: - rep += "(vm:%s - amount:%s) - " % (vm.type.id, vm.amount) - return rep - - -class BetaAccessVM(models.Model): - type = models.ForeignKey(BetaAccessVMType) - access = models.ForeignKey(BetaAccess) - amount = models.IntegerField() - - @classmethod - def create(cls, data): - VM_KEY_ID = 0 - VM_AMOUNT = 1 - ZERO = 0 - email = data.get('email') - beta_access = BetaAccess.objects.create(email=email) - vm_data = [(key, value) for key, value in data.items() if 'vm' in key] - created_vms = [] - for vm in vm_data: - if int(vm[VM_AMOUNT]) == ZERO: - continue - vm_id = vm[VM_KEY_ID].split('-').pop() - vm_type = BetaAccessVMType.objects.get(id=vm_id) - created_vms.append(cls.objects.create(access=beta_access, - amount=vm[VM_AMOUNT], type=vm_type)) - - return created_vms - - class VMTemplate(models.Model): name = models.CharField(max_length=50) opennebula_vm_template_id = models.IntegerField() From 8ba3bfc89faa2ab8c94074c1634fdbd56dffef90 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 20 Feb 2018 15:24:41 +0100 Subject: [PATCH 07/17] Dcl migration for removing beta-access related tables --- .../migrations/0011_auto_20180220_1423.py | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 datacenterlight/migrations/0011_auto_20180220_1423.py diff --git a/datacenterlight/migrations/0011_auto_20180220_1423.py b/datacenterlight/migrations/0011_auto_20180220_1423.py new file mode 100644 index 00000000..d436981e --- /dev/null +++ b/datacenterlight/migrations/0011_auto_20180220_1423.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2018-02-20 14:23 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('datacenterlight', '0010_merge'), + ] + + operations = [ + migrations.RemoveField( + model_name='betaaccessvm', + name='access', + ), + migrations.RemoveField( + model_name='betaaccessvm', + name='type', + ), + migrations.DeleteModel( + name='BetaAccess', + ), + migrations.DeleteModel( + name='BetaAccessVM', + ), + migrations.DeleteModel( + name='BetaAccessVMType', + ), + ] From 3769e00c8c891b466bc126eaa06b14919f0885f7 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 20 Feb 2018 19:22:28 +0100 Subject: [PATCH 08/17] Fix a PEP8 error --- datacenterlight/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index b2937d12..c22d82a5 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -433,7 +433,7 @@ class OrderConfirmationView(DetailView): stripe_subscription_obj = subscription_result.get('response_object') # Check if the subscription was approved and is active if (stripe_subscription_obj is None - or stripe_subscription_obj.status != 'active'): + or stripe_subscription_obj.status != 'active'): msg = subscription_result.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') From a5ad1a9edf60fce9fb4e35fa0779926d7c849f3b Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 20 Feb 2018 19:48:52 +0100 Subject: [PATCH 09/17] Remove unused beta access templates and js --- .../static/datacenterlight/js/beta.js | 55 ------- .../datacenterlight/beta_access.html | 27 ---- .../datacenterlight/beta_success.html | 47 ------ hosting/templates/hosting/beta.html | 147 ------------------ 4 files changed, 276 deletions(-) delete mode 100644 datacenterlight/static/datacenterlight/js/beta.js delete mode 100644 datacenterlight/templates/datacenterlight/beta_access.html delete mode 100644 datacenterlight/templates/datacenterlight/beta_success.html delete mode 100644 hosting/templates/hosting/beta.html diff --git a/datacenterlight/static/datacenterlight/js/beta.js b/datacenterlight/static/datacenterlight/js/beta.js deleted file mode 100644 index 7fd84acf..00000000 --- a/datacenterlight/static/datacenterlight/js/beta.js +++ /dev/null @@ -1,55 +0,0 @@ -(function($){ - 'use strict'; // Start of use strict - - - - $(document).ready(function(){ - verifiedUrl(); - init_options_interested(); - init_nav(); - change_values(); - }); - - function verifiedUrl(){ - if(window.location.href.indexOf('#success') > -1){ - form_success(); - } - } - - function init_options_interested(){ - $('.row-vms').click(function(){ - $('.row-vms').removeClass('row-vms__active'); - $(this).addClass('row-vms__active'); - var number = $('.row-vms__active input').val(); - var price = $('.row-vms__active input').data('price'); - _calculate(number, price); - }); - } - - function init_nav(){ - - $('.nav-local').click(function(){ - $('html, body').animate({ - scrollTop: $('#'+$(this).data('href')).offset().top - }); - }); - - } - - function change_values(){ - $('.number-vms').keyup(function () { - var number = $(this).val(); - var price = $(this).data('price'); - _calculate(number, price); - }); - - } - function form_success(){ - $('#sucessModal').modal('show'); - } - function _calculate(numbers, price){ - $('#valueTotal').text(numbers*price*31); - } - - -})(jQuery); // End of use strict diff --git a/datacenterlight/templates/datacenterlight/beta_access.html b/datacenterlight/templates/datacenterlight/beta_access.html deleted file mode 100644 index 7a694611..00000000 --- a/datacenterlight/templates/datacenterlight/beta_access.html +++ /dev/null @@ -1,27 +0,0 @@ -{% load i18n %} - -
- {% csrf_token %} - {{ form.non_field_errors }} -
- {% for message in messages %} - {{ message }} - {% endfor %} -
-
-
- - {{ form.name.errors|striptags}} -
-
- - {{ form.email.errors|striptags}} -
-
- -
- \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/beta_success.html b/datacenterlight/templates/datacenterlight/beta_success.html deleted file mode 100644 index 60df607c..00000000 --- a/datacenterlight/templates/datacenterlight/beta_success.html +++ /dev/null @@ -1,47 +0,0 @@ - -{% load i18n %} - - - - \ No newline at end of file diff --git a/hosting/templates/hosting/beta.html b/hosting/templates/hosting/beta.html deleted file mode 100644 index bdf37f58..00000000 --- a/hosting/templates/hosting/beta.html +++ /dev/null @@ -1,147 +0,0 @@ -{% load staticfiles %} - - - - - - - - - - - - - Rails Hosting.ch - Ruby on Rails as easy as possible - - - - - - - - - - - - - - - - - - - {% include 'google_analytics.html' %} - - - - - - - - - - - - -
-
-
- -
-

Thank you for your interest in joining Rails-Hosting Beta.
-     We will come back to you shortly to give you access to our  infrastructure. -

-
-
    - -
-
-
-
- -
- - - - - - - - - - - - - - - - - From 8aeefd714491f0fa86ba3df366485549ce4ec5ca Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 20 Feb 2018 19:56:18 +0100 Subject: [PATCH 10/17] Remove datacenterlight/img/beta-img.png and hosting/image/Beta.png and corresponding references in the code --- .../static/datacenterlight/img/beta-img.png | Bin 9195 -> 0 bytes .../templates/datacenterlight/index.html | 1 - .../datacenterlight/whydatacenterlight.html | 1 - hosting/static/hosting/img/Beta.png | Bin 9195 -> 0 bytes hosting/templates/hosting/includes/_header.html | 1 - 5 files changed, 3 deletions(-) delete mode 100644 datacenterlight/static/datacenterlight/img/beta-img.png delete mode 100644 hosting/static/hosting/img/Beta.png diff --git a/datacenterlight/static/datacenterlight/img/beta-img.png b/datacenterlight/static/datacenterlight/img/beta-img.png deleted file mode 100644 index 76a3983f95fa41e93422171e23615433f495c9d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9195 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 BqSgQa diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index f8ac4419..3d430342 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -136,7 +136,6 @@
-
{% include "datacenterlight/calculator_form.html" %}
diff --git a/datacenterlight/templates/datacenterlight/whydatacenterlight.html b/datacenterlight/templates/datacenterlight/whydatacenterlight.html index c54156b6..eef33b8a 100644 --- a/datacenterlight/templates/datacenterlight/whydatacenterlight.html +++ b/datacenterlight/templates/datacenterlight/whydatacenterlight.html @@ -135,7 +135,6 @@
-
{% include "datacenterlight/calculator_form.html" %}
diff --git a/hosting/static/hosting/img/Beta.png b/hosting/static/hosting/img/Beta.png deleted file mode 100644 index 76a3983f95fa41e93422171e23615433f495c9d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9195 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 BqSgQa diff --git a/hosting/templates/hosting/includes/_header.html b/hosting/templates/hosting/includes/_header.html index 9e609816..6f9b4a5c 100644 --- a/hosting/templates/hosting/includes/_header.html +++ b/hosting/templates/hosting/includes/_header.html @@ -7,7 +7,6 @@
-

{{ domain }}

{{ hosting_long }} as easy as possible

From e8e9b56c94a2cb1187b73fbfbb13261efb22253e Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 20 Feb 2018 20:27:37 +0100 Subject: [PATCH 11/17] Redirect user to digital glarus on clicking logo in the email --- .../templates/digitalglarus/emails/membership_charge.html | 2 +- .../digitalglarus/emails/membership_monthly_charge.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/digitalglarus/templates/digitalglarus/emails/membership_charge.html b/digitalglarus/templates/digitalglarus/emails/membership_charge.html index e890a8c5..e5de2491 100644 --- a/digitalglarus/templates/digitalglarus/emails/membership_charge.html +++ b/digitalglarus/templates/digitalglarus/emails/membership_charge.html @@ -74,7 +74,7 @@
diff --git a/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.html b/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.html index 4a962c41..a30e93a0 100644 --- a/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.html +++ b/digitalglarus/templates/digitalglarus/emails/membership_monthly_charge.html @@ -74,7 +74,7 @@
- logo + logo
From 6477401093dc80a5966c51cd7284ea58ae871a26 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 22 Feb 2018 06:45:58 +0100 Subject: [PATCH 12/17] Remove beta access related email templates --- .../emails/base_email_datacenterlight.html | 176 ------------------ .../emails/base_email_datacenterlight.txt | 7 - .../emails/request_access_confirmation.html | 129 ------------- .../emails/request_access_confirmation.txt | 129 ------------- .../emails/request_access_notification.html | 125 ------------- .../emails/request_access_notification.txt | 125 ------------- .../request_beta_access_notification.html | 131 ------------- .../request_beta_access_notification.txt | 131 ------------- 8 files changed, 953 deletions(-) delete mode 100644 datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html delete mode 100644 datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.txt delete mode 100644 datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html delete mode 100644 datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt delete mode 100644 datacenterlight/templates/datacenterlight/emails/request_access_notification.html delete mode 100644 datacenterlight/templates/datacenterlight/emails/request_access_notification.txt delete mode 100644 datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html delete mode 100644 datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.txt diff --git a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html deleted file mode 100644 index be8479d9..00000000 --- a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html +++ /dev/null @@ -1,176 +0,0 @@ -{% load static from staticfiles %} -{% load i18n %} - - - - - - - {{dcl_text}} - - - -
- logo + logo
- - - - - - - - - -
-
- - - - -
- -
- - - - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- {% block email_head %} - {% endblock %} -
-

- {% block email_body %} - {% endblock %} -

  -
-
-
-
- - - - -
{% trans 'Your Data Center Light Team' %} -
-
-
- - - diff --git a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.txt b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.txt deleted file mode 100644 index 46fd0730..00000000 --- a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.txt +++ /dev/null @@ -1,7 +0,0 @@ -{% load static from staticfiles %} -{% load i18n %} -{% block email_head %} -{% endblock %} -{% block email_body %} -{% endblock %} -{% trans 'Your Data Center Light Team' %} diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html deleted file mode 100644 index 2f71944f..00000000 --- a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html +++ /dev/null @@ -1,129 +0,0 @@ -{% load static from staticfiles %} -{% load i18n%} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- {% trans "Thank you for your request." %} -
-

{% trans "You are one step away from being our beta tester!" %}

- {% trans "Currently we are running our tests to make sure everything runs perfectly." %}
- {% trans "In the meantime, we would like to ask you a little patience
until our team contacts you with beta access." %}
- {% trans "Thank you!" %}

 
-
-
-
- - -
Your data center light team
-
-
-
- - - diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt deleted file mode 100644 index e96a8ef1..00000000 --- a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt +++ /dev/null @@ -1,129 +0,0 @@ -{% load static from staticfiles %} -{% load i18n%} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- {% trans "Thank you for your request." %} -
-

{% trans "You are one step away from being our beta tester!" %}

- {% trans "Currently we are running our tests to make sure everything runs perfectly." %}
- {% trans "In the meantime, we would like to ask you a little patience
until our team contacts you with beta access." %}
- {% trans "Thank you!" %}

 
-
-
-
- - -
Your data center light team
-
-
-
- - - diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html deleted file mode 100644 index 095c917e..00000000 --- a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html +++ /dev/null @@ -1,125 +0,0 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- An user requested a beta access -
-

User {{email}} requested beta access

 
-
-
-
- - -
Your data center light team
-
-
-
- - - diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_notification.txt b/datacenterlight/templates/datacenterlight/emails/request_access_notification.txt deleted file mode 100644 index 09531ba6..00000000 --- a/datacenterlight/templates/datacenterlight/emails/request_access_notification.txt +++ /dev/null @@ -1,125 +0,0 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- An user requested a beta access -
-

User {{email}} requested beta access

 
-
-
-
- - -
Your data center light team
-
-
-
- - - diff --git a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html deleted file mode 100644 index c6f3033e..00000000 --- a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html +++ /dev/null @@ -1,131 +0,0 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- An user requested a beta access - - -
-

User {{email}} requested beta access

- {% for vm in vms %} - Type: {{vm.type}} - Amount: {{vm.amount}} - {% endfor %} -
 
-
-
-
- - -
Your data center light team
-
-
-
- - - diff --git a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.txt b/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.txt deleted file mode 100644 index 92a03a99..00000000 --- a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.txt +++ /dev/null @@ -1,131 +0,0 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- An user requested a beta access - - -
-

User {{email}} requested beta access

- {% for vm in vms %} - Type: {{vm.type}} - {% endfor %} -
 
-
-
-
- - -
Your data center light team
-
-
-
- - - From 03ea94a404c2d59631b768a2b0aa73012f6781fe Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 22 Feb 2018 20:46:02 +0530 Subject: [PATCH 13/17] uncomment url --- digitalglarus/urls.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index 92cd8e11..64a63303 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -14,7 +14,8 @@ from .views import ContactView, IndexView, HistoryView, LoginView, SignupView,\ # from membership.views import LoginRegistrationView urlpatterns = [ - url(_(r'booking/payment/edit/?$'), EditCreditCardView.as_view(), name='edit_credit_card'), + url(_(r'booking/payment/edit/?$'), + EditCreditCardView.as_view(), name='edit_credit_card'), url(_(r'^$'), IndexView.as_view(), name='landing'), # url(_(r'new_credit_card/?$'), TermsAndConditions, name='TermsAndConditions'), url(_(r'support-us/?$'), SupportusView.as_view(), name='supportus'), @@ -30,14 +31,16 @@ urlpatterns = [ url(_(r'users/billing_address/?$'), UserBillingAddressView.as_view(), name='user_billing_address'), url(_(r'booking/?$'), BookingSelectDatesView.as_view(), name='booking'), - url(_(r'booking/payment/?$'), BookingPaymentView.as_view(), name='booking_payment'), + url(_(r'booking/payment/?$'), + BookingPaymentView.as_view(), name='booking_payment'), url(_(r'booking/orders/(?P\d+)/?$'), OrdersBookingDetailView.as_view(), name='booking_orders_detail'), # url(_(r'booking/orders/(?P\d+)/cancel/?$'), BookingCancelView.as_view(), # name='booking_orders_cancel'), url(_(r'booking/orders/?$'), BookingOrdersListView.as_view(), name='booking_orders_list'), - url(_(r'membership/payment/?$'), MembershipPaymentView.as_view(), name='membership_payment'), + url(_(r'membership/payment/?$'), + MembershipPaymentView.as_view(), name='membership_payment'), url(_(r'membership/activated/?$'), MembershipActivatedView.as_view(), name='membership_activated'), url(_(r'membership/deactivate/?$'), MembershipDeactivateView.as_view(), @@ -53,7 +56,7 @@ urlpatterns = [ url(_(r'membership/orders/?$'), MembershipOrdersListView.as_view(), name='membership_orders_list'), url(_(r'supporters/?$'), views.supporters, name='supporters'), - # url(_(r'support-us/?$'), views.support, name='support'), + url(_(r'support-us/?$'), views.support, name='support'), url(r'^blog/(?P\w[-\w]*)/$', views.blog_detail, name='blog-detail'), url(r'blog/$', views.blog, name='blog'), ] From 35d6fd8fd33ec3f102d2731102d13fb4ab178b2c Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 22 Feb 2018 17:53:47 +0100 Subject: [PATCH 14/17] Remove datacenterlight/order-success urlconf, view and template as we are not using it anymore --- .../templates/datacenterlight/success.html | 32 ------------------- datacenterlight/urls.py | 4 +-- datacenterlight/views.py | 20 ------------ 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 datacenterlight/templates/datacenterlight/success.html diff --git a/datacenterlight/templates/datacenterlight/success.html b/datacenterlight/templates/datacenterlight/success.html deleted file mode 100644 index ff553f3c..00000000 --- a/datacenterlight/templates/datacenterlight/success.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "datacenterlight/base.html" %} -{% load staticfiles i18n %} -{% block content %} - -
- -
-

{% trans "Thank you for order! Our team will contact you via email" %}

- {% if LANGUAGE_CODE == 'en-us'%} -

{% trans "as soon as possible!" %}

- {% endif %} -
- -
- - - -{% endblock %} \ No newline at end of file diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index b6497f50..b2aab8de 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,8 +1,7 @@ from django.conf.urls import url from .views import ( - IndexView, LandingProgramView, - SuccessView, PaymentOrderView, OrderConfirmationView, + IndexView, LandingProgramView,PaymentOrderView, OrderConfirmationView, WhyDataCenterLightView, ContactUsView ) @@ -21,7 +20,6 @@ urlpatterns = [ url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'), url(r'^order-confirmation/?$', OrderConfirmationView.as_view(), name='order_confirmation'), - url(r'^order-success/?$', SuccessView.as_view(), name='order_success'), url(r'^contact/?$', ContactUsView.as_view(), name='contact_us'), url(r'glasfaser/?$', TemplateView.as_view(template_name='ungleich_page/glasfaser.html'), diff --git a/datacenterlight/views.py b/datacenterlight/views.py index c22d82a5..25374dfb 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -78,26 +78,6 @@ class LandingProgramView(TemplateView): template_name = "datacenterlight/landing.html" -class SuccessView(TemplateView): - template_name = "datacenterlight/success.html" - - def get(self, request, *args, **kwargs): - if 'specs' not in request.session or 'user' not in request.session: - return HttpResponseRedirect(reverse('datacenterlight:index')) - elif 'token' not in request.session: - return HttpResponseRedirect(reverse('datacenterlight:payment')) - elif 'order_confirmation' not in request.session: - return HttpResponseRedirect( - reverse('datacenterlight:order_confirmation')) - else: - for session_var in ['specs', 'user', 'template', 'billing_address', - 'billing_address_data', - 'token', 'customer']: - if session_var in request.session: - del request.session[session_var] - return render(request, self.template_name) - - class IndexView(CreateView): template_name = "datacenterlight/index.html" success_url = "/datacenterlight#requestform" From 74a8a28c52033c4f3f395ef01a9a29f148a3fcce Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 22 Feb 2018 18:20:12 +0100 Subject: [PATCH 15/17] Reorganize imports and fix flake8 error --- datacenterlight/urls.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index b2aab8de..a93a24d0 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,12 +1,10 @@ from django.conf.urls import url - -from .views import ( - IndexView, LandingProgramView,PaymentOrderView, OrderConfirmationView, - WhyDataCenterLightView, ContactUsView -) - from django.views.generic import TemplateView +from .views import ( + IndexView, LandingProgramView, PaymentOrderView, OrderConfirmationView, + WhyDataCenterLightView, ContactUsView +) urlpatterns = [ url(r'^$', IndexView.as_view(), name='index'), From 9e33168d302d82b9e3e5c102da4383ea41deec26 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 22 Feb 2018 23:42:19 +0100 Subject: [PATCH 16/17] Update Changelog --- Changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog b/Changelog index 21c9c243..3fc3cc6f 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +Next: + * #3798: [dg] Redirect user to digital glarus on clicking logo in the email + * #3554: [dcl] Remove beta access resources 1.4: 2018-02-22 * #4104: [cms, nuglarus] Multisite and access control of cms pages per user 1.3.3: 2018-02-21 From 1e9716cfe6bf49c890dcc27872d5a7384da8ebe4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 23 Feb 2018 07:37:59 +0100 Subject: [PATCH 17/17] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 3fc3cc6f..b48cadd5 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,7 @@ Next: * #3798: [dg] Redirect user to digital glarus on clicking logo in the email * #3554: [dcl] Remove beta access resources + * #4166: [glasfaser] heading text not to be blocked by topnav on mobile after navbar menu click 1.4: 2018-02-22 * #4104: [cms, nuglarus] Multisite and access control of cms pages per user 1.3.3: 2018-02-21