Merge branch 'master' into task/3756/landing_billing_page

Changelog

@@ -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
     * #3709: [datacenterlight] Added faq tos cms template
     * #3657: [datacenterlight] Added a new contact section at landing

datacenterlight/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:28+0000\n"
+"POT-Creation-Date: 2017-09-02 03:08+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"
@@ -95,7 +95,9 @@ msgid "Message"
 msgstr "Nachricht"
 
 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"
 msgstr "ABSENDEN"
@@ -166,6 +168,9 @@ msgstr ""
 "Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst "
 "%(base_url)s%(activation_link)s\n"
 
+msgid "Home"
+msgstr "Home"
+
 msgid "Highlights"
 msgstr ""
 
@@ -175,18 +180,15 @@ msgstr "Skalierung"
 msgid "Reliable and light"
 msgstr "Zuverlässig und leicht"
 
+msgid "Pricing"
+msgstr "Preise"
+
 msgid "Order VM"
 msgstr "VM bestellen"
 
 msgid "Contact"
 msgstr "Kontakt"
 
-msgid "Home"
-msgstr "Home"
-
-msgid "Pricing"
-msgstr "Preise"
-
 msgid "All Rights Reserved"
 msgstr "Alle Rechte vorbehalten"
 
@@ -258,23 +260,8 @@ msgstr "Kontaktiere uns"
 msgid "Switzerland "
 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"
 msgstr "Prozessorkerne"
@@ -289,13 +276,80 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 msgid "Total"
-msgstr ""
+msgstr "Gesamt"
+
+msgid "including VAT"
+msgstr "inkl. Mehrwertsteuer"
 
-#, fuzzy
-#| msgid "month"
 msgid "Month"
 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
 msgid ""
 "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"
 msgstr ""
 "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!"
 msgstr ""
@@ -495,9 +549,6 @@ msgstr "ist keine gültige E-Mailadresse"
 #~ msgid "Buy Now!"
 #~ msgstr "Kaufe jetzt!"
 
-#~ msgid "Email address"
-#~ msgstr "E-Mail Adresse"
-
 #~ msgid "Our promise"
 #~ msgstr "Unser Versprechen"
 

datacenterlight/static/datacenterlight/css/landing-page.css

@@ -4,11 +4,6 @@
  * For details, see http://www.apache.org/licenses/LICENSE-2.0.
  */
 
-/*@font-face {
-    font-family: 'Lato-Light';
-    src: url('../fonts/Lato/Lato-Light.ttf');
-}*/
-
 body,
 html {
     width: 100%;

datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt

@@ -1,92 +0,0 @@
-Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

datacenterlight/templates/datacenterlight/base.html

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

datacenterlight/templates/datacenterlight/cms_page.html

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

datacenterlight/templates/datacenterlight/order_detail.html

@@ -50,7 +50,7 @@
                         <div class="col-xs-6">
                             <address>
                                 <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}}
                             </address>
                         </div>

datacenterlight/views.py

@@ -478,7 +478,7 @@ class PaymentOrderView(FormView):
 
 class OrderConfirmationView(DetailView):
     template_name = "datacenterlight/order_detail.html"
-    payment_template_name = 'hosting/payment.html'
+    payment_template_name = 'datacenterlight/landing_payment.html'
     context_object_name = "order"
     model = HostingOrder
 

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-31 23:46+0530\n"
+"POT-Creation-Date: 2017-09-02 03:08+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"
@@ -73,7 +73,7 @@ msgid "Mwst-Nummer: CHE-109.549.333 MWST"
 msgstr ""
 
 msgid "Total:"
-msgstr ""
+msgstr "Gesamt:"
 
 #, python-format
 msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
@@ -242,12 +242,21 @@ msgstr "Datum"
 msgid "Status:"
 msgstr ""
 
+msgid "Approved"
+msgstr "Akzeptiert"
+
+msgid "Declined"
+msgstr "Abgelehnt"
+
 msgid "Billed To:"
 msgstr "Rechnungsadresse"
 
 msgid "Payment Method:"
 msgstr "Bezahlmethode"
 
+msgid "ending in"
+msgstr "endend in"
+
 msgid "Order summary"
 msgstr "Bestellungsübersicht"
 
@@ -458,7 +467,7 @@ msgid "Virtual Machines"
 msgstr "Virtuelle Maschinen"
 
 msgid "To create a new virtual machine, click \"Create VM\""
-msgstr ""
+msgstr "Um eine neue VM zu erzeugen, klicke \"Neue VM erzeugen\""
 
 msgid "CREATE VM"
 msgstr "NEUE VM"
@@ -507,12 +516,6 @@ msgstr "Kontaktiere den Data Center Light Support."
 #~ msgid "Your SSH Keys"
 #~ msgstr "Deine SSH Keys"
 
-#~ msgid "Approved"
-#~ msgstr "Akzeptiert"
-
-#~ msgid "Declined"
-#~ msgstr "Abgelehnt"
-
 #~ msgid "Cancel Order"
 #~ msgstr "Bestellung stornieren"
 

hosting/static/hosting/css/commons.css

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

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

@@ -4,20 +4,6 @@
  * For details, see http://www.apache.org/licenses/LICENSE-2.0.
  */
 
-/*@font-face {
-    font-family: 'Lato-Regular';
-    src: url('../fonts/Lato/Lato-Regular.ttf');
-}
-
-@font-face {
-    src: url('../fonts/Lato/Lato-Black.ttf');
-}
-
-@font-face {
-    font-family: 'Lato-Light';
-    src: url('../fonts/Lato/Lato-Light.ttf');
-}*/
-
 body,
 html {
     width: 100%;

hosting/static/hosting/css/user_keys.css

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

hosting/static/hosting/fonts/Lato/OFL.txt

@@ -1,92 +0,0 @@
-Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

hosting/templates/hosting/order_detail.html

@@ -29,9 +29,11 @@
                         <strong>{% trans "Date"%}:</strong><br>
                         <span id="order-created_at">{{order.created_at|date:'Y-m-d H:i'}}</span><br><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>
                     </address>
 
@@ -50,7 +52,7 @@
     			<div class="col-xs-6">
     				<address>
     					<strong>{% trans "Payment Method:"%}</strong><br>
-    					{{order.cc_brand}} ending **** {{order.last4}}<br>
+    					{{order.cc_brand}} {% trans "ending in" %} **** {{order.last4}}<br>
     					{{user.email}}
     				</address>
     			</div>

hosting/templates/hosting/orders.html

@@ -5,7 +5,7 @@
 {% block content %}
 <div class="dashboard-container">
     <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 %}
             <div class="alert alert-warning">
                 {% for message in messages %}
@@ -34,9 +34,9 @@
                     <td class="xs-td-smallhalf" data-header="{% trans 'Amount' %}">{{ order.price }}</td>
                     <td data-header="{% trans 'Status' %}">
                         {% if order.approved %}
-                            <span class="vm-status-active"><strong>Approved</strong></span>
+                            <span class="vm-status-active"><strong>{% trans "Approved" %}</strong></span>
                         {% else %}
-                            <span class="vm-status-failed"><strong>Declined</strong></span>
+                            <span class="vm-status-failed"><strong>{% trans "Declined" %}</strong></span>
                         {% endif %}
                     </td>
                     <td class="text-right last-td">

hosting/templates/hosting/payment.html

@@ -1,10 +1,6 @@
 {% 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"/>

hosting/templates/hosting/user_keys.html

@@ -33,8 +33,7 @@
                 <tr>
                     <td scope="row">{{user_key.name}}</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="mob-only"><i class="fa fa-trash"></i></span>
                         </button>
@@ -42,20 +41,18 @@
                             <div class="modal-dialog" role="document">
                                 <div class="modal-content">
                                     <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 class="modal-body">
                                         <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>
-                                        <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 %}">
                                             {% csrf_token %}
                                             <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>
                                         </form>
                                     </div>
@@ -64,23 +61,18 @@
                         </div>
                      </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>
                         </p>
                         <div class="modal fade" id="Modal_public_key{{user_key.id }}" tabindex="-1" role="dialog">
                             <div class="modal-dialog" role="document">
                                 <div class="modal-content">
                                     <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 class="modal-body">
                                         <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>
-                                        <div class="modal-footer">
-                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -90,8 +82,7 @@
                     <td>
                         {% if user_key.private_key %}
                         <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="mob-only"><i class="fa fa-download"></i></span>
                             </button>

hosting/templates/hosting/virtual_machine_detail.html

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