diff --git a/Changelog b/Changelog index cde72cb8..423517ee 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,14 @@ +1.2.2: 2017-09-08 + * #3704: [hosting] Added my settings page + * #3771: [datacenterlight] Fixed the inconsistency in navbar style in billing page and onward + * #3769: [datacenterlight] Fixed EN dashboard url redirecting to the wrong page + * #3775: [hosting] Made the dashboard as the default start page for hosting app + * #3779: [hosting] Changed signup validation and activation page navbar transparent + * #3759: [hosting] Made the navbar style consistent to the dcl navbar and changed font weight from 300 to 400 for mobile navbar text + * #3644: [datacenterlight] Added a login button on landing + * #3659: [hosting] Changed hosting navbar design +1.2.1: 2017-09-06 + * #3757: [datacenterlight] Added /l route for linkedin 1.2: 2017-09-01 * #3703: [hosting] Added a new dashboard * #3717: [datacenterlight, hosting] Changed warning color for box diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 80d88c04..6c9d36ae 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-09-02 03:08+0530\n" +"POT-Creation-Date: 2017-09-03 16:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,8 +102,11 @@ msgstr "" msgid "SUBMIT" msgstr "ABSENDEN" +msgid "Your Data Center Light Team" +msgstr "Dein Data Center Light Team" + msgid "Thank you for your request." -msgstr "Vielen Dank für Ihre Anfrage." +msgstr "Vielen Dank für Deine Anfrage." msgid "You are one step away from being our beta tester!" msgstr "" @@ -125,47 +128,35 @@ msgstr "" msgid "Thank you!" msgstr "Vielen Dank!" -msgid "account activation" -msgstr "Accountaktivierung" +msgid "Account Activation" +msgstr "Account Aktivierung" #, python-format msgid "" "\n" -" You can activate your %(dcl_text)s account by clicking here.

\n" -" You can also copy and paste the following link into the " -"address bar of your browser and follow the link in order to activate your " -"datacenterlight account.
\n" -" %(base_url)s%(activation_link)s\n" -" " +"You can activate your Data Center Light account by clicking here.
\n" +"You can also copy and paste the following link into the address bar of your " +"browser
\n" +"to activate your Data Center Light account.
\n" +"%(base_url)s%(activation_link)s\n" msgstr "" "\n" -" Klicke hier " -"um deinen %(dcl_text)s zu aktivieren.

\n" -" Oder kopiere den folgenden Link in die Adressleiste deines " -"Browsers und folge dann dem Link um deinen %(dcl_text)s Account zu " -"aktivieren.
\n" -" %(base_url)s%(activation_link)s\n" -" " - -msgid "Your" -msgstr "Dein" - -msgid "team" -msgstr "Team" +"Klicke hier um deinen Data " +"Center Light Account zu aktivieren oder kopiere den folgenden Link in die " +"Adressleiste deines Browsers.
\n" +"%(base_url)s%(activation_link)s\n" #, python-format msgid "" -"\n" -"Hi,\n" -"\n" -"You can activate your %(dcl_text)s account by clicking here %(base_url)s" -"%(activation_link)s\n" +"You can activate your Data Center Light account by clicking here.\n" +"You can also copy and paste the following link into the address bar of your " +"browser\n" +"to activate your Data Center Light account.\n" +"%(base_url)s%(activation_link)s\n" msgstr "" -"\n" -"Hallo,\n" -"\n" -"Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst " +"Klicke hier, um deinen Data Center Light Account zu aktivieren oder kopiere " +"den folgenden Link in die Adressleiste deines Browsers.\n" "%(base_url)s%(activation_link)s\n" msgid "Home" @@ -344,8 +335,8 @@ msgstr "Rechnungsadresse" msgid "Payment Method:" msgstr "Bezahlmethode" -msgid "ending" -msgstr "endend" +msgid "ending in" +msgstr "endend in" msgid "Order summary" msgstr "Bestellungsübersicht" @@ -481,6 +472,25 @@ msgstr "ist kein gültiger Name" msgid "is not a proper email" msgstr "ist keine gültige E-Mailadresse" +#~ msgid "" +#~ "\n" +#~ "Hi,\n" +#~ "\n" +#~ "You can activate your %(dcl_text)s account by clicking here %(base_url)s" +#~ "%(activation_link)s\n" +#~ msgstr "" +#~ "\n" +#~ "Hallo,\n" +#~ "\n" +#~ "Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst " +#~ "%(base_url)s%(activation_link)s\n" + +#~ msgid "Your" +#~ msgstr "Dein" + +#~ msgid "team" +#~ msgstr "Team" + #~ msgid "Questions?" #~ msgstr "Fragen?" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9025473e..6537dd0d 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -122,7 +122,7 @@ button, input, optgroup, select, textarea { .navbar-default { background: #fff; - border: none; + /* border: none; */ padding: 5px; } @@ -143,15 +143,19 @@ button, input, optgroup, select, textarea { .navbar-default .navbar-nav>li>a { cursor: pointer; - /*font-family: 'Lato-Light', sans-serif;*/ - font-weight: 300; + font-weight: 400; } .navbar-transparent .navbar-nav>li>a { color: #fff; cursor: pointer; - /*font-family: 'Lato-Light', sans-serif;*/ - font-weight: 300; +} + +@media (min-width: 768px) { + .navbar-default .navbar-nav>li>a, + .navbar-transparent .navbar-nav>li>a { + font-weight: 300; + } } .navbar-transparent .navbar-nav>li>a:hover { @@ -924,7 +928,7 @@ tech-sub-sec h2 { border: 1px solid #fff; -webkit-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); -moz-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); - box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); + box-shadow: -8px 14px 20px -5px rgba(77, 77, 77, 0.5); display: none; text-align: center; border-radius: 4px !important; @@ -976,8 +980,12 @@ tech-sub-sec h2 { .dropdown-menu>li>a { font-size: 13px; - font-weight: 300; - /*font-family: 'Lato-Light', sans-serif;*/ +} + +@media (min-width: 768px) { + .dropdown-menu>li>a { + font-weight: 300; + } } .navbar-default .navbar-nav>.active>a, diff --git a/datacenterlight/static/datacenterlight/img/dcl-email-bg.jpg b/datacenterlight/static/datacenterlight/img/dcl-email-bg.jpg new file mode 100644 index 00000000..5a62f3e7 Binary files /dev/null and b/datacenterlight/static/datacenterlight/img/dcl-email-bg.jpg differ diff --git a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html new file mode 100644 index 00000000..be8479d9 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html @@ -0,0 +1,176 @@ +{% load static from staticfiles %} +{% load i18n %} + + + + + + + {{dcl_text}} + + + + + + + + + + + + + +
+
+ + + + +
+ +
+ + + + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ {% block email_head %} + {% endblock %} +
+

+ {% block email_body %} + {% endblock %} +

  +
+
+
+
+ + + + +
{% trans 'Your Data Center Light Team' %} +
+
+
+ + + diff --git a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.txt b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.txt new file mode 100644 index 00000000..46fd0730 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.txt @@ -0,0 +1,7 @@ +{% load static from staticfiles %} +{% load i18n %} +{% block email_head %} +{% endblock %} +{% block email_body %} +{% endblock %} +{% trans 'Your Data Center Light Team' %} diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html index e96a8ef1..2f71944f 100644 --- a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html +++ b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html @@ -74,7 +74,7 @@
-
+ logo @@ -95,12 +95,12 @@
- -
+ {% trans "Thank you for your request." %}
+

{% trans "You are one step away from being our beta tester!" %}

{% trans "Currently we are running our tests to make sure everything runs perfectly." %}
{% trans "In the meantime, we would like to ask you a little patience
until our team contacts you with beta access." %}
@@ -117,7 +117,7 @@

-
Your data center light team
+		Your data center light team
diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html index 09531ba6..095c917e 100644 --- a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html +++ b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html @@ -73,7 +73,7 @@
-
+ logo @@ -94,12 +94,12 @@
- - @@ -113,7 +113,7 @@
+ An user requested a beta access
+

User {{email}} requested beta access

-
Your data center light team
+		Your data center light team
diff --git a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html index 7991eb69..c6f3033e 100644 --- a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html +++ b/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html @@ -73,7 +73,7 @@
-
+ logo @@ -94,14 +94,14 @@
- -
+ An user requested a beta access
+

User {{email}} requested beta access

{% for vm in vms %} Type: {{vm.type}} - Amount: {{vm.amount}} @@ -119,7 +119,7 @@
-
Your data center light team
+		Your data center light team
diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html index bf688127..955eed18 100644 --- a/datacenterlight/templates/datacenterlight/emails/user_activation.html +++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html @@ -1,132 +1,14 @@ +{% extends "datacenterlight/emails/base_email_datacenterlight.html" %} {% load static from staticfiles %} {% load i18n %} - - - - - - -{{dcl_text}} - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- {{dcl_text}} {% trans 'account activation' %} -
-

- {% blocktrans %} - You can activate your {{dcl_text}} account by clicking here.

- You can also copy and paste the following link into the address bar of your browser and follow the link in order to activate your datacenterlight account.
- {{base_url}}{{activation_link}} - {% endblocktrans %} -

 
-
-
-
- - -
{% trans 'Your' %} {{dcl_text}} {% trans 'team' %}
-
-
-
- - - +{% block email_head %} +{{dcl_text}} {% trans 'Account Activation' %} +{% endblock %} +{% block email_body %} +{% blocktrans %} +You can activate your Data Center Light account by clicking here.
+You can also copy and paste the following link into the address bar of your browser
+to activate your Data Center Light account.
+{{base_url}}{{activation_link}} +{% endblocktrans %} +{% endblock %} diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.txt b/datacenterlight/templates/datacenterlight/emails/user_activation.txt index e40ef956..84ec50a9 100644 --- a/datacenterlight/templates/datacenterlight/emails/user_activation.txt +++ b/datacenterlight/templates/datacenterlight/emails/user_activation.txt @@ -1,11 +1,10 @@ -{% load static from staticfiles %} +{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} {% load i18n %} -{{dcl_text}} {% trans 'account activation' %} - -{% blocktrans %} -Hi, - -You can activate your {{dcl_text}} account by clicking here {{base_url}}{{activation_link}} +{% block email_head %}{{dcl_text}} {% trans 'Account Activation' %}{% endblock %} +{% block email_body %} +{% blocktrans %}You can activate your Data Center Light account by clicking here. +You can also copy and paste the following link into the address bar of your browser +to activate your Data Center Light account. +{{base_url}}{{activation_link}} {% endblocktrans %} - -{% trans 'Your' %} {{dcl_text}} {% trans 'team' %} +{% endblock %} diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index ee791648..e2f1edc0 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -1,10 +1,12 @@ -{% load staticfiles i18n%} {% load custom_tags %} {% get_current_language as LANGUAGE_CODE %} +{% load staticfiles i18n%} +{% load custom_tags %} +{% get_current_language as LANGUAGE_CODE %} + {% include "hosting/includes/_navbar_user.html" %} {% endblock navbar %} 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/emails/new_booked_vm.html b/hosting/templates/hosting/emails/new_booked_vm.html index 0f9b4f6e..864cf813 100644 --- a/hosting/templates/hosting/emails/new_booked_vm.html +++ b/hosting/templates/hosting/emails/new_booked_vm.html @@ -1,140 +1,14 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- You have booked a virtual machine! -
- Your virtual machine {{vm.name}} subscription has been charged, -
- we are going to contact you as soon your virtual machine has been activated. -
- You can view your invoice clicking on the button below. -
-
-View Invoice +{% extends "datacenterlight/emails/base_email_datacenterlight.html" %} +{% load i18n %} +{% block email_head %}{{page_header}}{% endblock %} +{% block email_body %} +{% url 'hosting:orders' order.id as order_url %} +{% blocktrans with vm.name as vm_name %}You have ordered a new virtual machine! +
+Your order of [{{vm_name}}] has been charged.

+You can view your invoice by clicking the button below.

+{% endblocktrans %} +
+ {% trans 'View Invoice' %}
-
-
-
-
- - -
- ungleich
-
-
-
- - - +{% endblock %} diff --git a/hosting/templates/hosting/emails/new_booked_vm.txt b/hosting/templates/hosting/emails/new_booked_vm.txt index 0f9b4f6e..b8e3eed1 100644 --- a/hosting/templates/hosting/emails/new_booked_vm.txt +++ b/hosting/templates/hosting/emails/new_booked_vm.txt @@ -1,140 +1,11 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- You have booked a virtual machine! -
- Your virtual machine {{vm.name}} subscription has been charged, -
- we are going to contact you as soon your virtual machine has been activated. -
- You can view your invoice clicking on the button below. -
- -
-
-
-
- - -
- ungleich
-
-
-
- - - +{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} +{% load i18n %} +{% block email_head %}{{page_header}}{% endblock %} +{% block email_body %} +{% url 'hosting:orders' order.id as order_url %} +{% blocktrans with vm.name as vm_name %}You have ordered a new virtual machine! +Your order of [{{vm_name}}] has been charged. +You can view your invoice here. +{% endblocktrans %} +{{ base_url }}{{order_url}} +{% endblock %} diff --git a/hosting/templates/hosting/emails/password_reset_email.html b/hosting/templates/hosting/emails/password_reset_email.html index 682834f5..b83a08f2 100644 --- a/hosting/templates/hosting/emails/password_reset_email.html +++ b/hosting/templates/hosting/emails/password_reset_email.html @@ -1,13 +1,14 @@ -{% load i18n %}{% autoescape off %} -{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} - -{% trans "Please go to the following page and choose a new password:" %} - {% block reset_link %} - {{ base_url }}{% url 'hosting:reset_password_confirm' uidb64=uid token=token %} - {% endblock %} - -{% trans "Thanks for using our site!" %} - -{% blocktrans %}The {{ site_name }} team{% endblocktrans %} - -{% endautoescape %} \ No newline at end of file +{% extends "datacenterlight/emails/base_email_datacenterlight.html" %} +{% load i18n %} +{% block email_head %} +{% trans 'Password Reset' %} +{% endblock %} +{% block email_body %} +{% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %} +{% blocktrans %} +You're receiving this email because you requested a password reset for your user account at {{site_name}}.
+Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }}
+If you didn't request a new password, ignore this e-mail.
+Thank you! +{% endblocktrans %} +{% endblock %} diff --git a/hosting/templates/hosting/emails/password_reset_email.txt b/hosting/templates/hosting/emails/password_reset_email.txt index 682834f5..769166ed 100644 --- a/hosting/templates/hosting/emails/password_reset_email.txt +++ b/hosting/templates/hosting/emails/password_reset_email.txt @@ -1,13 +1,11 @@ -{% load i18n %}{% autoescape off %} -{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} - -{% trans "Please go to the following page and choose a new password:" %} - {% block reset_link %} - {{ base_url }}{% url 'hosting:reset_password_confirm' uidb64=uid token=token %} - {% endblock %} - -{% trans "Thanks for using our site!" %} - -{% blocktrans %}The {{ site_name }} team{% endblocktrans %} - -{% endautoescape %} \ No newline at end of file +{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} +{% load i18n %} +{% block email_head %}{% trans 'Password Reset' %}{% endblock %} +{% block email_body %} +{% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %} +{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{site_name}}. +Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }} +If you didn't request a new password, ignore this e-mail. +Thank you! +{% endblocktrans %} +{% endblock %} diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html new file mode 100644 index 00000000..68c7b9fd --- /dev/null +++ b/hosting/templates/hosting/emails/vm_canceled.html @@ -0,0 +1,15 @@ +{% extends "datacenterlight/emails/base_email_datacenterlight.html" %} +{% load i18n %} +{% block email_head %}{{page_header}}{% endblock %} +{% block email_body %} +{% url 'hosting:virtual_machines' as my_virtual_machines_url %} +{% url 'hosting:orders' as vm_orders_url %} +{% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled.
+You can see your order status by clicking [my VM page] below.
+If you want to order a new virtual machine, you can do it by clicking this link.
+{% endblocktrans %} +
+ {% trans 'My VM page' %} +
+{% endblock %} + diff --git a/hosting/templates/hosting/emails/vm_canceled.txt b/hosting/templates/hosting/emails/vm_canceled.txt new file mode 100644 index 00000000..e20e639c --- /dev/null +++ b/hosting/templates/hosting/emails/vm_canceled.txt @@ -0,0 +1,13 @@ +{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} +{% load i18n %} +{% block email_head %}{{page_header}}{% endblock %} +{% block email_body %} +{% url 'hosting:virtual_machines' as my_virtual_machines_url %} +{% url 'hosting:orders' order.id as vm_order_url %} +{% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled. +You can see your order status by clicking here +{{base_url}}{{vm_order_url}} +If you want to order a new virtual machine, you can do it by clicking this link. +{{base_url}}{{my_virtual_machines_url}} +{% endblocktrans %} +{% endblock %} \ No newline at end of file diff --git a/hosting/templates/hosting/emails/vm_status_changed.html b/hosting/templates/hosting/emails/vm_status_changed.html deleted file mode 100644 index c60ba661..00000000 --- a/hosting/templates/hosting/emails/vm_status_changed.html +++ /dev/null @@ -1,136 +0,0 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- Your virtual machine {{vm.name}} status has been updated to {{vm.get_status_display}} -
- You can manage your vm clicking on the button below -
- -
-
-
-
- - -
- ungleich
-
-
-
- - - diff --git a/hosting/templates/hosting/emails/vm_status_changed.txt b/hosting/templates/hosting/emails/vm_status_changed.txt deleted file mode 100644 index c60ba661..00000000 --- a/hosting/templates/hosting/emails/vm_status_changed.txt +++ /dev/null @@ -1,136 +0,0 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- Your virtual machine {{vm.name}} status has been updated to {{vm.get_status_display}} -
- You can manage your vm clicking on the button below -
- -
-
-
-
- - -
- ungleich
-
-
-
- - - diff --git a/hosting/templates/hosting/includes/_footer.html b/hosting/templates/hosting/includes/_footer.html index 65177315..24f4cea6 100644 --- a/hosting/templates/hosting/includes/_footer.html +++ b/hosting/templates/hosting/includes/_footer.html @@ -1,5 +1,5 @@ {% load staticfiles %} - +{% load i18n %}