diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index f905d905..9ba7f22b 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/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-09-02 03:08+0530\n" +"POT-Creation-Date: 2017-09-05 00:59+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -356,6 +356,32 @@ msgstr "Deine Kreditkartennummer" msgid "Reset your password" msgstr "Passwort zurücksetzen" +msgid "UPDATE" +msgstr "" + +msgid "Last" +msgstr "" + +msgid "Type" +msgstr "Kartentyp" + +msgid "REMOVE CARD" +msgstr "KARTE ENTFERNEN" + +msgid "EDIT CARD" +msgstr "BEARBEITEN" + +msgid "No Credit Cards Added" +msgstr "Es wurde keine Kreditkarte hinzugefügt" + +msgid "" +"We are using Stripe for payment and do " +"not store your information in our database." +msgstr "" +"Wir nutzen Stripe für die Bezahlung und " +"speichern keine Informationen in unserer Datenbank." + msgid "Add your public SSH key" msgstr "Füge deinen öffentlichen SSH-Key hinzu" @@ -513,6 +539,12 @@ msgid "" "contact Data Center Light Support." msgstr "Kontaktiere den Data Center Light Support." +#~ msgid "Add a new Card." +#~ msgstr "Neue Kreditkarte hinzufügen." + +#~ msgid "You are not making any payment here." +#~ msgstr "Es wird noch keine Bezahlung vorgenommen" + #~ msgid "Your SSH Keys" #~ msgstr "Deine SSH Keys" diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 699f417c..8c8a9470 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -12,6 +12,11 @@ max-width: 768px; } +.dashboard-container.wide { + padding-top: 90px; + max-width: 980px; +} + .content-dashboard{ min-height: calc(100vh - 70px); width: 80%; @@ -241,6 +246,113 @@ transform: translate(-50%,-50%); } +.settings-container { + padding: 8px; +} + +.settings-container h4 { + margin-bottom: 15px; + color: #333; + font-size: 14px; +} + +.settings-container .card-expiry-element, +.settings-container .card-cvc-element { + padding: 0 15px; +} +.settings-container .card-cvc-element .my-input, +.settings-container .card-cvc-element label { + padding-left: 0; +} + +.settings-container .stripe-payment-btn { + float: none; + position: static; +} + +.settings-container h3 { + font-weight: bold; +} + +.settings-container hr { + margin-top: 15px; +} + +.settings-container .credit-card-details { + padding-bottom: 15px; + border-bottom: 1px solid #eee; +} + +.settings-container .credit-card-details h5 { + font-weight: bold; + font-size: 16px; +} + +.credit-card-form { + max-width: 360px; +} + +.btn-wide { + min-width: 100px; +} + +.caps-link { + font-weight: 600; + color: #8da4c0; + fill: #8da4c0; + padding: 8px 0; + display: block; +} +.caps-link:hover, +.caps-link:focus, +.caps-link:active { + color: #627388; + fill: #627388; + text-decoration: none; +} + +.settings-container .credit-card-details-opt { + padding-top: 15px; +} + +.caps-link .svg-img { + margin-right: 5px; + height: 13px; + position: relative; + top: 1px; + vertical-align: baseline; +} + +.settings-container .caps-link { + font-size: 13px; + letter-spacing: 1.1px; +} + +.settings-container .btn-vm-contact { + font-weight: 600; + font-size: 13px; + /* padding: 4px 15px; */ +} + .btn-wide { min-width: 100px; +} + +.no-cards { + text-align: center; + color: #999; + padding: 15px; + background: rgba(0,0,0,0.02); + display: flex; + flex-direction: column; + height: 230px; + justify-content: center; +} + +.no-cards h4 { + font-size: 24px; +} + +.no-cards a { + color: #7ca3d0; } \ No newline at end of file diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index b69f1b8f..4d87b341 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -608,6 +608,7 @@ a.unlink:hover { border: 1px solid #a1a1a1; border-radius: 3px; padding: 5px; + margin-bottom: 15px; } .card-warning-error { border: 1px solid #EB4D5C; @@ -765,12 +766,12 @@ a.unlink:hover { @media (min-width: 768px) { .dcl-billing { - padding-right: 50px; + padding-right: 65px; border-right: 1px solid #eee; } .dcl-creditcard { - padding-left: 50px; + padding-left: 65px; } .tbl-tot { diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index 806d40c6..b4916da0 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -446,6 +446,11 @@ width: 34px; vertical-align: middle; } +.dashboard-title-thin .un-icon.wide { + height: 38px; + width: 38px; + margin-top: -6px; +} .dashboard-subtitle { font-weight: 300; @@ -533,6 +538,11 @@ width: 22px; margin-top: -3px; } + .dashboard-title-thin .un-icon.wide { + height: 25px; + width: 25px; + margin-top: -5px; + } .dashboard-subtitle p { width: 200px; } diff --git a/hosting/static/hosting/img/delete.svg b/hosting/static/hosting/img/delete.svg new file mode 100644 index 00000000..31991c4a --- /dev/null +++ b/hosting/static/hosting/img/delete.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/hosting/static/hosting/js/initial.js b/hosting/static/hosting/js/initial.js index 4408a299..b7d96601 100644 --- a/hosting/static/hosting/js/initial.js +++ b/hosting/static/hosting/js/initial.js @@ -73,7 +73,6 @@ $( document ).ready(function() { * Replace all SVG images with inline SVG */ $('.svg-img').each(function() { - console.log('asa') var $img = $(this); var imgID = $img.attr('id'); var imgClass = $img.attr('class'); diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index 5030d9ab..90208455 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -25,6 +25,8 @@ + {% block css_extra %} + {% endblock css_extra %} @@ -66,7 +68,7 @@ {% endif %} - + {% if request.user.is_authenticated %} diff --git a/hosting/templates/hosting/dashboard.html b/hosting/templates/hosting/dashboard.html index 4d41874e..d12f75ee 100644 --- a/hosting/templates/hosting/dashboard.html +++ b/hosting/templates/hosting/dashboard.html @@ -32,7 +32,7 @@ - +

{% trans "My Settings" %}

diff --git a/hosting/templates/hosting/includes/_navbar_transparent.html b/hosting/templates/hosting/includes/_navbar_transparent.html index 4efd5920..dec9cd49 100644 --- a/hosting/templates/hosting/includes/_navbar_transparent.html +++ b/hosting/templates/hosting/includes/_navbar_transparent.html @@ -1,10 +1,10 @@ {% load static i18n %}