sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into task/3731/cdist_ssh_key_handler

Browse source
This commit is contained in:
PCoder 2017-09-01 00:53:30 +05:30
commit 3b0d2f8802
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
datacenterlight/templates/datacenterlight/order_detail.html
View file

@ -72,13 +72,15 @@
</div>
<br/>
<form method="post">
{% csrf_token %}
<div class="col-md-8 col-xs-7 pull-left tbl-no-padding">
<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>
<div class="col-md-4 col-xs-5 content tbl-no-padding">
<a href="{{next_url}}" ><button class="btn btn-info pull-right">{% trans "Place order"%}</button></a>
</div>
{% csrf_token %}
<div class="row">
<div class="col-sm-8">
<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>
<div class="col-sm-4 content">
<a href="{{next_url}}" ><button class="btn btn-info pull-right">{% trans "Place order"%}</button></a>
</div>
</div>
</form>
</div>
</div>

19
hosting/locale/de/LC_MESSAGES/django.po
View file

@ -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 "
"ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt "
"hast."
"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
"nachdem Du die Bestellung auf der nächsten Seite bestätigt 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"

1
hosting/static/hosting/css/landing-page.css
View file

@ -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 {

2
hosting/templates/hosting/orders.html
View file

@ -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 %}

2
hosting/templates/hosting/user_keys.html
View file

@ -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 %}