diff --git a/Changelog b/Changelog index 1f5b70e6..cde72cb8 100644 --- a/Changelog +++ b/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 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 diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index c0dc55ca..80d88c04 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/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" @@ -256,25 +258,10 @@ msgid "Contact us" msgstr "Kontaktiere uns" msgid "Switzerland " -msgstr "Schweiz" +msgstr "Schweiz " -msgid "Confirm Order" -msgstr "Bestellung Bestätigen" - -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 "Your Order" +msgstr "Deine Bestellung" 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" +msgstr "endend" + +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" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9d83a88f..9025473e 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/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%; @@ -972,6 +967,10 @@ tech-sub-sec h2 { .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover { background: transparent; +} +.navbar-transparent .navbar-nav>.open>a, +.navbar-transparent .navbar-nav>.open>a:focus, +.navbar-transparent .navbar-nav>.open>a:hover { color: #fff; } diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf deleted file mode 100755 index 6848db0d..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf deleted file mode 100755 index 5decf129..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf deleted file mode 100755 index 74343694..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf deleted file mode 100755 index 684aacf5..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf deleted file mode 100755 index 288be295..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf deleted file mode 100755 index c2bfd335..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf deleted file mode 100755 index 3d3b7a29..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf deleted file mode 100755 index a958067a..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf deleted file mode 100755 index 5e45ad9a..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf deleted file mode 100755 index 04ea8efb..00000000 Binary files a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt b/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt deleted file mode 100755 index f8ca7bc3..00000000 --- a/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt +++ /dev/null @@ -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. diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index 2e928955..c508d76d 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -86,17 +86,29 @@ } function _initNavUrl() { + $('.url-init').each(function(idx, el) { + var $this = $(el); + var currentPath = window.location.pathname; + var thisPaths = $this.attr('href').split('#') + if ($this.hasClass('dropdown-toggle') && window.matchMedia("(max-width: 767px)").matches) { + $this.removeClass('url-init'); + $this.attr('href', ''); + } else if ($('#'+thisPaths[1]).length) { + $this.removeClass('url-init').addClass('url'); + $this.attr('href', '#' + thisPaths[1]); + } else { + $this.removeClass('url-init'); + } + }); $('.url').click(function(event) { event.preventDefault(); - var href = $(this).attr('data-url'); + var href = $(this).attr('href'); $('.navbar-collapse').removeClass('in'); $('.navbar-collapse').addClass('collapsing'); if ($(href).length) { $('html, body').animate({ scrollTop: $(href).offset().top }, 1000); - } else { - window.location.href = '/datacenterlight' + href; } }); } diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html index 671d894e..45b30cad 100644 --- a/datacenterlight/templates/datacenterlight/base.html +++ b/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 %} @@ -41,7 +41,6 @@ - {% cms_toolbar %} {% include "datacenterlight/includes/_navbar.html" %} diff --git a/datacenterlight/templates/datacenterlight/cms_page.html b/datacenterlight/templates/datacenterlight/cms_page.html index f42528e4..3e3b038a 100644 --- a/datacenterlight/templates/datacenterlight/cms_page.html +++ b/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" %} {% endaddtoblock %} -
-

{% placeholder 'datacenterlight_cms_page_title' %}

+

{% page_attribute page_title %}

diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html index f77c3385..76c2c16e 100644 --- a/datacenterlight/templates/datacenterlight/includes/_footer.html +++ b/datacenterlight/templates/datacenterlight/includes/_footer.html @@ -2,52 +2,37 @@ {% get_current_language as LANGUAGE_CODE %} diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index 9df9e227..ee791648 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -1,99 +1,47 @@ -{% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} {% load custom_tags %} +{% load staticfiles i18n%} {% load custom_tags %} {% get_current_language as LANGUAGE_CODE %} diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 3f89055c..cde420dd 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -16,10 +16,10 @@
diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html new file mode 100644 index 00000000..f4974a56 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -0,0 +1,217 @@ +{% extends "hosting/base_short.html" %} +{% load staticfiles bootstrap3 i18n %} + +{% block navbar %} + {% include "datacenterlight/includes/_navbar.html" %} +{% endblock navbar %} + +{% block content %} + + +
+
+
+
+

{%trans "Your Order" %}

+
+
+ {%trans "Cores" %} +
+
+ {%trans "Memory" %} +
+
+ {%trans "Disk space" %} +
+
+ {%trans "Configuration" %} +
+
+
+
+ {{request.session.specs.cpu|floatformat}} +
+
+ {{request.session.specs.memory|floatformat}} GB +
+
+ {{request.session.specs.disk_size|floatformat}} GB +
+
+ {{request.session.template.name}} +
+
+
+
+ {%trans "Total" %} {%trans "including VAT" %} +
+
+
+
{{request.session.specs.price}} + CHF/{% trans "Month" %} +
+
+
+
+
+
+
+
+

{%trans "Billing Address"%}

+
+
+ {% for field in form %} + {% csrf_token %} + {% bootstrap_field field show_label=False type='fields'%} + {% endfor %} +
+
+
+

{%trans "Credit Card"%}

+
+
+
+

+ {% blocktrans %} + Please fill in your credit card information below. We are using Stripe for payment and do not store + your information in our database. + {% endblocktrans %} +

+
+
+
+ {% if credit_card_data.last4 %} +
+
Credit Card
+
Last 4: *****{{credit_card_data.last4}}
+
Type: {{credit_card_data.cc_brand}}
+ +
+
+
+ {% if not messages and not form.non_field_errors %} +

+ {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} +

+ {% endif %} +
+ {% for message in messages %} + {% if 'failed_payment' or 'make_charge_error' in message.tags %} +
  • +

    {{ message|safe }}

    +
+ {% endif %} + {% endfor %} + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %} +
+
+
+
+ +
+
+
+ + {% else %} +
+ +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ + +
+
+
+ +
+
+ {% if not messages and not form.non_field_errors %} +

+ {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} +

+ {% endif %} +
+ {% for message in messages %} + {% if 'failed_payment' or 'make_charge_error' in message.tags %} +
  • +

    {{ message|safe }}

    +
+ {% endif %} + {% endfor %} + + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %} +
+
+
+
+ +
+
+
+ + +
+ + {% endif %} +
+
+
+
+
+
+
+ + +{% if stripe_key %} +{% get_current_language as LANGUAGE_CODE %} + +{%endif%} + +{% if credit_card_data.last4 and credit_card_data.cc_brand %} + +{%endif%} + +{%endblock%} diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html index 2fcddd51..b55953bf 100644 --- a/datacenterlight/templates/datacenterlight/order_detail.html +++ b/datacenterlight/templates/datacenterlight/order_detail.html @@ -2,6 +2,11 @@ {% load staticfiles bootstrap3 %} {% load i18n %} {% load custom_tags %} + +{% block navbar %} + {% include "datacenterlight/includes/_navbar.html" %} +{% endblock navbar %} + {% block content %}
diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 25c2b87f..0521ffef 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -406,7 +406,7 @@ class WhyDataCenterLightView(IndexView): class PaymentOrderView(FormView): - template_name = 'hosting/payment.html' + template_name = 'datacenterlight/landing_payment.html' form_class = BillingAddressForm def get_form_kwargs(self): @@ -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 @@ -554,7 +554,7 @@ class OrderConfirmationView(DetailView): stripe_subscription_obj = subscription_result.get('response_object') # Check if the subscription was approved and is active if stripe_subscription_obj is None or \ - stripe_subscription_obj.status != 'active': + stripe_subscription_obj.status != 'active': msg = subscription_result.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index fac8cc5a..f905d905 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-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 \n" "Language-Team: LANGUAGE \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" diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 1ebae4b4..699f417c 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -1,3 +1,9 @@ +@media (min-width: 768px) { + .navbar-right { + margin-right: 10px; + } +} + .dashboard-container { padding-top:70px; padding-bottom: 70px; @@ -103,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; @@ -111,7 +117,7 @@ color: #999; } .modal-body .modal-icon { - margin-bottom: 10px; + margin-bottom: 15px; } .modal-title { margin: 0; @@ -122,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%; @@ -132,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 { @@ -233,4 +239,8 @@ -webkit-transform: translate(-50%,-50%); -ms-transform: translate(-50%,-50%); transform: translate(-50%,-50%); +} + +.btn-wide { + min-width: 100px; } \ 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 3672552e..b69f1b8f 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/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%; @@ -39,11 +25,28 @@ h6 { .topnav { font-size: 14px; } +.topnav .navbar-fixed-top .navbar-collapse { + max-height: 740px; +} +.navbar-brand { + padding: 10px 15px; +} + +.navbar-default { + background: #fff; + box-shadow: 0 3px 3px -2px hsla(0,0%,78%,.72); +} + +.navbar-default .navbar-header { + position: relative; + z-index: 1; +} .navbar-transparent { background: transparent; border: none; padding: 20px; + box-shadow: none; } .navbar-transparent.topnav { @@ -71,6 +74,42 @@ h6 { /* color: #fff; */ } +.navbar-right .highlights-dropdown .dropdown-menu { + left: 0 !important; + min-width: 155px; + margin-left: 15px; + padding: 5px !important; +} +@media(min-width: 768px) { + .navbar-right .highlights-dropdown .dropdown-menu { + border: 1px solid #fff; + } + .navbar-right .highlights-dropdown .dropdown-menu:before { + content: ''; + display: block; + height: 1px; + background: #e7e7e7; + position: absolute; + top: -1px; + left: -1px; + right: -1px; + } +} +.navbar-right .highlights-dropdown .dropdown-menu > li > a{ + font-size: 13px; + font-weight: 300; + font-family: 'Lato', sans-serif; + padding: 1px 10px !important; + background: transparent; + color: #333; +} +.navbar-right .highlights-dropdown .dropdown-menu > li > a:hover, +.navbar-right .highlights-dropdown .dropdown-menu > li > a:focus, +.navbar-right .highlights-dropdown .dropdown-menu > li > a:active { + background: transparent; + text-decoration: underline !important; +} + .lead { font-size: 18px; font-weight: 400; @@ -761,6 +800,30 @@ a.unlink:hover { color: #ddd; } +.visible-mobile { + display: none !important; +} + +@media(max-width:767px) { + .visible-mobile { + display: block !important; + } + .visible-desktop { + display: none !important; + } +} + +.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover, +.navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a:focus, .navbar-default .navbar-nav>.active>a:hover { + background-color: transparent; +} + +@media (max-width: 767px) { + .navbar-default .navbar-nav .open .dropdown-menu>.active>a, .navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus, .navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover { + background-color: transparent; + } +} + /* bootstrap danger color override from #a94442 */ .text-danger, .has-error .help-block, diff --git a/hosting/static/hosting/css/user_keys.css b/hosting/static/hosting/css/user_keys.css index 7935344f..6039ae0e 100644 --- a/hosting/static/hosting/css/user_keys.css +++ b/hosting/static/hosting/css/user_keys.css @@ -163,8 +163,8 @@ /* margin-left: 0; */ } .col-md-12, .col-sm-12{ - padding-left: 5px; - padding-right: 5px; + /*padding-left: 5px;*/ + /*padding-right: 5px;*/ } } @media (max-width: 360px){ @@ -172,8 +172,8 @@ /* width: 100% !important; */ } .container { - padding-right: 5px; - padding-left: 5px; + /*padding-right: 5px; + padding-left: 5px;*/ } } .dashboard-choice-container { @@ -299,6 +299,7 @@ } .key_contain { word-break: break-all; + margin-bottom: 15px; } .custom_form_button{ border-radius: 0; diff --git a/hosting/static/hosting/fonts/Lato/Lato-Black.ttf b/hosting/static/hosting/fonts/Lato/Lato-Black.ttf deleted file mode 100755 index 6848db0d..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-Black.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf deleted file mode 100755 index 5decf129..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf b/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf deleted file mode 100755 index 74343694..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf deleted file mode 100755 index 684aacf5..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf b/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf deleted file mode 100755 index 288be295..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf deleted file mode 100755 index c2bfd335..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf b/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf deleted file mode 100755 index 3d3b7a29..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Light.ttf b/hosting/static/hosting/fonts/Lato/Lato-Light.ttf deleted file mode 100755 index a958067a..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-Light.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf deleted file mode 100755 index 5e45ad9a..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf b/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf deleted file mode 100755 index 04ea8efb..00000000 Binary files a/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf and /dev/null differ diff --git a/hosting/static/hosting/fonts/Lato/OFL.txt b/hosting/static/hosting/fonts/Lato/OFL.txt deleted file mode 100755 index f8ca7bc3..00000000 --- a/hosting/static/hosting/fonts/Lato/OFL.txt +++ /dev/null @@ -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. diff --git a/hosting/static/hosting/js/initial.js b/hosting/static/hosting/js/initial.js index 2f00c996..4408a299 100644 --- a/hosting/static/hosting/js/initial.js +++ b/hosting/static/hosting/js/initial.js @@ -1,5 +1,59 @@ -$( document ).ready(function() { +// also declared in datacenterlight/js/main.js +function _initNavUrl() { + // $('.url').click(function(event) { + // event.preventDefault(); + // var href = $(this).attr('href'); + // $('.navbar-collapse').removeClass('in'); + // $('.navbar-collapse').addClass('collapsing'); + // if ($(href).length) { + // $('html, body').animate({ + // scrollTop: $(href).offset().top + // }, 1000); + // } else { + // window.location.href = '/datacenterlight' + href; + // } + // }); + $('.url-init').each(function(idx, el) { + var $this = $(el); + var currentPath = window.location.pathname; + var thisPaths = $this.attr('href').split('#') + if ($this.hasClass('dropdown-toggle') && window.matchMedia("(max-width: 767px)").matches) { + $this.removeClass('url-init'); + $this.attr('href', ''); + } else if ($('#'+thisPaths[1]).length) { + $this.removeClass('url-init').addClass('url'); + $this.attr('href', '#' + thisPaths[1]); + } else { + $this.removeClass('url-init'); + } + }); + $('.url').click(function(event) { + event.preventDefault(); + var href = $(this).attr('href'); + $('.navbar-collapse').removeClass('in'); + $('.navbar-collapse').addClass('collapsing'); + if ($(href).length) { + $('html, body').animate({ + scrollTop: $(href).offset().top + }, 1000); + } + }); +} +/* --------------------------------------------- + Nav panel classic + --------------------------------------------- */ +if (window.matchMedia("(min-width: 767px)").matches) { + $('ul.nav li.dropdown').hover(function() { + $(this).find('.dropdown-menu').stop(true, true).fadeIn(500); + }, function() { + $(this).find('.dropdown-menu').stop(true, true).fadeOut(500); + }); +} else { + /* the viewport is less than 400 pixels wide */ +} + +$( document ).ready(function() { $('[data-toggle="tooltip"]').tooltip(); @@ -13,6 +67,8 @@ $( document ).ready(function() { }, 1000); }); + _initNavUrl(); + /* * Replace all SVG images with inline SVG */ diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index 4dcf5074..5030d9ab 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -58,12 +58,14 @@
- + {% if request.user.is_authenticated %} + + {% endif %}
{% if request.user.is_authenticated %} diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 8a5f39f6..64c0b5d3 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -1,7 +1,7 @@ {% extends "hosting/base_short.html" %} {% load staticfiles bootstrap3 %} {% load i18n %} -{% block content %} +{% block content %}
{% if messages %} @@ -17,7 +17,7 @@
{% endif %} {% if not error %} -
+

{{page_header_text}}

{% trans "Order #"%} {{order.id}}

@@ -29,9 +29,11 @@ {% trans "Date"%}:
{{order.created_at|date:'Y-m-d H:i'}}

{% trans "Status:"%}
- {{order.status}} + {% if order.status == 'Approved' %} + {% trans "Approved" %} + {% else %} + {% trans "Declined" %} + {% endif %}

@@ -44,20 +46,20 @@ {{order.billing_address.city}}, {{order.billing_address.country}}.
- +
{% trans "Payment Method:"%}
- {{order.cc_brand}} ending **** {{order.last4}}
+ {{order.cc_brand}} {% trans "ending in" %} **** {{order.last4}}
{{user.email}}
- +

{% trans "Order summary"%}

@@ -83,8 +85,8 @@ {% endif %}
- - - {%endif%} {%endblock%} diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html index 31332929..1cfb880c 100644 --- a/hosting/templates/hosting/user_keys.html +++ b/hosting/templates/hosting/user_keys.html @@ -33,8 +33,7 @@ {{user_key.name}} - @@ -42,20 +41,18 @@
- +
-
- -

{% trans "Do you want to delete this key?"%}

+
+ +
+

{% trans "Do you want to delete this key?"%}

+
{% csrf_token %}
- +
@@ -64,23 +61,18 @@
-

+

{% trans "Show" %}

-
-
- {% trans "OK" %} +
+ {% trans "OK" %} +