From d2beef203257436b67ed6f351735f19d6f0e4a8b Mon Sep 17 00:00:00 2001 From: Andrii Marynets Date: Thu, 3 Aug 2017 00:24:16 +0300 Subject: [PATCH 01/33] Add parameter to function for TravisCI --- membership/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/membership/models.py b/membership/models.py index a84d12ca..6b6f4413 100644 --- a/membership/models.py +++ b/membership/models.py @@ -19,7 +19,7 @@ REGISTRATION_MESSAGE = {'subject': "Validation mail", 'from': 'test@test.com'} -def get_anonymous_user_instance(): +def get_anonymous_user_instance(CustomUser): return CustomUser(name='Anonymous', email='anonymous@ungleich.ch', validation_slug=make_password(None)) From 34acf2310b484920b6dd93fca030d88030128ad8 Mon Sep 17 00:00:00 2001 From: Siarhei Puhach Date: Thu, 3 Aug 2017 12:47:34 +0300 Subject: [PATCH 02/33] Added stripe failed payment error handler --- datacenterlight/views.py | 4 ++++ hosting/templates/hosting/payment.html | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 10e2d791..7dd2a76f 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -426,6 +426,10 @@ class OrderConfirmationView(DetailView): customer = StripeCustomer.objects.filter(id=stripe_customer_id).first() stripe_utils = StripeUtils() card_details = stripe_utils.get_card_details(customer.stripe_id, request.session.get('token')) + if not card_details.get('response_object') and not card_details.get('paid'): + msg = _('Currently its not possible to make payments. Please try later.') + messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') + return HttpResponseRedirect(reverse('datacenterlight:payment')) context = { 'site_url': reverse('datacenterlight:index'), 'cc_last4': card_details.get('response_object').get('last4'), diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index d03713c1..5ef7f1ce 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -49,6 +49,15 @@ +
+ {% for message in messages %} + {% if 'failed_payment' in message.tags %} +
  • +

    {{ message|safe }}

    +
+ {% endif %} + {% endfor %} +
From 60d107baeeba504a4e7a621847f1d62478c0562b Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 3 Aug 2017 15:07:36 +0200 Subject: [PATCH 03/33] Improved the condition about when to generate ssh keys --- hosting/forms.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hosting/forms.py b/hosting/forms.py index c2b86e3e..d9812995 100644 --- a/hosting/forms.py +++ b/hosting/forms.py @@ -14,7 +14,6 @@ def generate_ssh_key_name(): class HostingUserLoginForm(forms.Form): - email = forms.CharField(widget=forms.EmailInput()) password = forms.CharField(widget=forms.PasswordInput()) @@ -45,7 +44,6 @@ class HostingUserLoginForm(forms.Form): class HostingUserSignupForm(forms.ModelForm): - confirm_password = forms.CharField(widget=forms.PasswordInput()) password = forms.CharField(widget=forms.PasswordInput()) @@ -88,9 +86,8 @@ class UserHostingKeyForm(forms.ModelForm): def clean(self): cleaned_data = self.cleaned_data - if not self.cleaned_data.get('name', ''): + if 'generate' in self.request.POST: self.cleaned_data['name'] = generate_ssh_key_name() - if not cleaned_data.get('public_key'): private_key, public_key = UserHostingKey.generate_keys() cleaned_data.update({ 'private_key': private_key, From 29fb771afb3aa787d0fec7203f4cde0a1c8f50ff Mon Sep 17 00:00:00 2001 From: Siarhei Puhach Date: Fri, 4 Aug 2017 11:01:32 +0300 Subject: [PATCH 04/33] Changed payment error place, changed message source to Stripe errors handler --- datacenterlight/views.py | 2 +- hosting/templates/hosting/payment.html | 32 ++++++++++++++------------ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 7dd2a76f..993cb508 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -427,7 +427,7 @@ class OrderConfirmationView(DetailView): stripe_utils = StripeUtils() card_details = stripe_utils.get_card_details(customer.stripe_id, request.session.get('token')) if not card_details.get('response_object') and not card_details.get('paid'): - msg = _('Currently its not possible to make payments. Please try later.') + msg = card_details.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') return HttpResponseRedirect(reverse('datacenterlight:payment')) context = { diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 5ef7f1ce..acb5d389 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -49,15 +49,6 @@
-
- {% for message in messages %} - {% if 'failed_payment' in message.tags %} -
  • -

    {{ message|safe }}

    -
- {% endif %} - {% endfor %} -
@@ -139,12 +130,23 @@
-

- {% blocktrans %} - You are not making any payment yet. After submitting your card - information, you will be taken to the Confirm Order Page. - {% endblocktrans %} -

+ {% if not messages %} +

+ {% blocktrans %} + You are not making any payment yet. After submitting your card + information, you will be taken to the Confirm Order Page. + {% endblocktrans %} +

+ {% endif %} +
+ {% for message in messages %} + {% if 'failed_payment' in message.tags %} +
  • +

    {{ message|safe }}

    +
+ {% endif %} + {% endfor %} +
From 8769c4cd1f6106ab7526be17e3c256bd28529374 Mon Sep 17 00:00:00 2001 From: Siarhei Puhach Date: Fri, 4 Aug 2017 12:38:24 +0300 Subject: [PATCH 05/33] Changed payment error message style --- hosting/static/hosting/css/landing-page.css | 6 +++++- hosting/templates/hosting/payment.html | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index a7d69094..49471bc8 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -537,6 +537,10 @@ a.unlink:hover { border-radius: 3px; padding: 5px; } +.card-warning-error { + border: 1px solid #EB4D5C; + color: #EB4D5C; +} .stripe-payment-btn { outline: none; @@ -718,4 +722,4 @@ a.unlink:hover { .footer-light a:hover, .footer-light a:focus, .footer-light a:active { color: #ddd; -} \ No newline at end of file +} diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index acb5d389..ac9ab41b 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -138,11 +138,11 @@ {% endblocktrans %}

{% endif %} -
+
{% for message in messages %} {% if 'failed_payment' in message.tags %}
  • -

    {{ message|safe }}

    +

    {{ message|safe }}

{% endif %} {% endfor %} From c6b23f6aa0dcacb6e0f3b75ada4bcc12f7c25924 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 4 Aug 2017 20:54:28 +0530 Subject: [PATCH 06/33] Added get_object method to verify if the user is the owner of the ssh key --- hosting/views.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hosting/views.py b/hosting/views.py index 19ec5b2a..33477b50 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -342,6 +342,13 @@ class SSHKeyDeleteView(LoginRequiredMixin, DeleteView): success_url = reverse_lazy('hosting:ssh_keys') model = UserHostingKey + def get_object(self, queryset=None): + """ Hook to ensure object is owned by request.user. """ + obj = super(SSHKeyDeleteView, self).get_object() + if not obj.owner == self.request.user: + raise Http404 + return obj + def delete(self, request, *args, **kwargs): owner = self.request.user manager = OpenNebulaManager() From d85afd56e083c1da1a30001338fccb3343af5fd2 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 4 Aug 2017 17:49:35 +0200 Subject: [PATCH 07/33] Fixed an issue - Changed owner -> user - Reformatted code --- hosting/views.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 33477b50..f5fbd0a7 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -210,9 +210,9 @@ class SignupValidateView(TemplateView): def get_context_data(self, **kwargs): context = super(SignupValidateView, self).get_context_data(**kwargs) login_url = '' + str(_('login')) + '' + reverse('hosting:login') + '">' + str(_('login')) + '' home_url = 'Data Center Light' + reverse('datacenterlight:index') + '">Data Center Light' message = '{signup_success_message} {lurl} \
{go_back} {hurl}.'.format( signup_success_message=_( @@ -234,7 +234,7 @@ class SignupValidatedView(SignupValidateView): context = super(SignupValidateView, self).get_context_data(**kwargs) validated = CustomUser.validate_url(self.kwargs['validate_slug']) login_url = '' + str(_('login')) + '' + reverse('hosting:login') + '">' + str(_('login')) + '' section_title = _('Account activation') if validated: message = '{account_activation_string}
{login_string} {lurl}.'.format( @@ -244,7 +244,7 @@ class SignupValidatedView(SignupValidateView): lurl=login_url) else: home_url = 'Data Center Light' + reverse('datacenterlight:index') + '">Data Center Light' message = '{sorry_message}
{go_back_to} {hurl}'.format( sorry_message=_("Sorry. Your request is invalid."), go_back_to=_('Go back to'), @@ -343,9 +343,11 @@ class SSHKeyDeleteView(LoginRequiredMixin, DeleteView): model = UserHostingKey def get_object(self, queryset=None): - """ Hook to ensure object is owned by request.user. """ + """ Hook to ensure UserHostingKey object is owned by request.user. + We reply with a Http404 if the user is not the owner of the key. + """ obj = super(SSHKeyDeleteView, self).get_object() - if not obj.owner == self.request.user: + if not obj.user == self.request.user: raise Http404 return obj From 4de04b2663c47d5e367e84570faf39288e49ae5e Mon Sep 17 00:00:00 2001 From: Siarhei Puhach Date: Mon, 7 Aug 2017 09:56:57 +0300 Subject: [PATCH 08/33] Changed visa card error placement --- hosting/templates/hosting/payment.html | 6 ++++-- utils/stripe_utils.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 41c6d3eb..449962a5 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -59,7 +59,6 @@ {% csrf_token %} {% bootstrap_field field show_label=False type='fields'%} {% endfor %} - {% bootstrap_form_errors form type='non_fields'%}
@@ -130,7 +129,7 @@
- {% if not messages %} + {% if not messages and not form.errors %}

{% blocktrans %} You are not making any payment yet. After submitting your card @@ -146,6 +145,9 @@ {% endif %} {% endfor %} + {% if form.errors %} + {% bootstrap_form_errors form type='non_fields'%} + {% endif %}

diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index d46cf54d..f7d52157 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -11,7 +11,7 @@ def handleStripeError(f): 'error': None } - common_message = "Currently its not possible to make payments." + common_message = "Currently it's not possible to make payments." try: response_object = f(*args, **kwargs) response = { From 4fea099b5d8cba24e6a39a35a3a38961e4db9a5b Mon Sep 17 00:00:00 2001 From: Siarhei Puhach Date: Mon, 7 Aug 2017 10:05:12 +0300 Subject: [PATCH 09/33] Changed invalid credit card error style --- hosting/templates/hosting/payment.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 449962a5..cb7a4d8c 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -145,8 +145,13 @@ {% endif %} {% endfor %} + {% if form.errors %} - {% bootstrap_form_errors form type='non_fields'%} + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %} {% endif %}
From 4cd3d6a4aada182b3d88ec7a6f6e2743278a7754 Mon Sep 17 00:00:00 2001 From: Siarhei Puhach Date: Mon, 7 Aug 2017 13:36:21 +0300 Subject: [PATCH 10/33] Added stripe make_charge error handler --- datacenterlight/views.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index dcf64814..d82522e9 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -467,15 +467,12 @@ class OrderConfirmationView(DetailView): stripe_utils = StripeUtils() charge_response = stripe_utils.make_charge(amount=final_price, customer=customer.stripe_id) - charge = charge_response.get('response_object') # Check if the payment was approved - if not charge: - context = {} - context.update({ - 'paymentError': charge_response.get('error') - }) - return render(request, self.payment_template_name, context) + if not charge_response.get('response_object') and not charge_response.get('paid'): + msg = charge_response.get('error') + messages.add_message(self.request, messages.ERROR, msg, extra_tags='make_charge_error') + return HttpResponseRedirect(reverse('datacenterlight:payment')) charge = charge_response.get('response_object') From a71ccbc56615d2f8370d912ae8e4702b261144ed Mon Sep 17 00:00:00 2001 From: Siarhei Puhach Date: Mon, 7 Aug 2017 17:02:47 +0300 Subject: [PATCH 11/33] Added error hash in url, added payment error handler to hosting/views --- datacenterlight/views.py | 4 +- hosting/templates/hosting/payment.html | 57 ++++++++++++++------------ hosting/views.py | 11 ++--- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index d82522e9..b20b212f 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -441,7 +441,7 @@ class OrderConfirmationView(DetailView): if not card_details.get('response_object') and not card_details.get('paid'): msg = card_details.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') - return HttpResponseRedirect(reverse('datacenterlight:payment')) + return HttpResponseRedirect(reverse('datacenterlight:payment') + '#dcl_payment_error') context = { 'site_url': reverse('datacenterlight:index'), @@ -472,7 +472,7 @@ class OrderConfirmationView(DetailView): if not charge_response.get('response_object') and not charge_response.get('paid'): msg = charge_response.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='make_charge_error') - return HttpResponseRedirect(reverse('datacenterlight:payment')) + return HttpResponseRedirect(reverse('datacenterlight:payment') + '#dcl_payment_error') charge = charge_response.get('response_object') diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index cb7a4d8c..4c4ffa62 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -85,13 +85,29 @@
-

- {% blocktrans %} - You are not making any payment yet. After submitting your card - information, you will be taken to the Confirm Order Page. - {% endblocktrans %} -

-
+ {% if not messages and not form.non_field_errors %} +

+ {% blocktrans %} + You are not making any payment yet. After submitting your card + information, you will be taken to the Confirm Order Page. + {% endblocktrans %} +

+ {% endif %} +
+ {% for message in messages %} + {% if 'failed_payment' or 'make_charge_error' in message.tags %} +
  • +

    {{ message|safe }}

    +
+ {% endif %} + {% endfor %} + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %} +
+
- {% if not messages and not form.errors %} + {% if not messages and not form.non_field_errors %}

{% blocktrans %} You are not making any payment yet. After submitting your card @@ -137,22 +153,20 @@ {% endblocktrans %}

{% endif %} -
+
{% for message in messages %} - {% if 'failed_payment' in message.tags %} + {% if 'failed_payment' or 'make_charge_error' in message.tags %}

  • {{ message|safe }}

{% endif %} {% endfor %} - {% if form.errors %} - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %} - {% endif %} + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %}
@@ -168,15 +182,6 @@

- {% if paymentError %} -
-
-

- {% bootstrap_alert paymentError alert_type='danger' %} -

-
-
- {% endif %} {% endif %} diff --git a/hosting/views.py b/hosting/views.py index 19ec5b2a..d1666b04 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -557,15 +557,12 @@ class PaymentVMView(LoginRequiredMixin, FormView): stripe_utils = StripeUtils() charge_response = stripe_utils.make_charge(amount=final_price, customer=customer.stripe_id) - charge = charge_response.get('response_object') # Check if the payment was approved - if not charge: - context.update({ - 'paymentError': charge_response.get('error'), - 'form': form - }) - return render(request, self.template_name, context) + if not charge_response.get('response_object') and not charge_response.get('paid'): + msg = charge_response.get('error') + messages.add_message(self.request, messages.ERROR, msg, extra_tags='make_charge_error') + return HttpResponseRedirect(reverse('hosting:payment') + '#hosting_payment_error') charge = charge_response.get('response_object') From 72ddfd96ab0fad277a1471ba3c723c6c5ff4fc45 Mon Sep 17 00:00:00 2001 From: Siarhei Puhach Date: Mon, 7 Aug 2017 17:23:58 +0300 Subject: [PATCH 12/33] Payment error was unified --- datacenterlight/views.py | 4 ++-- hosting/templates/hosting/payment.html | 4 ++-- hosting/views.py | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index b20b212f..929b0833 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -441,7 +441,7 @@ class OrderConfirmationView(DetailView): if not card_details.get('response_object') and not card_details.get('paid'): msg = card_details.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') - return HttpResponseRedirect(reverse('datacenterlight:payment') + '#dcl_payment_error') + return HttpResponseRedirect(reverse('datacenterlight:payment') + '#payment_error') context = { 'site_url': reverse('datacenterlight:index'), @@ -472,7 +472,7 @@ class OrderConfirmationView(DetailView): if not charge_response.get('response_object') and not charge_response.get('paid'): msg = charge_response.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='make_charge_error') - return HttpResponseRedirect(reverse('datacenterlight:payment') + '#dcl_payment_error') + return HttpResponseRedirect(reverse('datacenterlight:payment') + '#payment_error') charge = charge_response.get('response_object') diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 4c4ffa62..7bf84645 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -93,7 +93,7 @@ {% endblocktrans %}

{% endif %} -
+
{% for message in messages %} {% if 'failed_payment' or 'make_charge_error' in message.tags %}
  • @@ -153,7 +153,7 @@ {% endblocktrans %}

    {% endif %} -
    +
    {% for message in messages %} {% if 'failed_payment' or 'make_charge_error' in message.tags %}
    • diff --git a/hosting/views.py b/hosting/views.py index d1666b04..c5877ca2 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -547,8 +547,9 @@ class PaymentVMView(LoginRequiredMixin, FormView): customer = StripeCustomer.get_or_create(email=owner.email, token=token) if not customer: - form.add_error("__all__", "Invalid credit card") - return self.render_to_response(self.get_context_data(form=form)) + msg = _("Invalid credit card") + messages.add_message(self.request, messages.ERROR, msg, extra_tags='make_charge_error') + return HttpResponseRedirect(reverse('hosting:payment') + '#payment_error') # Create Billing Address billing_address = form.save() @@ -562,7 +563,7 @@ class PaymentVMView(LoginRequiredMixin, FormView): if not charge_response.get('response_object') and not charge_response.get('paid'): msg = charge_response.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='make_charge_error') - return HttpResponseRedirect(reverse('hosting:payment') + '#hosting_payment_error') + return HttpResponseRedirect(reverse('hosting:payment') + '#payment_error') charge = charge_response.get('response_object') From 6c4e0067ba8269f7606fdfa35cb46e36b4e9e5df Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 8 Aug 2017 00:35:58 +0530 Subject: [PATCH 13/33] font-family changed to 'Lato' in all css files --- .../datacenterlight/css/landing-page.css | 52 +++++++++++------- hosting/static/hosting/css/commons.css | 3 +- hosting/static/hosting/css/landing-page.css | 19 ++++--- hosting/static/hosting/css/pricing.css | 2 +- hosting/static/hosting/css/user_keys.css | 53 ++++++++++--------- 5 files changed, 77 insertions(+), 52 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 6c813661..c693247c 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -4,10 +4,10 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ -@font-face { +/*@font-face { font-family: 'Lato-Light'; src: url('../fonts/Lato/Lato-Light.ttf'); -} +}*/ body, html { @@ -22,7 +22,12 @@ h3, h4, h5, h6 { - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-family: 'Lato', sans-serif; + font-weight: 300; +} + +button, input, optgroup, select, textarea { font-weight: 300; } @@ -143,13 +148,15 @@ h6 { .navbar-default .navbar-nav>li>a { cursor: pointer; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .navbar-transparent .navbar-nav>li>a { color: #fff; cursor: pointer; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .navbar-transparent .navbar-nav>li>a:hover { @@ -202,13 +209,15 @@ h6 { .navbar-transparent .nav-language .select-language { color: #fff; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .nav-language .select-language span { margin-left: 5px; margin-right: 5px; - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ + font-weight: normal; } .nav-language .drop-language{ /*position: absolute;*/ @@ -237,7 +246,8 @@ h6 { .nav-language .drop-language a{ cursor: pointer; padding: 5px 10px !important; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } /* Show the dropdown menu on hover */ @@ -260,7 +270,8 @@ h6 { .navbar-transparent .nav-language .drop-language a { color: #fff; padding: 5px 10px !important; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } /* .nav-language:hover .drop-language{ display: block; @@ -343,7 +354,7 @@ h6 { .intro-message>h1 { margin: 0; - font-weight: 400; + font-weight: 300; font-size: 6em; } @@ -792,7 +803,8 @@ tech-sub-sec h2 { } .percent-text { - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ +/* font-weight: normal; */ font-size: 50px; color: #999; } @@ -879,7 +891,7 @@ tech-sub-sec h2 { .dropdown-menu>li>a { font-size: 13px; font-weight: 300; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ } .navbar-default .navbar-nav>.active>a, @@ -898,7 +910,8 @@ tech-sub-sec h2 { background: -webkit-linear-gradient(top, #f0f4f7, #fff) no-repeat; background: linear-gradient(to bottom, #f0f4f7, #fff) no-repeat; display: flex; - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ +/* font-weight: normal; */ } .price-calc-section .text { @@ -963,7 +976,8 @@ tech-sub-sec h2 { } .price-calc-section .card .title h3 { - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ + font-weight: normal; } .price-calc-section .card .price { @@ -1050,8 +1064,9 @@ tech-sub-sec h2 { .price-calc-section .card .description.input label { font-size: 15px; - font-weight: 800; - font-family: 'Lato'; + font-weight: 700; + /*font-weight: 800;*/ + /*font-family: 'Lato';*/ margin-bottom: 0; width: 40px; } @@ -1364,7 +1379,8 @@ tech-sub-sec h2 { padding: 30px; } .percent-text { - font-family: 'Lato'; + /*font-family: 'Lato';*/ + font-weight: normal; font-size: 37px; /* text-align: center; */ } @@ -1402,7 +1418,7 @@ tech-sub-sec h2 { .network-name { text-transform: uppercase; font-size: 14px; - font-weight: 400; + font-weight: 300; letter-spacing: 2px; } diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 79053e4e..2dd5637a 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -115,7 +115,8 @@ line-height: 1.42857143; font-size: 25px; padding: 0; - font-family: 'Lato', sans-serif; + /*font-family: 'Lato', sans-serif;*/ + font-weight: normal; } .modal-text { padding-top: 15px; diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index d17ef8f2..ee9fea36 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -4,7 +4,7 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ -@font-face { +/*@font-face { font-family: 'Lato-Regular'; src: url('../fonts/Lato/Lato-Regular.ttf'); } @@ -16,7 +16,7 @@ @font-face { font-family: 'Lato-Light'; src: url('../fonts/Lato/Lato-Light.ttf'); -} +}*/ body, html { @@ -31,7 +31,8 @@ h3, h4, h5, h6 { - font-family: 'Lato-Regular', sans-serif; + /*font-family: 'Lato-Regular', sans-serif;*/ + font-family: 'Lato', sans-serif; font-weight: 300; } @@ -53,7 +54,8 @@ h6 { .navbar-transparent .navbar-nav>li>a { color: #fff; cursor: pointer; - font-family: 'Lato-Regular', sans-serif; + /*font-family: 'Lato-Regular', sans-serif;*/ + font-weight: normal; } .navbar-transparent .navbar-nav>li>a:hover { color: #fff; @@ -376,7 +378,8 @@ h6 { text-align: center; font-size: 18px; line-height: 30px; - font-family: 'Lato' !important; + /*font-family: 'Lato' !important;*/ + font-weight: normal !important; } .sign-up-message a { @@ -488,7 +491,8 @@ a.unlink:hover { /***** DCL payment page **********/ .dcl-order-container { - font-family: Lato; + /*font-family: Lato;*/ + font-weight: normal; } .dcl-order-table-header { @@ -547,7 +551,8 @@ a.unlink:hover { } .card-warning-content { - font-family: Lato; + /*font-family: Lato;*/ + font-weight: normal; border: 1px solid #a1a1a1; border-radius: 3px; padding: 5px; diff --git a/hosting/static/hosting/css/pricing.css b/hosting/static/hosting/css/pricing.css index 8eba7ffa..3c952209 100644 --- a/hosting/static/hosting/css/pricing.css +++ b/hosting/static/hosting/css/pricing.css @@ -9,7 +9,7 @@ font-size: 14px; padding-left: 0; margin-bottom: 30px; - font-family: 'Lato'; + font-family: Lato, sans-serif; } diff --git a/hosting/static/hosting/css/user_keys.css b/hosting/static/hosting/css/user_keys.css index 77a12155..a3d4526a 100644 --- a/hosting/static/hosting/css/user_keys.css +++ b/hosting/static/hosting/css/user_keys.css @@ -1,6 +1,6 @@ /* ssh_keys_choice */ .h1-thin { - font-family: Lato, sans-serif; + /*font-family: Lato, sans-serif;*/ font-weight: 300; font-size: 32px; } @@ -10,12 +10,12 @@ } .dashboard-choice-container .page-header p { font-size: 16px; - font-family: Lato, sans-serif; + /*font-family: Lato, sans-serif;*/ font-weight: 300; } .dashboard-choice-container h2 { - font-family: Lato, sans-serif; - font-weight: 400; + /*font-family: Lato, sans-serif; + font-weight: 400;*/ font-size: 22px; margin-top: 0; } @@ -26,7 +26,7 @@ } .choice-container p{ font-size: 18px; - font-family: Lato, sans-serif; + /*font-family: Lato, sans-serif;*/ font-weight: 300; } .choice-container-top { @@ -119,7 +119,7 @@ color: #717274; font-size: 16px; font-weight: 300; - font-family: 'Lato'; + /*font-family: 'Lato';*/ } .borderless tbody:before { @@ -195,7 +195,8 @@ border-bottom: 1px solid grey; box-shadow: none; border-radius: 0; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; font-size: 20px; padding-left: 0; } @@ -203,57 +204,58 @@ .form_key_name::-webkit-input-placeholder{ font-size: 20px; font-weight:100; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_key_name::-moz-input-placeholder{ font-size: 20px; - font-weight:200; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_key_name:-moz-input-placeholder{ - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; font-size: 20px; - font-weight:200; } .form_key_name:-ms-input-placeholder { font-size: 20px; - font-family: 'Lato-Light', sans-serif; - font-weight:200; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_public_key::-webkit-input-placeholder{ position: relative; top: 110px; font-size: 20px; - font-weight: 200; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_public_key::-moz-input-placeholder{ position: relative; top: 110px; font-size: 20px; - font-family: 'Lato-Light', sans-serif; - font-weight:200; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_public_key:-moz-input-placeholder{ position: relative; top: 110px; font-size: 20px; - font-weight:200; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .form_public_key:-ms-input-placeholder { position: relative; top: 110px; font-size: 20px; - font-weight:200; - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .underform-contaner{ margin-bottom: 20px; @@ -273,7 +275,8 @@ } } .underform-contaner h4{ - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; } .underform-contaner button{ /* font-family: Lato; */ @@ -287,9 +290,9 @@ color: #fff; } .control-label{ - font-family: 'Lato-Light', sans-serif; + /*font-family: 'Lato-Light', sans-serif;*/ + font-weight: 300; font-size: 20px; - font-weight:200; } .form-ssh h3{ margin-bottom: 40px; From cc58c494573b4f49abe866257b6125cbff3cfdbb Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 8 Aug 2017 00:51:54 +0530 Subject: [PATCH 14/33] font-weight fix in hosting app --- hosting/static/hosting/css/landing-page.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index ee9fea36..600ee20c 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -33,7 +33,7 @@ h5, h6 { /*font-family: 'Lato-Regular', sans-serif;*/ font-family: 'Lato', sans-serif; - font-weight: 300; + /*font-weight: 300;*/ } .topnav { @@ -379,7 +379,7 @@ h6 { font-size: 18px; line-height: 30px; /*font-family: 'Lato' !important;*/ - font-weight: normal !important; + font-weight: 300 !important; } .sign-up-message a { @@ -492,7 +492,7 @@ a.unlink:hover { /***** DCL payment page **********/ .dcl-order-container { /*font-family: Lato;*/ - font-weight: normal; + font-weight: 300; } .dcl-order-table-header { @@ -552,7 +552,7 @@ a.unlink:hover { .card-warning-content { /*font-family: Lato;*/ - font-weight: normal; + font-weight: 300; border: 1px solid #a1a1a1; border-radius: 3px; padding: 5px; From ac0787bdd597979830bd9fbdbe27d04f3237e34f Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 8 Aug 2017 23:01:19 +0530 Subject: [PATCH 15/33] modal title font-weight and capitalization fix --- hosting/locale/de/LC_MESSAGES/django.po | 2 +- hosting/static/hosting/css/commons.css | 5 ++++- hosting/templates/hosting/user_keys.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 0e777a19..4b886cae 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -393,7 +393,7 @@ msgstr "" msgid "Delete SSH Key" msgstr "SSH Key löschen" -msgid "Do You want to delete this key?" +msgid "Do you want to delete this key?" msgstr "Möchtest Du den Schlüssel löschen?" msgid "Show" diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 2dd5637a..2b147f8b 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -110,13 +110,16 @@ font-weight: 100; color: #999; } +.modal-body .modal-icon { + margin-bottom: 10px; +} .modal-title { margin: 0; line-height: 1.42857143; font-size: 25px; padding: 0; /*font-family: 'Lato', sans-serif;*/ - font-weight: normal; + font-weight: 300; } .modal-text { padding-top: 15px; diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html index 2125bd9f..dcb04c83 100644 --- a/hosting/templates/hosting/user_keys.html +++ b/hosting/templates/hosting/user_keys.html @@ -50,7 +50,7 @@
      -

      {% trans "Do You want to delete this key?"%}

      +

      {% trans "Do you want to delete this key?"%}

      {% csrf_token %}
      From debfafaf26ce611bdb432f81d74ab519b526a400 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 10 Aug 2017 23:14:51 +0530 Subject: [PATCH 16/33] Added migration file for missing card holder's name in utils_billing_address --- utils/migrations/0006_auto_20170810_1742.py | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 utils/migrations/0006_auto_20170810_1742.py diff --git a/utils/migrations/0006_auto_20170810_1742.py b/utils/migrations/0006_auto_20170810_1742.py new file mode 100644 index 00000000..a35f8a4c --- /dev/null +++ b/utils/migrations/0006_auto_20170810_1742.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-08-10 17:42 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('utils', '0005_auto_20170322_1443'), + ] + + operations = [ + migrations.AddField( + model_name='billingaddress', + name='cardholder_name', + field=models.CharField(default='', max_length=100), + ), + migrations.AddField( + model_name='userbillingaddress', + name='cardholder_name', + field=models.CharField(default='', max_length=100), + ), + ] From 3ccbf3a3ac0cebaea3d82f18c4d1a3fad72d9d60 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Fri, 11 Aug 2017 01:49:41 +0530 Subject: [PATCH 17/33] ssh modal key word-break fixed so that it wraps --- hosting/locale/de/LC_MESSAGES/django.po | 6 +++--- hosting/static/hosting/css/user_keys.css | 3 +++ hosting/templates/hosting/user_keys.html | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 0e777a19..206ac3b7 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-04 18:25+0000\n" +"POT-Creation-Date: 2017-08-11 01:16+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -399,8 +399,8 @@ msgstr "Möchtest Du den Schlüssel löschen?" msgid "Show" msgstr "Anzeigen" -msgid "Public ssh key" -msgstr "" +msgid "Public SSH Key" +msgstr "Public SSH Key" msgid "Download" msgstr "" diff --git a/hosting/static/hosting/css/user_keys.css b/hosting/static/hosting/css/user_keys.css index 77a12155..94921c97 100644 --- a/hosting/static/hosting/css/user_keys.css +++ b/hosting/static/hosting/css/user_keys.css @@ -294,6 +294,9 @@ .form-ssh h3{ margin-bottom: 40px; } +.key_contain { + word-break: break-all; +} .custom_form_button{ border-radius: 0; } diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html index 2125bd9f..2b188b88 100644 --- a/hosting/templates/hosting/user_keys.html +++ b/hosting/templates/hosting/user_keys.html @@ -77,8 +77,8 @@
      - -

      {{ user_key.public_key }}

      + +

      {{ user_key.public_key }}

      From f8ce8f975f7ee301c5587daeaab31dbe7cb98008 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Sat, 12 Aug 2017 00:49:20 +0530 Subject: [PATCH 18/33] footer fix on hosting --- hosting/static/hosting/css/commons.css | 2 +- .../templates/hosting/virtual_machines.html | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 79053e4e..be43ac10 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -7,7 +7,7 @@ } .content-dashboard{ - min-height: calc(100vh - 120px); + min-height: calc(100vh - 70px); width: 80%; margin: 0 auto; max-width: 1120px; diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html index cf92f52f..c149be41 100644 --- a/hosting/templates/hosting/virtual_machines.html +++ b/hosting/templates/hosting/virtual_machines.html @@ -1,12 +1,12 @@ {% extends "hosting/base_short.html" %} {% load staticfiles bootstrap3 i18n %} -{% block content %} +{% block content %}
      - -

      {% trans "Virtual Machines"%}

      +
      +

      {% trans "Virtual Machines"%}


      {% if messages %} @@ -19,12 +19,12 @@
      {% if not error %}

      - {% trans "Create VM"%} + {% trans "Create VM"%}


      - - - + + + @@ -32,36 +32,36 @@ - + {% for vm in vms %} - + {% if vm.ipv6 %} - - - + + + {% endif %} + {% endfor %} - -
      {% trans "ID"%} {% trans "Ipv4"%} {% trans "Ipv6"%}
      {{vm.vm_id}}{{vm.vm_id}}{{vm.ipv4}}{{vm.ipv6}}{{vm.ipv4}}{{vm.ipv6}} - + {% if vm.state == 'ACTIVE' %} {{vm.state}} {% elif vm.state == 'FAILED' %} {{vm.state}} {% else %} {{vm.state}} - {% endif %} + {% endif %} -
      + {% endif %} + {% if is_paginated %} {% endif %} - +
      From 07f92e754e9821f8765b3ac7d764448c211ebda3 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Sat, 12 Aug 2017 01:18:14 +0530 Subject: [PATCH 19/33] fix for mobile --- hosting/static/hosting/css/landing-page.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index d17ef8f2..0599b108 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -454,16 +454,16 @@ h6 { } footer { - padding: 2%; + padding: 20px; background-color: #f8f8f8; - #position: absolute; +/* position: absolute */ right: 0; bottom: 0; left: 0; } p.copyright { - margin: 15px 0 0; + margin: 14px 0 0; } a#forgotpassword { From 2f832e6409b5ccebcc06d18bbd5f7ae518815da7 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 Aug 2017 02:17:07 +0530 Subject: [PATCH 20/33] Update Changelog --- Changelog | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Changelog b/Changelog index 5ab95416..720d50e8 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,21 @@ +1.0.23 2017-08-11 + * #3629 [datacentlight] Fixed navbar changing language from DE to EN betwee$ + * #3623 [hosting] Fixed "Confirm Order" text appearing in "Invoice" place + * #3633 [datacenterlight, hosting] Translated "All Rights Reserved" for Ger$ + * #3627 [datacenterlight, hosting] Added border for payment warning message$ + * #3620 [hosting] Updated SSH Key page with new style: new key choice page,$ + * [hosting] bug fix: added modal icon and translation back for delete$ + * #3660 [datacenterlight] Rearranged desktop and mobile view for "Why Data $ + * #3646 Added file with VM Template hosting migration + * #3617 [hosting] Fixed Password reset confirmation page style bug + * #3408 [hosting] Changed background image of signup/login background into $ + * #3621 [hosting] Fixed signup/login/password reset page nabber logo overla$ + * #3354 [hosting] Restyled modal + * #3638 [hosting] Added "download" btn on generated key list for generated $ + * #3655 [hosting] Disabled deleting SSH keys from other users + * #3619 [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular'$ + * #3677 [hosting] Added wrapping for show SSH key modal text + * #3683 [hosting] Fixed footer floating bug on VM creating page 1.0.22: 2017-07-30 * #3593: [datacenterlight] Removed underbars between social icons in index * #3509: [datacenterlight, hosting] Made navbar transparent and removed mobile navbar bug in login/signup/reset-password From 0efd844603dd7a4b23c608ebf723e877923a6dfc Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 Aug 2017 02:25:07 +0530 Subject: [PATCH 21/33] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 720d50e8..25602c98 100644 --- a/Changelog +++ b/Changelog @@ -16,6 +16,7 @@ * #3619 [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular'$ * #3677 [hosting] Added wrapping for show SSH key modal text * #3683 [hosting] Fixed footer floating bug on VM creating page + * #3676 [datacenterlight, hosting] Added missing card holder's name field migration it's affecting both dcl and hosting 1.0.22: 2017-07-30 * #3593: [datacenterlight] Removed underbars between social icons in index * #3509: [datacenterlight, hosting] Made navbar transparent and removed mobile navbar bug in login/signup/reset-password From 01156a335df9860c3f5dbc491b91b9613b7160d9 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 Aug 2017 02:33:37 +0530 Subject: [PATCH 22/33] update changelog 1.0.23 --- Changelog | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Changelog b/Changelog index 25602c98..ab1ee41d 100644 --- a/Changelog +++ b/Changelog @@ -1,19 +1,19 @@ 1.0.23 2017-08-11 - * #3629 [datacentlight] Fixed navbar changing language from DE to EN betwee$ - * #3623 [hosting] Fixed "Confirm Order" text appearing in "Invoice" place - * #3633 [datacenterlight, hosting] Translated "All Rights Reserved" for Ger$ - * #3627 [datacenterlight, hosting] Added border for payment warning message$ - * #3620 [hosting] Updated SSH Key page with new style: new key choice page,$ - * [hosting] bug fix: added modal icon and translation back for delete$ - * #3660 [datacenterlight] Rearranged desktop and mobile view for "Why Data $ + * #3629 [datacentlight] Fixed navbar changing language from DE to EN between menus bug + * #3623 [hosting] Fixed “Confirm Order” text appearing in “Invoice” place + * #3633 [datacenterlight, hosting] Translated “All Rights Reserved” for German pages + * #3627 [datacenterlight, hosting] Added border for payment warning message when the user has already submitted card information + * #3620 [hosting] Updated SSH Key page with new style: new key choice page, upload key page, added icons for downloading and deleting key on mobile + * [hosting] bug fix: added modal icon and translation back for delete SSH Key + * #3660 [datacenterlight] Rearranged desktop and mobile view for “Why Data Centre Light?” IPv6/SSD section. * #3646 Added file with VM Template hosting migration * #3617 [hosting] Fixed Password reset confirmation page style bug - * #3408 [hosting] Changed background image of signup/login background into $ - * #3621 [hosting] Fixed signup/login/password reset page nabber logo overla$ + * #3408 [hosting] Changed background image of signup/login background into smaller size + * #3621 [hosting] Fixed signup/login/password reset page nabber logo overlapping with form * #3354 [hosting] Restyled modal - * #3638 [hosting] Added "download" btn on generated key list for generated $ + * #3638 [hosting] Added “download” btn on generated key list for generated keys from upload your key page * #3655 [hosting] Disabled deleting SSH keys from other users - * #3619 [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular'$ + * #3619 [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular' with only ‘Lato’ with appropriate font-weights. * #3677 [hosting] Added wrapping for show SSH key modal text * #3683 [hosting] Fixed footer floating bug on VM creating page * #3676 [datacenterlight, hosting] Added missing card holder's name field migration it's affecting both dcl and hosting From 26903015fe34d89ecf2869be23f30d15bc79c82d Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 Aug 2017 02:39:04 +0530 Subject: [PATCH 23/33] corrected format for changelog --- Changelog | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Changelog b/Changelog index ab1ee41d..55a74591 100644 --- a/Changelog +++ b/Changelog @@ -1,22 +1,22 @@ -1.0.23 2017-08-11 - * #3629 [datacentlight] Fixed navbar changing language from DE to EN between menus bug - * #3623 [hosting] Fixed “Confirm Order” text appearing in “Invoice” place - * #3633 [datacenterlight, hosting] Translated “All Rights Reserved” for German pages - * #3627 [datacenterlight, hosting] Added border for payment warning message when the user has already submitted card information - * #3620 [hosting] Updated SSH Key page with new style: new key choice page, upload key page, added icons for downloading and deleting key on mobile - * [hosting] bug fix: added modal icon and translation back for delete SSH Key - * #3660 [datacenterlight] Rearranged desktop and mobile view for “Why Data Centre Light?” IPv6/SSD section. - * #3646 Added file with VM Template hosting migration - * #3617 [hosting] Fixed Password reset confirmation page style bug - * #3408 [hosting] Changed background image of signup/login background into smaller size - * #3621 [hosting] Fixed signup/login/password reset page nabber logo overlapping with form - * #3354 [hosting] Restyled modal - * #3638 [hosting] Added “download” btn on generated key list for generated keys from upload your key page - * #3655 [hosting] Disabled deleting SSH keys from other users - * #3619 [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular' with only ‘Lato’ with appropriate font-weights. - * #3677 [hosting] Added wrapping for show SSH key modal text - * #3683 [hosting] Fixed footer floating bug on VM creating page - * #3676 [datacenterlight, hosting] Added missing card holder's name field migration it's affecting both dcl and hosting +1.0.23: 2017-08-11 + * #3629: [datacentlight] Fixed navbar changing language from DE to EN between menus bug + * #3623: [hosting] Fixed “Confirm Order” text appearing in “Invoice” place + * #3633: [datacenterlight, hosting] Translated “All Rights Reserved” for German pages + * #3627: [datacenterlight, hosting] Added border for payment warning message when the user has already submitted card information + * #3620: [hosting] Updated SSH Key page with new style: new key choice page, upload key page, added icons for downloading and deleting key on mobile + * [hosting] bug fix: added modal icon and translation back for delete SSH Key + * #3660: [datacenterlight] Rearranged desktop and mobile view for “Why Data Centre Light?” IPv6/SSD section. + * #3646: Added file with VM Template hosting migration + * #3617: [hosting] Fixed Password reset confirmation page style bug + * #3408: [hosting] Changed background image of signup/login background into smaller size + * #3621: [hosting] Fixed signup/login/password reset page nabber logo overlapping with form + * #3354: [hosting] Restyled modal + * #3638: [hosting] Added “download” btn on generated key list for generated keys from upload your key page + * #3655: [hosting] Disabled deleting SSH keys from other users + * #3619: [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular' with only ‘Lato’ with appropriate font-weights. + * #3677: [hosting] Added wrapping for show SSH key modal text + * #3683: [hosting] Fixed footer floating bug on VM creating page + * #3676: [datacenterlight, hosting] Added missing card holder's name field migration it's affecting both dcl and hosting 1.0.22: 2017-07-30 * #3593: [datacenterlight] Removed underbars between social icons in index * #3509: [datacenterlight, hosting] Made navbar transparent and removed mobile navbar bug in login/signup/reset-password From 3f37fdd77aaf6c16863a6a2d96c7cd4d6c80cc72 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 Aug 2017 02:42:11 +0530 Subject: [PATCH 24/33] Update Changelog --- Changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 55a74591..434b2057 100644 --- a/Changelog +++ b/Changelog @@ -5,7 +5,7 @@ * #3627: [datacenterlight, hosting] Added border for payment warning message when the user has already submitted card information * #3620: [hosting] Updated SSH Key page with new style: new key choice page, upload key page, added icons for downloading and deleting key on mobile * [hosting] bug fix: added modal icon and translation back for delete SSH Key - * #3660: [datacenterlight] Rearranged desktop and mobile view for “Why Data Centre Light?” IPv6/SSD section. + * #3660: [datacenterlight] Rearranged desktop and mobile view for “Why Data Centre Light?” IPv6/SSD section * #3646: Added file with VM Template hosting migration * #3617: [hosting] Fixed Password reset confirmation page style bug * #3408: [hosting] Changed background image of signup/login background into smaller size @@ -13,7 +13,7 @@ * #3354: [hosting] Restyled modal * #3638: [hosting] Added “download” btn on generated key list for generated keys from upload your key page * #3655: [hosting] Disabled deleting SSH keys from other users - * #3619: [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular' with only ‘Lato’ with appropriate font-weights. + * #3619: [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular' with only ‘Lato’ with appropriate font-weights * #3677: [hosting] Added wrapping for show SSH key modal text * #3683: [hosting] Fixed footer floating bug on VM creating page * #3676: [datacenterlight, hosting] Added missing card holder's name field migration it's affecting both dcl and hosting From f618ce8bdf1f11b340bcdaa3322aed97b91a8a59 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 Aug 2017 02:42:52 +0530 Subject: [PATCH 25/33] fixes in changelog --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 434b2057..8e517687 100644 --- a/Changelog +++ b/Changelog @@ -9,7 +9,7 @@ * #3646: Added file with VM Template hosting migration * #3617: [hosting] Fixed Password reset confirmation page style bug * #3408: [hosting] Changed background image of signup/login background into smaller size - * #3621: [hosting] Fixed signup/login/password reset page nabber logo overlapping with form + * #3621: [hosting] Fixed signup/login/password reset page navbar logo overlapping with form * #3354: [hosting] Restyled modal * #3638: [hosting] Added “download” btn on generated key list for generated keys from upload your key page * #3655: [hosting] Disabled deleting SSH keys from other users From dbb4c7b3f36e7b859fb4cbfaba74e221a802807e Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 Aug 2017 02:44:40 +0530 Subject: [PATCH 26/33] Update Changelog --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 8e517687..3a6da849 100644 --- a/Changelog +++ b/Changelog @@ -16,7 +16,7 @@ * #3619: [datacenterlight, hosting] Replaced 'Lato-Light' and 'Lato-Regular' with only ‘Lato’ with appropriate font-weights * #3677: [hosting] Added wrapping for show SSH key modal text * #3683: [hosting] Fixed footer floating bug on VM creating page - * #3676: [datacenterlight, hosting] Added missing card holder's name field migration it's affecting both dcl and hosting + * #3676: [datacenterlight, hosting] Added missing card holder's name field migration 1.0.22: 2017-07-30 * #3593: [datacenterlight] Removed underbars between social icons in index * #3509: [datacenterlight, hosting] Made navbar transparent and removed mobile navbar bug in login/signup/reset-password From 73721f16d2a4c24ad58151f193e1971597fdbb53 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 15 Aug 2017 02:29:01 +0530 Subject: [PATCH 27/33] Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow --- datacenterlight/views.py | 1 + dynamicweb/settings/base.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index f7a07c7e..0851a33f 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -482,6 +482,7 @@ class OrderConfirmationView(DetailView): vm_id = manager.create_vm( template_id=vm_template_id, specs=specs, + ssh_key=settings.ONEADMIN_USER_SSH_PUBLIC_KEY, vm_name="{email}-{template_name}-{date}".format( email=user.get('email'), template_name=template.get('name'), diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 40187f84..a837f0f2 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -504,6 +504,9 @@ OPENNEBULA_PORT = env('OPENNEBULA_PORT') # default value is /RPC2 OPENNEBULA_ENDPOINT = env('OPENNEBULA_ENDPOINT') +# The public ssh key of the oneadmin user +ONEADMIN_USER_SSH_PUBLIC_KEY = env('ONEADMIN_USER_SSH_PUBLIC_KEY') + # dcl email configurations DCL_TEXT = env('DCL_TEXT') DCL_SUPPORT_FROM_ADDRESS = env('DCL_SUPPORT_FROM_ADDRESS') From 3be7fbe2eee8e8e98c8734b3f518f33edfabd478 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 15 Aug 2017 16:05:52 +0530 Subject: [PATCH 28/33] Added name parameter for creating StripeCustomer and set description to this --- membership/models.py | 3 +-- utils/stripe_utils.py | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/membership/models.py b/membership/models.py index 6b6f4413..72b8073e 100644 --- a/membership/models.py +++ b/membership/models.py @@ -173,7 +173,6 @@ class StripeCustomer(models.Model): Check if there is a registered stripe customer with that email or create a new one """ - stripe_customer = None try: stripe_utils = StripeUtils() stripe_customer = cls.objects.get(user__email=email) @@ -189,7 +188,7 @@ class StripeCustomer(models.Model): user = CustomUser.objects.get(email=email) stripe_utils = StripeUtils() - stripe_data = stripe_utils.create_customer(token, email) + stripe_data = stripe_utils.create_customer(token, email, user.name) if stripe_data.get('response_object'): stripe_cus_id = stripe_data.get('response_object').get('id') diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index d46cf54d..aaf3d9e9 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -90,12 +90,12 @@ class StripeUtils(object): def check_customer(self, id, user, token): customers = self.stripe.Customer.all() if not customers.get('data'): - customer = self.create_customer(token, user.email) + customer = self.create_customer(token, user.email, user.name) else: try: customer = stripe.Customer.retrieve(id) except stripe.InvalidRequestError: - customer = self.create_customer(token, user.email) + customer = self.create_customer(token, user.email, user.name) user.stripecustomer.stripe_id = customer.get('response_object').get('id') user.stripecustomer.save() return customer @@ -107,11 +107,12 @@ class StripeUtils(object): return customer @handleStripeError - def create_customer(self, token, email): - + def create_customer(self, token, email, name=None): + if name is None or name.strip() == "": + name = email customer = self.stripe.Customer.create( source=token, - description='description for testing', + description=name, email=email ) return customer From 492f7553d83e86dce18618e1570fd920dc28e611 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 15 Aug 2017 16:12:08 +0530 Subject: [PATCH 29/33] Added test TestStripeCustomerDescription --- utils/tests.py | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/utils/tests.py b/utils/tests.py index d40f2c40..e9b9e1d6 100644 --- a/utils/tests.py +++ b/utils/tests.py @@ -3,6 +3,9 @@ from django.test import Client from django.http.request import HttpRequest from model_mommy import mommy +from utils.stripe_utils import StripeUtils +import stripe +from django.conf import settings class BaseTestCase(TestCase): @@ -11,7 +14,6 @@ class BaseTestCase(TestCase): """ def setUp(self): - # Password self.dummy_password = 'test_password' @@ -83,3 +85,36 @@ class BaseTestCase(TestCase): view.kwargs = kwargs view.config = None return view + + +class TestStripeCustomerDescription(TestCase): + """ + A class to test setting the description field of the stripe customer + https://stripe.com/docs/api#metadata + """ + + def setUp(self): + # Password + self.dummy_password = 'test_password' + self.dummy_email = 'test@ungleich.ch' + self.customer = mommy.make('membership.CustomUser') + self.customer.set_password(self.dummy_password) + self.customer.email = self.dummy_email + self.customer.save() + stripe.api_key = settings.STRIPE_API_PRIVATE_KEY + + def test_creating_stripe_customer(self): + test_name = "Monty Python" + token = stripe.Token.create( + card={ + "number": '4111111111111111', + "exp_month": 12, + "exp_year": 2022, + "cvc": '123' + }, + ) + stripe_utils = StripeUtils() + stripe_data = stripe_utils.create_customer(token.id, self.customer.email, test_name) + self.assertEqual(stripe_data.get('error'), None) + customer_data = stripe_data.get('response_object') + self.assertEqual(customer_data.description, test_name) From 999f5d8e2d51a3a267387f51003273b37274fc3c Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 15 Aug 2017 18:48:21 +0530 Subject: [PATCH 30/33] Cleaned up a comment --- utils/tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/tests.py b/utils/tests.py index e9b9e1d6..4a29fa60 100644 --- a/utils/tests.py +++ b/utils/tests.py @@ -94,7 +94,6 @@ class TestStripeCustomerDescription(TestCase): """ def setUp(self): - # Password self.dummy_password = 'test_password' self.dummy_email = 'test@ungleich.ch' self.customer = mommy.make('membership.CustomUser') From 270e70580f9f386914867c1a0465e342a181a4e7 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 16 Aug 2017 02:35:09 +0530 Subject: [PATCH 31/33] Updated Changelog for 1.0.24 --- Changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Changelog b/Changelog index 3a6da849..d19262f1 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,7 @@ +1.0.23.1: 2017-08-15 + * #3699: [datacenterlight] Added oneadmin ssh key by default to the created VM via DCL landing + * #3687: [datacenterlight] Added the name of the customer as description field of the stripe metadata + [all] Added CustomUser as a parameter in get_anonymous_user function to resolve issues with tests 1.0.23: 2017-08-11 * #3629: [datacentlight] Fixed navbar changing language from DE to EN between menus bug * #3623: [hosting] Fixed “Confirm Order” text appearing in “Invoice” place From 94004a5443f2cfeb7d82e25814c32f7c4186e1e1 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 16 Aug 2017 03:30:21 +0530 Subject: [PATCH 32/33] Changed 1.0.23.1 to 1.0.24 in the Changelog --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index d19262f1..e342aec6 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -1.0.23.1: 2017-08-15 +1.0.24: 2017-08-15 * #3699: [datacenterlight] Added oneadmin ssh key by default to the created VM via DCL landing * #3687: [datacenterlight] Added the name of the customer as description field of the stripe metadata [all] Added CustomUser as a parameter in get_anonymous_user function to resolve issues with tests From 8868aabf59217e654cf2e39222168a2a57b5a739 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 19 Aug 2017 02:42:50 +0530 Subject: [PATCH 33/33] added .log to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2bfa8cdf..46bfbf54 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ secret-key .env *.mo +*.log