Merge branch 'master' into task/3731/cdist_ssh_key_handler

datacenterlight/templates/datacenterlight/order_detail.html

@@ -72,13 +72,15 @@
                     </div>
                     <br/>
                     <form method="post">
-                    {% csrf_token %}
+                        {% csrf_token %}
-                    <div class="col-md-8 col-xs-7 pull-left tbl-no-padding">
+                        <div class="row">
-                        <p class="dcl-place-order-text">{% blocktrans with vm_price=request.session.specs.price %}By clicking "Place order" this plan will charge your credit card account with the fee of {{ vm_price }}CHF/month{% endblocktrans %}.</p>
+                            <div class="col-sm-8">
-                    </div>
+                                <p class="dcl-place-order-text">{% blocktrans with vm_price=request.session.specs.price %}By clicking "Place order" this plan will charge your credit card account with the fee of {{ vm_price }}CHF/month{% endblocktrans %}.</p>
-                    <div class="col-md-4 col-xs-5 content tbl-no-padding">
+                            </div>
-                        <a href="{{next_url}}" ><button class="btn btn-info pull-right">{% trans "Place order"%}</button></a>
+                            <div class="col-sm-4 content">
-                    </div>
+                                <a href="{{next_url}}" ><button class="btn btn-info pull-right">{% trans "Place order"%}</button></a>
+                            </div>
+                        </div>
                     </form>
                 </div>
             </div>

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-24 11:12+0000\n"
+"POT-Creation-Date: 2017-08-31 23:46+0530\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"
@@ -278,9 +278,6 @@ msgstr ""
 msgid "See Invoice"
 msgstr "Rechnung"
 
-msgid "View Detail"
-msgstr "Details anzeigen"
-
 msgid "Page"
 msgstr ""
 
@@ -323,9 +320,8 @@ msgid ""
 "You are not making any payment yet. After submitting your card information, "
 "you will be taken to the Confirm Order Page."
 msgstr ""
-"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst "
+"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
-"ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt "
+"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast."
-"hast."
 
 msgid "Submit"
 msgstr "Absenden"
@@ -371,9 +367,6 @@ msgstr ""
 "Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn "
 "sicher auf."
 
-msgid "Your SSH Keys"
-msgstr "Deine SSH Keys"
-
 msgid ""
 "To generate a new key pair or to upload your existing key, click 'Add Key'"
 msgstr ""
@@ -470,6 +463,9 @@ msgstr ""
 msgid "CREATE VM"
 msgstr "NEUE VM"
 
+msgid "View Detail"
+msgstr "Details anzeigen"
+
 msgid "login"
 msgstr "Einloggen"
 
@@ -508,6 +504,9 @@ msgid ""
 "contact Data Center Light Support."
 msgstr "Kontaktiere den Data Center Light Support."
 
+#~ msgid "Your SSH Keys"
+#~ msgstr "Deine SSH Keys"
+
 #~ msgid "Approved"
 #~ msgstr "Akzeptiert"
 

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

@@ -536,6 +536,7 @@ a.unlink:hover {
 .dcl-place-order-text{
    font-size: 13px;
    color: #808080;
+   margin-bottom: 15px;
 }
 
 .dcl-order-table-total .tbl-total {

hosting/templates/hosting/orders.html

@@ -40,7 +40,7 @@
                         {% endif %}
                     </td>
                     <td class="text-right last-td">
-                        <a class="btn btn-order-detail alt-text" href="{% url 'hosting:orders' order.pk %}" data-alt="{% trans 'See Invoice' %}">{% trans "View Detail" %}</a>
+                        <a class="btn btn-order-detail" href="{% url 'hosting:orders' order.pk %}">{% trans 'See Invoice' %}</a>
                     </td>
                 </tr>
             {% endfor %}

hosting/templates/hosting/user_keys.html

@@ -3,7 +3,7 @@
 {% block content %}
 <div>
 	<div class="container virtual-machine-container dashboard-container ">
-        <h1 class="h1-thin"><i class="fa fa-key" aria-hidden="true"></i>&nbsp;{% trans "Your SSH Keys" %}</h1>
+        <h1 class="h1-thin"><i class="fa fa-key" aria-hidden="true"></i>&nbsp;{% trans "My SSH Keys" %}</h1>
         {% if messages %}
         <div class="alert alert-warning">
             {% for message in messages %}