Merge branch 'master' into task/3764/show_cancelled_vms_my_orders

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-09-23 19:00+0530\n"
+"POT-Creation-Date: 2017-09-24 12:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -306,6 +306,9 @@ msgstr "Registrieren"
 msgid "Forgot your password ? "
 msgstr "Passwort vergessen?"
 
+msgid "Resend activation link"
+msgstr "Aktivierungslink noch einmal senden"
+
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 

hosting/templates/hosting/login.html

@@ -44,6 +44,8 @@
                         <a class="unlink" href="{% url 'hosting:signup' %}">{% trans "Sign up"%}</a>
                         <span class="text"> or </span>
                         <a class="unlink" href="{% url 'hosting:reset_password' %}">{% trans "Forgot your password ? "%}</a>
+                        <span class="text"> or </span><br/>
+                        <a class="unlink" href="{% url 'hosting:resend_activation_link' %}">{% trans "Resend activation link"%}</a>
                     </div>
                 </div>
             </div>

hosting/templates/hosting/resend_activation_link.html

@@ -0,0 +1,36 @@
+{% extends "hosting/base_short.html" %}
+{% load staticfiles bootstrap3%}
+{% load i18n %}
+
+{% block navbar %}
+    {% include  'hosting/includes/_navbar_transparent.html' %}
+{% endblock navbar %}
+
+
+{% block content %}
+<div class="auth-container">
+   <div class="auth-bg"></div>
+        <div class="auth-center">
+            <div class="auth-title">
+                <h2>{% trans "Your VM hosted in Switzerland"%}</h2>
+            </div>
+            <div class="auth-content">
+                <div class="intro-message auth-box sign-up">
+                    <h2  class="section-heading">{% trans "Resend activation link"%}</h2>
+                    <form action="{% url 'hosting:resend_activation_link' %}" method="post" class="form" novalidate>
+                        {% csrf_token %}
+                        {% for field in form %}
+                            {% bootstrap_field field show_label=False %}
+                        {% endfor %}
+                        {% buttons %}
+                            <button type="submit" class="btn btn-block btn-success">
+                                {% trans "Submit"%}
+                            </button>
+                        {% endbuttons %}
+                    </form>
+
+                </div>
+            </div>
+        </div>
+</div>
+{% endblock %}

hosting/urls.py

@@ -8,8 +8,7 @@ from .views import (
     MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView,
     HostingPricingView, CreateVirtualMachinesView, HostingBillListView,
     HostingBillDetailView, SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView,
-    SSHKeyChoiceView, DashboardView, SettingsView)
-
+    SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView)
 
 urlpatterns = [
     url(r'index/?$', IndexView.as_view(), name='index'),
@@ -52,6 +51,8 @@ urlpatterns = [
     url(r'signup/?$', SignupView.as_view(), name='signup'),
     url(r'signup-validate/?$', SignupValidateView.as_view(),
         name='signup-validate'),
+    url(r'resend-activation-link/?$', ResendActivationEmailView.as_view(),
+        name='resend_activation_link'),
     url(r'reset-password/?$', PasswordResetView.as_view(),
         name='reset_password'),
     url(r'reset-password-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',

hosting/views.py

@@ -34,12 +34,15 @@ from membership.models import CustomUser, StripeCustomer
 from opennebula_api.models import OpenNebulaManager
 from opennebula_api.serializers import VirtualMachineSerializer, \
     VirtualMachineTemplateSerializer, VMTemplateSerializer
-from utils.forms import BillingAddressForm, PasswordResetRequestForm, \
-    UserBillingAddressForm
+from utils.forms import (
+    BillingAddressForm, PasswordResetRequestForm, UserBillingAddressForm,
+    ResendActivationEmailForm
+)
 from utils.mailer import BaseEmail
 from utils.stripe_utils import StripeUtils
 from utils.views import (
-    PasswordResetViewMixin, PasswordResetConfirmViewMixin, LoginViewMixin
+    PasswordResetViewMixin, PasswordResetConfirmViewMixin, LoginViewMixin,
+    ResendActivationLinkViewMixin
 )
 from .forms import HostingUserSignupForm, HostingUserLoginForm, \
     UserHostingKeyForm, generate_ssh_key_name
@@ -284,6 +287,14 @@ class SignupValidatedView(SignupValidateView):
         return context
 
 
+class ResendActivationEmailView(ResendActivationLinkViewMixin):
+    template_name = 'hosting/resend_activation_link.html'
+    form_class = ResendActivationEmailForm
+    success_url = reverse_lazy('hosting:login')
+    email_template_path = 'datacenterlight/emails/'
+    email_template_name = 'user_activation'
+
+
 class PasswordResetView(PasswordResetViewMixin):
     site = 'dcl'
     template_name = 'hosting/reset_password.html'