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

merged master

Browse source
This commit is contained in:
Arvind Tiwari 2017-09-04 23:52:22 +05:30
commit 3ff0c4a1a2
15 changed files with 374 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Changelog
View file

@ -1,3 +1,14 @@
1.2: 2017-09-01
* #3703: [hosting] Added a new dashboard
* #3717: [datacenterlight, hosting] Changed warning color for box
* #3748: [datacenterlight] Changed order msg position for mobile
* #3762: [hosting] Text fix View details to See Invoice
* #3765: [hosting] Text fix Your SSH Keys to My SSH Keys
* #3639: [datacenterlight] Added navbar menu after payment page on landing
* #3735: [hosting] Increased modal width and modal button width
* #3709: Activated Text Plugin by default for the Page Title Text, enabled <title> tag text management
* #3768: [datacenterlight, hosting] Fixed missing DE translation
* #3678: [datacenterlight, hosting] Removed Lato font files
1.1.1: 2017-08-29 1.1.1: 2017-08-29
* #3709: [datacenterlight] Added faq tos cms template * #3709: [datacenterlight] Added faq tos cms template
* #3657: [datacenterlight] Added a new contact section at landing * #3657: [datacenterlight] Added a new contact section at landing

117
datacenterlight/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-24 11:28+0000\n" "POT-Creation-Date: 2017-09-02 03:08+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -95,7 +95,9 @@ msgid "Message"
msgstr "Nachricht" msgstr "Nachricht"
msgid "Sorry, there was an unexpected error. Kindly retry." msgid "Sorry, there was an unexpected error. Kindly retry."
msgstr "Bitte entschuldige, es scheint ein unerwarteter Fehler aufgetreten zu sein. Versuche es doch bitte noch einmal." msgstr ""
"Bitte entschuldige, es scheint ein unerwarteter Fehler aufgetreten zu sein. "
"Versuche es doch bitte noch einmal."
msgid "SUBMIT" msgid "SUBMIT"
msgstr "ABSENDEN" msgstr "ABSENDEN"
@ -166,6 +168,9 @@ msgstr ""
"Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst " "Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst "
"%(base_url)s%(activation_link)s\n" "%(base_url)s%(activation_link)s\n"
msgid "Home"
msgstr "Home"
msgid "Highlights" msgid "Highlights"
msgstr "" msgstr ""
@ -175,18 +180,15 @@ msgstr "Skalierung"
msgid "Reliable and light" msgid "Reliable and light"
msgstr "Zuverlässig und leicht" msgstr "Zuverlässig und leicht"
msgid "Pricing"
msgstr "Preise"
msgid "Order VM" msgid "Order VM"
msgstr "VM bestellen" msgstr "VM bestellen"
msgid "Contact" msgid "Contact"
msgstr "Kontakt" msgstr "Kontakt"
msgid "Home"
msgstr "Home"
msgid "Pricing"
msgstr "Preise"
msgid "All Rights Reserved" msgid "All Rights Reserved"
msgstr "Alle Rechte vorbehalten" msgstr "Alle Rechte vorbehalten"
@ -256,25 +258,10 @@ msgid "Contact us"
msgstr "Kontaktiere uns" msgstr "Kontaktiere uns"
msgid "Switzerland " msgid "Switzerland "
msgstr "Schweiz" msgstr "Schweiz "
msgid "Confirm Order" msgid "Your Order"
msgstr "Bestellung Bestätigen" msgstr "Deine Bestellung"
msgid "Date"
msgstr "Datum"
msgid "Billed To:"
msgstr "Rechnungsadresse"
msgid "Payment Method:"
msgstr "Bezahlmethode"
msgid "ending"
msgstr "endend in"
msgid "Order summary"
msgstr "Bestellungsübersicht"
msgid "Cores" msgid "Cores"
msgstr "Prozessorkerne" msgstr "Prozessorkerne"
@ -289,13 +276,80 @@ msgid "Configuration"
msgstr "Konfiguration" msgstr "Konfiguration"
msgid "Total" msgid "Total"
msgstr "" msgstr "Gesamt"
msgid "including VAT"
msgstr "inkl. Mehrwertsteuer"
#, fuzzy
#| msgid "month"
msgid "Month" msgid "Month"
msgstr "Monat" msgstr "Monat"
msgid "Billing Address"
msgstr "Rechnungsadresse"
msgid "Credit Card"
msgstr "Kreditkarte"
msgid ""
"\n"
" Please fill in your credit card information "
"below. We are using <a\n"
" href=\"https://stripe.com\" target="
"\"_blank\">Stripe</a> for payment and do not store\n"
" your information in our database.\n"
" "
msgstr ""
"\n"
"Bitte füll Deine Kreditkarteninformationen unten aus. Wir nutzen <a href="
"\"https://stripe.com\" target=\"_blank\">Stripe</a> für die Bezahlung und "
"speichern keine Informationen in unserer Datenbank."
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."
msgid "Submit"
msgstr "Absenden"
msgid "Card Number"
msgstr "Kreditkartennummer"
msgid "Expiry Date"
msgstr "Ablaufdatum"
msgid "CVC"
msgstr ""
msgid "Card Type"
msgstr "Kartentyp"
msgid "Processing"
msgstr "Weiter"
msgid "Enter your credit card number"
msgstr "Deine Kreditkartennummer"
msgid "Confirm Order"
msgstr "Bestellung Bestätigen"
msgid "Date"
msgstr "Datum"
msgid "Billed To:"
msgstr "Rechnungsadresse"
msgid "Payment Method:"
msgstr "Bezahlmethode"
msgid "ending in"
msgstr "endend in"
msgid "Order summary"
msgstr "Bestellungsübersicht"
#, python-format #, python-format
msgid "" msgid ""
"By clicking \"Place order\" this plan will charge your credit card account " "By clicking \"Place order\" this plan will charge your credit card account "
@ -331,7 +385,7 @@ msgstr ""
msgid "Thank you for order! Our team will contact you via email" msgid "Thank you for order! Our team will contact you via email"
msgstr "" msgstr ""
"Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit " "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit "
"Ihnen via E-Mail in Verbindung." "Dir via E-Mail in Verbindung."
msgid "as soon as possible!" msgid "as soon as possible!"
msgstr "" msgstr ""
@ -495,9 +549,6 @@ msgstr "ist keine gültige E-Mailadresse"
#~ msgid "Buy Now!" #~ msgid "Buy Now!"
#~ msgstr "Kaufe jetzt!" #~ msgstr "Kaufe jetzt!"
#~ msgid "Email address"
#~ msgstr "E-Mail Adresse"
#~ msgid "Our promise" #~ msgid "Our promise"
#~ msgstr "Unser Versprechen" #~ msgstr "Unser Versprechen"

3
datacenterlight/templates/datacenterlight/base.html
View file

@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Data Center Light by ungleich"> <meta name="description" content="Data Center Light by ungleich">
<meta name="author" content="ungleich GmbH"> <meta name="author" content="ungleich GmbH">
{% cms_toolbar %}
<title>Data Center Light - <title>Data Center Light -
{% block title %}VM hosting made in Switzerland{% endblock %}</title> {% block title %}VM hosting made in Switzerland{% endblock %}</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
@ -41,7 +41,6 @@
</head> </head>
<body> <body>
{% cms_toolbar %}
<!-- Navigation --> <!-- Navigation -->
{% include "datacenterlight/includes/_navbar.html" %} {% include "datacenterlight/includes/_navbar.html" %}

6
datacenterlight/templates/datacenterlight/cms_page.html
View file

@ -1,17 +1,19 @@
{% extends "datacenterlight/base.html" %} {% extends "datacenterlight/base.html" %}
{% load staticfiles cms_tags sekizai_tags %} {% load staticfiles cms_tags sekizai_tags %}
{% block title %}
{% page_attribute page_title %}
{% endblock %}
{% block content %} {% block content %}
{% addtoblock "css" %} {% addtoblock "css" %}
<link href="{% static 'datacenterlight/css/cms.css' %}" media="screen" rel="stylesheet" type="text/css"/> <link href="{% static 'datacenterlight/css/cms.css' %}" media="screen" rel="stylesheet" type="text/css"/>
{% endaddtoblock %} {% endaddtoblock %}
<div class="dcl-cms_page-full-width"> <div class="dcl-cms_page-full-width">
<div class="dcl-cms_page-header"> <div class="dcl-cms_page-header">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<div class="single-heading"> <div class="single-heading">
<h2>{% placeholder 'datacenterlight_cms_page_title' %}</h2> <h2>{% page_attribute page_title %}</h2>
</div> </div>
</div> </div>
</div> </div>

217
datacenterlight/templates/datacenterlight/landing_payment.html Normal file
View file

@ -0,0 +1,217 @@
{% extends "hosting/base_short.html" %}
{% load staticfiles bootstrap3 i18n %}
{% block navbar %}
{% include "datacenterlight/includes/_navbar.html" %}
{% endblock navbar %}
{% block content %}
<!-- Credit card form -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/>
<div class="dcl-order-container">
<div class="payment-container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 dcl-order-sec">
<h3><strong>{%trans "Your Order" %}</strong></h3>
<div class="col-xs-6 col-sm-12 col-md-12 col-lg-12 dcl-order-table-header">
<div class="col-xs-12 col-sm-2 col-md-1 col-lg-1 tbl-header">
{%trans "Cores" %}
</div>
<div class="col-xs-12 col-sm-3 col-md-4 col-lg-4 tbl-header">
{%trans "Memory" %}
</div>
<div class="col-xs-12 col-sm-3 col-md-3 col-lg-3 tbl-header">
{%trans "Disk space" %}
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 tbl-header">
{%trans "Configuration" %}
</div>
</div>
<div class="col-xs-6 col-sm-12 col-md-12 col-lg-12 dcl-order-table-content">
<div class="col-xs-12 col-sm-2 col-md-1 col-lg-1 tbl-content">
{{request.session.specs.cpu|floatformat}}
</div>
<div class="col-xs-12 col-sm-3 col-md-4 col-lg-4 tbl-content">
{{request.session.specs.memory|floatformat}} GB
</div>
<div class="col-xs-12 col-sm-3 col-md-3 col-lg-3 tbl-content">
{{request.session.specs.disk_size|floatformat}} GB
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 tbl-content">
{{request.session.template.name}}
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 dcl-order-table-total">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 tbl-tot tbl-no-padding">
{%trans "Total" %} <span>{%trans "including VAT" %}</span>
</div>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 tbl-no-padding">
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4"></div>
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 tbl-total">{{request.session.specs.price}}
CHF<span class="dcl-price-month">/{% trans "Month" %}</span>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 dcl-billing-sec">
<div class="col-xs-12 col-sm-5 col-md-6 billing dcl-billing">
<h3><b>{%trans "Billing Address"%}</b></h3>
<hr>
<form role="form" id="billing-form" method="post" action="" novalidate>
{% for field in form %}
{% csrf_token %}
{% bootstrap_field field show_label=False type='fields'%}
{% endfor %}
</form>
</div>
<div class="col-xs-12 col-sm-7 col-md-6 creditcard-box dcl-creditcard">
<h3><b>{%trans "Credit Card"%}</b></h3>
<hr>
<div>
<div>
<p>
{% blocktrans %}
Please fill in your credit card information below. We are using <a
href="https://stripe.com" target="_blank">Stripe</a> for payment and do not store
your information in our database.
{% endblocktrans %}
</p>
</div>
<br>
<div>
{% if credit_card_data.last4 %}
<form role="form" id="payment-form-with-creditcard" novalidate>
<h5 class="billing-head">Credit Card</h5>
<h5 class="membership-lead">Last 4: *****{{credit_card_data.last4}}</h5>
<h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
<input type="hidden" name="credit_card_needed" value="false"/>
</form>
<div class="row">
<div class="col-xs-12">
{% if not messages and not form.non_field_errors %}
<p class="card-warning-content card-warning-addtional-margin">
{% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %}
</p>
{% endif %}
<div id='payment_error'>
{% for message in messages %}
{% if 'failed_payment' or 'make_charge_error' in message.tags %}
<ul class="list-unstyled"><li>
<p class="card-warning-content card-warning-error">{{ message|safe }}</p>
</li></ul>
{% endif %}
{% endfor %}
{% for error in form.non_field_errors %}
<p class="card-warning-content card-warning-error">
{{ error|escape }}
</p>
{% endfor %}
</div>
</div>
<div class="col-xs-12">
<div class="col-xs-6 pull-right">
<button id="payment_button_with_creditcard" class="btn btn-success stripe-payment-btn"
type="submit">
{%trans "Submit" %}
</button>
</div>
</div>
</div>
{% else %}
<form action="" id="payment-form-new" method="POST">
<input type="hidden" name="token"/>
<div class="group">
<div class="col-xs-12 col-sm-12 col-md-10 col-lg-9 credit-card-goup">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 card-element card-number-element">
<label>{%trans "Card Number" %}</label>
<div id="card-number-element" class="field my-input"></div>
</div>
<div class="col-xs-5 col-sm-3 col-md-3 col-lg-3 card-element card-expiry-element">
<label>{%trans "Expiry Date" %}</label>
<div id="card-expiry-element" class="field my-input"></div>
</div>
<div class="col-xs-12 col-sm-2 col-md-6 col-lg-7 hide-mobile"></div>
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-2 card-element card-cvc-element">
<label>{%trans "CVC" %}</label>
<div id="card-cvc-element" class="field my-input"></div>
</div>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 card-element brand">
<label>{%trans "Card Type" %}</label>
<i class="pf pf-credit-card" id="brand-icon"></i>
</div>
</div>
</div>
<div id="card-errors" role="alert"></div>
<div class="row">
<div class="col-xs-12">
{% if not messages and not form.non_field_errors %}
<p class="card-warning-content">
{% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %}
</p>
{% endif %}
<div id='payment_error'>
{% for message in messages %}
{% if 'failed_payment' or 'make_charge_error' in message.tags %}
<ul class="list-unstyled"><li>
<p class="card-warning-content card-warning-error">{{ message|safe }}</p>
</li></ul>
{% endif %}
{% endfor %}
{% for error in form.non_field_errors %}
<p class="card-warning-content card-warning-error">
{{ error|escape }}
</p>
{% endfor %}
</div>
</div>
<div class="col-xs-12">
<div class="col-xs-6 pull-right">
<button class="btn btn-success stripe-payment-btn" type="submit">{%trans "Submit" %}
</button>
</div>
</div>
</div>
<div class="row" style="display:none;">
<div class="col-xs-12">
<p class="payment-errors"></p>
</div>
</div>
</form>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- stripe key data -->
{% if stripe_key %}
{% get_current_language as LANGUAGE_CODE %}
<script type="text/javascript">
window.processing_text = '{%trans "Processing" %}';
window.enter_your_card_text = '{%trans "Enter your credit card number" %}';
(function () {
window.stripeKey = "{{stripe_key}}";
window.current_lan = "{{LANGUAGE_CODE}}";
})();
</script>
{%endif%}
{% if credit_card_data.last4 and credit_card_data.cc_brand %}
<script type="text/javascript">
(function () {
window.hasCreditcard = true;
})();
</script>
{%endif%}
{%endblock%}

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

@ -50,7 +50,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<address> <address>
<strong>{% trans "Payment Method:"%}</strong><br> <strong>{% trans "Payment Method:"%}</strong><br>
{{cc_brand}} {% trans "ending" %} **** {{cc_last4}}<br> {{cc_brand}} {% trans "ending in" %} **** {{cc_last4}}<br>
{{request.session.user.email}} {{request.session.user.email}}
</address> </address>
</div> </div>

4
datacenterlight/views.py
View file

@ -406,7 +406,7 @@ class WhyDataCenterLightView(IndexView):
class PaymentOrderView(FormView): class PaymentOrderView(FormView):
template_name = 'hosting/payment.html' template_name = 'datacenterlight/landing_payment.html'
form_class = BillingAddressForm form_class = BillingAddressForm
def get_form_kwargs(self): def get_form_kwargs(self):
@ -478,7 +478,7 @@ class PaymentOrderView(FormView):
class OrderConfirmationView(DetailView): class OrderConfirmationView(DetailView):
template_name = "datacenterlight/order_detail.html" template_name = "datacenterlight/order_detail.html"
payment_template_name = 'hosting/payment.html' payment_template_name = 'datacenterlight/landing_payment.html'
context_object_name = "order" context_object_name = "order"
model = HostingOrder model = HostingOrder

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-02 00:05+0530\n" "POT-Creation-Date: 2017-09-02 03:08+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -73,7 +73,7 @@ msgid "Mwst-Nummer: CHE-109.549.333 MWST"
msgstr "" msgstr ""
msgid "Total:" msgid "Total:"
msgstr "" msgstr "Gesamt:"
#, python-format #, python-format
msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer." msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
@ -242,12 +242,21 @@ msgstr "Datum"
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
msgid "Approved"
msgstr "Akzeptiert"
msgid "Declined"
msgstr "Abgelehnt"
msgid "Billed To:" msgid "Billed To:"
msgstr "Rechnungsadresse" msgstr "Rechnungsadresse"
msgid "Payment Method:" msgid "Payment Method:"
msgstr "Bezahlmethode" msgstr "Bezahlmethode"
msgid "ending in"
msgstr "endend in"
msgid "Order summary" msgid "Order summary"
msgstr "Bestellungsübersicht" msgstr "Bestellungsübersicht"
@ -537,12 +546,6 @@ msgstr "Kontaktiere den Data Center Light Support."
#~ msgid "Your SSH Keys" #~ msgid "Your SSH Keys"
#~ msgstr "Deine SSH Keys" #~ msgstr "Deine SSH Keys"
#~ msgid "Approved"
#~ msgstr "Akzeptiert"
#~ msgid "Declined"
#~ msgstr "Abgelehnt"
#~ msgid "Cancel Order" #~ msgid "Cancel Order"
#~ msgstr "Bestellung stornieren" #~ msgstr "Bestellung stornieren"

18
hosting/static/hosting/css/commons.css
View file

@ -114,7 +114,7 @@
text-align: center; text-align: center;
width: 100%; width: 100%;
float: left; float: left;
padding: 0px 40px 15px 30px; padding: 0px 30px 15px 30px;
} }
.modal-body .modal-icon i { .modal-body .modal-icon i {
font-size: 80px; font-size: 80px;
@ -122,7 +122,7 @@
color: #999; color: #999;
} }
.modal-body .modal-icon { .modal-body .modal-icon {
margin-bottom: 10px; margin-bottom: 15px;
} }
.modal-title { .modal-title {
margin: 0; margin: 0;
@ -133,9 +133,12 @@
font-weight: 300; font-weight: 300;
} }
.modal-text { .modal-text {
padding-top: 15px; padding-top: 5px;
font-size: 16px; font-size: 16px;
} }
.modal-text p:not(:last-of-type){
margin-bottom: 5px;
}
.modal-footer { .modal-footer {
border-top: 0px solid #e5e5e5; border-top: 0px solid #e5e5e5;
width: 100%; width: 100%;
@ -143,11 +146,8 @@
text-align: center; text-align: center;
padding: 15px 15px; padding: 15px 15px;
} }
.modal-footer button[type="submit"] {
min-width: 80px;
}
@media (min-width: 1300px) { @media (min-width: 1300px) {
.modal-dialog {/* top: 30%; */width: 35%;} .modal-dialog {/* top: 30%; */width: 40%;}
} }
@media (max-width: 1299px) { @media (max-width: 1299px) {
.modal-dialog { .modal-dialog {
@ -333,3 +333,7 @@
font-size: 13px; font-size: 13px;
/* padding: 4px 15px; */ /* padding: 4px 15px; */
} }
.btn-wide {
min-width: 100px;
}

1
hosting/static/hosting/css/user_keys.css
View file

@ -299,6 +299,7 @@
} }
.key_contain { .key_contain {
word-break: break-all; word-break: break-all;
margin-bottom: 15px;
} }
.custom_form_button{ .custom_form_button{
border-radius: 0; border-radius: 0;

10
hosting/templates/hosting/order_detail.html
View file

@ -29,9 +29,11 @@
<strong>{% trans "Date"%}:</strong><br> <strong>{% trans "Date"%}:</strong><br>
<span id="order-created_at">{{order.created_at|date:'Y-m-d H:i'}}</span><br><br> <span id="order-created_at">{{order.created_at|date:'Y-m-d H:i'}}</span><br><br>
<strong>{% trans "Status:"%}</strong><br> <strong>{% trans "Status:"%}</strong><br>
<strong class="{% if order.status == 'Approved' %}text-success {% if order.status == 'Approved' %}
{%else%} text-danger <strong class="text-success">{% trans "Approved" %}</strong>
{% endif %}">{{order.status}}</strong> {% else %}
<strong class="text-danger">{% trans "Declined" %}</strong>
{% endif %}
<br><br> <br><br>
</address> </address>
@ -50,7 +52,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<address> <address>
<strong>{% trans "Payment Method:"%}</strong><br> <strong>{% trans "Payment Method:"%}</strong><br>
{{order.cc_brand}} ending **** {{order.last4}}<br> {{order.cc_brand}} {% trans "ending in" %} **** {{order.last4}}<br>
{{user.email}} {{user.email}}
</address> </address>
</div> </div>

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

@ -5,7 +5,7 @@
{% block content %} {% block content %}
<div class="dashboard-container"> <div class="dashboard-container">
<div class="dashboard-container-head"> <div class="dashboard-container-head">
<h3 class="dashboard-title-thin"><img src="{% static 'hosting/img/shopping-cart.svg' %}" class="un-icon" style="margin-top: -4px; width: 30px;"> {% trans "My Orders" %}</h3> <h3 class="dashboard-title-thin"><img src="{% static 'hosting/img/shopping-cart.svg' %}" class="un-icon" style="margin-top: -4px; width: 30px;"> {% trans "My Bills" %}</h3>
{% if messages %} {% if messages %}
<div class="alert alert-warning"> <div class="alert alert-warning">
{% for message in messages %} {% for message in messages %}
@ -34,9 +34,9 @@
<td class="xs-td-smallhalf" data-header="{% trans 'Amount' %}">{{ order.price }}</td> <td class="xs-td-smallhalf" data-header="{% trans 'Amount' %}">{{ order.price }}</td>
<td data-header="{% trans 'Status' %}"> <td data-header="{% trans 'Status' %}">
{% if order.approved %} {% if order.approved %}
<span class="vm-status-active"><strong>Approved</strong></span> <span class="vm-status-active"><strong>{% trans "Approved" %}</strong></span>
{% else %} {% else %}
<span class="vm-status-failed"><strong>Declined</strong></span> <span class="vm-status-failed"><strong>{% trans "Declined" %}</strong></span>
{% endif %} {% endif %}
</td> </td>
<td class="text-right last-td"> <td class="text-right last-td">

4
hosting/templates/hosting/payment.html
View file

@ -5,10 +5,6 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/>
{% endblock css_extra %} {% endblock css_extra %}
{% block navbar %}
{% include "datacenterlight/includes/_navbar.html" %}
{% endblock navbar %}
{% block content %} {% block content %}
<!-- Credit card form --> <!-- Credit card form -->
<div class="dcl-order-container"> <div class="dcl-order-container">

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

@ -33,8 +33,7 @@
<tr> <tr>
<td scope="row">{{user_key.name}}</td> <td scope="row">{{user_key.name}}</td>
<td> <td>
<button type="button" class="btn btn-default btn-custom-delete" data-toggle="modal" <button type="button" class="btn btn-default btn-custom-delete" data-toggle="modal" data-target="#Modal{{ user_key.id }}" style="color: #717274">
data-target="#Modal{{ user_key.id }}" style="color: #717274">
<span class="pc-only">{% trans "Delete" %}</span> <span class="pc-only">{% trans "Delete" %}</span>
<span class="mob-only"><i class="fa fa-trash"></i></span> <span class="mob-only"><i class="fa fa-trash"></i></span>
</button> </button>
@ -42,20 +41,18 @@
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" <button type="button" class="close" data-dismiss="modal" aria-label="Confirm"><span aria-hidden="true">&times;</span></button>
aria-label="Confirm"><span
aria-hidden="true">&times;</span>
</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-icon"><i class="fa fa-trash" aria-hidden="true"></i></div> <div class="modal-icon"><i class="fa fa-trash" aria-hidden="true"></i></div>
<h4 class="modal-title" id="ModalLabel">{% trans "Delete SSH Key"%}</h4> <h4 class="modal-title" id="ModalLabel">{% trans "Delete SSH Key"%}</h4>
<p class="modal-text">{% trans "Do you want to delete this key?"%}</p> <div class="modal-text">
<p>{% trans "Do you want to delete this key?"%}</p>
</div>
<form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}"> <form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}">
{% csrf_token %} {% csrf_token %}
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-danger">{% trans "Delete"%} <button type="submit" class="btn btn-danger btn-wide">{% trans "Delete"%}</button>
</button>
</div> </div>
</form> </form>
</div> </div>
@ -64,23 +61,18 @@
</div> </div>
</td> </td>
<td> <td>
<p type="button" data-toggle="modal" style="margin: 0" data-target="#Modal_public_key{{ user_key.id }}"> <p data-toggle="modal" style="margin: 0" data-target="#Modal_public_key{{ user_key.id }}">
<a href="#">{% trans "Show" %}</a> <a href="#">{% trans "Show" %}</a>
</p> </p>
<div class="modal fade" id="Modal_public_key{{user_key.id }}" tabindex="-1" role="dialog"> <div class="modal fade" id="Modal_public_key{{user_key.id }}" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" <button type="button" class="close" data-dismiss="modal" aria-label="Confirm"><span aria-hidden="true">&times;</span></button>
aria-label="Confirm"><span
aria-hidden="true">&times;</span>
</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<h4 class="modal-title" id="ModalLabel_Public_Key">{% trans "Public SSH Key" %}</h4> <h4 class="modal-title" id="ModalLabel_Public_Key">{% trans "Public SSH Key" %}</h4>
<p class="key_contain" style="margin-top: 10px;">{{ user_key.public_key }}</p> <p class="key_contain" style="margin-top: 10px;">{{ user_key.public_key }}</p>
<div class="modal-footer">
</div>
</div> </div>
</div> </div>
</div> </div>
@ -90,10 +82,9 @@
<td> <td>
{% if user_key.private_key %} {% if user_key.private_key %}
<form action="{{ user_key.private_key.url }}"> <form action="{{ user_key.private_key.url }}">
<button style="color: #717274" type="submit" class="btn btn-default" data-toggle="modal" <button style="color: #717274" type="submit" class="btn btn-default">
> <span class="pc-only">{% trans "Download" %}</span>
<span class="pc-only">{% trans "Download" %}</span> <span class="mob-only"><i class="fa fa-download"></i></span>
<span class="mob-only"><i class="fa fa-download"></i></span>
</button> </button>
</form> </form>
{% endif %} {% endif %}

6
hosting/templates/hosting/virtual_machine_detail.html
View file

@ -101,9 +101,9 @@
<p>{% trans "Do you want to cancel your Virtual Machine" %} ?</p> <p>{% trans "Do you want to cancel your Virtual Machine" %} ?</p>
<p><strong>{{virtual_machine.name}}</strong></p> <p><strong>{{virtual_machine.name}}</strong></p>
</div> </div>
</div> <div class="modal-footer">
<div class="modal-footer"> <a class="btn btn-danger btn-ok btn-wide">{% trans "OK" %}</a>
<a class="btn btn-danger btn-ok">{% trans "OK" %}</a> </div>
</div> </div>
</div> </div>
</div> </div>