merge master

hosting/locale/de/LC_MESSAGES/django.po

@@ -268,7 +268,7 @@ msgstr ""
 "Link klickst</a>.<br/>\n"
 
 msgid "My VM page"
-msgstr ""
+msgstr "Meine VM page"
 
 #, python-format
 msgid ""
@@ -629,7 +629,7 @@ msgid "View Detail"
 msgstr "Details anzeigen"
 
 msgid "login"
-msgstr "Einloggen"
+msgstr "anmelden"
 
 msgid ""
 "Thank you for signing up. We have sent an email to you. Please follow the "

hosting/static/hosting/css/landing-page.css

@@ -857,6 +857,8 @@ a.list-group-item-danger:focus,
     background: rgba(235, 204, 209, 0.2);
 }
 .has-error .form-control,
+.has-error .form-control:focus,
+.has-error .form-control:active,
 .has-error .input-group-addon {
     color: #eb4d5c;
     border-color: #eb4d5c;
@@ -871,6 +873,13 @@ a.list-group-item-danger.active:focus {
     background-color: #eb4d5c;
 }
 
+/* bootstrap input box-shadom disable */
+.has-error .form-control:focus,
+.has-error .form-control:active,
+.has-success .form-control:focus,
+.has-success .form-control:active {
+    box-shadow: inset 0 0 1px rgba(0,0,0,0.25);
+}
 .checkmark {
   display: inline-block;
 }

hosting/static/hosting/css/payment.css

@@ -22,7 +22,100 @@
 }
 
 .summary-box .content {
-
 	padding-top: 15px;
+}
 
+/* landing page payment new style */
+.last-p {
+	margin-bottom: 0;
+}
+.dcl-payment-section {
+    max-width: 391px;
+    margin: 0 auto 30px;
+    padding: 0 10px 30px;
+    border-bottom: 1px solid #edebeb;
+    height: 100%;
+}
+.dcl-payment-section hr{
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+.dcl-payment-section .top-hr {
+	margin-left: -10px;
+}
+.dcl-payment-section h3 {
+	font-weight: 600;
+}
+.dcl-payment-section p {
+	padding: 0 5px;
+	font-weight: 400;
+}
+.dcl-payment-section .card-warning-content {
+	padding: 8px 10px;
+	font-weight: 300;
+}
+.dcl-payment-order strong{
+	font-size: 17px;
+}
+.dcl-payment-order p {
+	font-weight: 300;
+}
+.dcl-payment-section .form-group {
+	margin-bottom: 10px;
+}
+.dcl-payment-section .form-control {
+	box-shadow: none;
+	padding: 6px 12px;
+	height: 32px;
+}
+.dcl-payment-user {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+}
+
+.dcl-payment-user h4 {
+	font-weight: 600;
+	padding-left: 5px;
+	font-size: 17px;
+}
+
+@media (min-width: 768px) {
+	.dcl-payment-grid {
+		display: flex;
+		align-items: stretch;
+		flex-wrap: wrap;
+	}
+	.dcl-payment-box {
+		width: 50%;
+		position: relative;
+		padding: 0 30px;
+	}
+	.dcl-payment-box:nth-child(2) {
+		order: 1;
+	}
+	.dcl-payment-box:nth-child(4) {
+		order: 2;
+	}
+	.dcl-payment-section {
+		padding: 15px 10px;
+		margin-bottom: 0;
+		border-bottom-width: 5px;
+	}
+	.dcl-payment-box:nth-child(2n) .dcl-payment-section {
+		border-bottom: none;
+	}
+	.dcl-payment-box:nth-child(1):after,
+	.dcl-payment-box:nth-child(2):after {
+		content: ' ';
+		display: block;
+		background: #eee;
+		width: 1px;
+		position: absolute;
+		right: 0;
+		z-index: 2;
+		top: 20px;
+		bottom: 20px;
+	}
 }

hosting/templates/hosting/virtual_machines.html

@@ -13,7 +13,12 @@
         {% endif %}
         {% if not error %}
             <div class="dashboard-subtitle">
-                <p>{% trans 'To create a new virtual machine, click "Create VM"' %}</p>
+                <p>{% trans 'To create a new virtual machine, click "Create VM"' %}
+                {% if show_create_ssh_key_msg %}
+                     {% url 'hosting:create_ssh_key' as create_ssh_url %}
+                     <br/>{% blocktrans %}To access your VM, add your SSH key <a href="{{create_ssh_url}}">here</a>{% endblocktrans %}
+                {% endif %}
+                </p>
                 <div class="text-right">
                     <a class="btn btn-vm" href="{% url 'hosting:create_virtual_machine' %}"><span class="css-plus"></span> <span>{% trans "CREATE VM" %}</span></a>
                 </div>

hosting/views.py

@@ -613,13 +613,6 @@ class PaymentVMView(LoginRequiredMixin, FormView):
         return context
 
     def get(self, request, *args, **kwargs):
-        if not UserHostingKey.objects.filter(user=self.request.user).exists():
-            messages.success(
-                request,
-                'In order to create a VM, you create/upload your SSH KEY first.'
-            )
-            return HttpResponseRedirect(reverse('hosting:ssh_keys'))
-
         if 'next' in request.session:
             del request.session['next']
 
@@ -885,6 +878,10 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
             context = {'error': 'connection'}
         else:
             context = super(ListView, self).get_context_data(**kwargs)
+            if UserHostingKey.objects.filter(user=self.request.user).exists():
+                context['show_create_ssh_key_msg'] = False
+            else:
+                context['show_create_ssh_key_msg'] = True
         return context
 
 
@@ -905,15 +902,6 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View):
             raise ValidationError(_('Invalid storage size'))
 
     def get(self, request, *args, **kwargs):
-        if not UserHostingKey.objects.filter(user=self.request.user).exists():
-            messages.success(
-                request,
-                _(
-                    'In order to create a VM, you need to '
-                    'create/upload your SSH KEY first.'
-                )
-            )
-            return HttpResponseRedirect(reverse('hosting:ssh_keys'))
         context = {'templates': VMTemplate.objects.all()}
         return render(request, self.template_name, context)