From 024f7565dfa868b02302be1e3344df7bc12b7960 Mon Sep 17 00:00:00 2001 From: Henry Bravo Date: Thu, 1 Jun 2017 11:24:50 -0500 Subject: [PATCH] Fixed details in Hosting pages and translate in login --- hosting/locale/de/LC_MESSAGES/django.mo | Bin 421 -> 498 bytes hosting/locale/de/LC_MESSAGES/django.po | 269 +++++++++--------- hosting/static/hosting/css/commons.css | 28 +- hosting/static/hosting/css/landing-page.css | 5 +- hosting/static/hosting/css/order.css | 2 +- .../static/hosting/css/virtual-machine.css | 34 +++ hosting/templates/hosting/base_short.html | 12 +- hosting/templates/hosting/bill_detail.html | 2 +- hosting/templates/hosting/bill_error.html | 4 +- hosting/templates/hosting/bills.html | 2 +- .../hosting/confirm_reset_password.html | 34 ++- .../hosting/create_virtual_machine.html | 2 +- hosting/templates/hosting/login.html | 3 - hosting/templates/hosting/notifications.html | 4 +- hosting/templates/hosting/order_detail.html | 4 +- hosting/templates/hosting/orders.html | 6 +- hosting/templates/hosting/payment.html | 2 +- hosting/templates/hosting/reset_password.html | 50 ++-- hosting/templates/hosting/signup.html | 52 ++-- .../hosting/virtual_machine_detail.html | 18 +- .../hosting/virtual_machine_key.html | 6 +- .../templates/hosting/virtual_machines.html | 8 +- 22 files changed, 300 insertions(+), 247 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.mo b/hosting/locale/de/LC_MESSAGES/django.mo index 85165c73fc0b51593f4a2109b8ee76b0810849b4..6f7384c58151672c719965c8c2ef34a23b6202b1 100644 GIT binary patch delta 177 zcmZ3={E4~#o)F7a1|VPpVi_RT0b*7lwgF-g2moSPAPxlLY(@r#d>}0b#J7QLAOhzSe(mReMtInmRF r*G$*IP{Gj9%E&<1z;xp*Zbos>jG|PK89>b`sYMFG$r`2C0F8iFu*Crn*LE3Wmm3 O#-`c^1{*JMGXemDM+z1I diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index f40ad38c..9a1fd1a0 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-05-26 13:35+0000\n" +"POT-Creation-Date: 2017-06-01 11:20-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,451 +18,440 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: hosting/templates/hosting/base_short.html:67 +#: templates/hosting/base_short.html:68 templates/hosting/base_short.html:139 msgid "My Virtual Machines" msgstr "" -#: hosting/templates/hosting/base_short.html:72 -#: hosting/templates/hosting/orders.html:12 +#: templates/hosting/base_short.html:73 templates/hosting/base_short.html:145 +#: templates/hosting/orders.html.py:12 msgid "My Orders" msgstr "" -#: hosting/templates/hosting/base_short.html:77 +#: templates/hosting/base_short.html:78 templates/hosting/base_short.html:152 msgid "Keys" msgstr "" -#: hosting/templates/hosting/base_short.html:82 +#: templates/hosting/base_short.html:83 templates/hosting/base_short.html:158 msgid "Notifications " msgstr "" -#: hosting/templates/hosting/base_short.html:89 +#: templates/hosting/base_short.html:90 msgid "Logout" msgstr "" -#: hosting/templates/hosting/base_short.html:94 -#: hosting/templates/hosting/base_short.html:136 +#: templates/hosting/base_short.html:95 msgid "How it works" msgstr "" -#: hosting/templates/hosting/base_short.html:97 -#: hosting/templates/hosting/base_short.html:139 +#: templates/hosting/base_short.html:98 msgid "Your infrastructure" msgstr "" -#: hosting/templates/hosting/base_short.html:100 -#: hosting/templates/hosting/base_short.html:142 +#: templates/hosting/base_short.html:101 msgid "Our inftrastructure" msgstr "" -#: hosting/templates/hosting/base_short.html:103 -#: hosting/templates/hosting/base_short.html:145 +#: templates/hosting/base_short.html:104 msgid "Pricing" msgstr "" -#: hosting/templates/hosting/base_short.html:106 -#: hosting/templates/hosting/base_short.html:149 +#: templates/hosting/base_short.html:107 msgid "Contact" msgstr "" -#: hosting/templates/hosting/base_short.html:109 -#: hosting/templates/hosting/login.html:29 -#: hosting/templates/hosting/login.html:38 -#: hosting/templates/hosting/reset_password.html:24 -#: hosting/templates/hosting/signup.html:23 +#: templates/hosting/base_short.html:110 +#: templates/hosting/confirm_reset_password.html:38 +#: templates/hosting/login.html:31 templates/hosting/login.html.py:40 +#: templates/hosting/reset_password.html:30 templates/hosting/signup.html:29 msgid "Login" msgstr "" -#: hosting/templates/hosting/base_short.html:132 +#: templates/hosting/base_short.html:134 msgid "Home" msgstr "" -#: hosting/templates/hosting/bill_detail.html:11 -#: hosting/templates/hosting/order_detail.html:10 +#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:10 msgid "Invoice" msgstr "" -#: hosting/templates/hosting/bill_detail.html:11 -#: hosting/templates/hosting/order_detail.html:10 +#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:10 msgid "Order #" msgstr "" -#: hosting/templates/hosting/bill_detail.html:25 +#: templates/hosting/bill_detail.html:25 msgid "ungleich GmbH" msgstr "" -#: hosting/templates/hosting/bill_detail.html:26 +#: templates/hosting/bill_detail.html:26 msgid "buchhaltung@ungleich.ch" msgstr "" -#: hosting/templates/hosting/bill_detail.html:27 +#: templates/hosting/bill_detail.html:27 msgid "Hauptstrasse 14" msgstr "" -#: hosting/templates/hosting/bill_detail.html:28 +#: templates/hosting/bill_detail.html:28 msgid "CH-8775 Luchsingen" msgstr "" -#: hosting/templates/hosting/bill_detail.html:29 +#: templates/hosting/bill_detail.html:29 msgid "Mwst-Nummer: CHE-109.549.333 MWST" msgstr "" -#: hosting/templates/hosting/bill_detail.html:60 +#: templates/hosting/bill_detail.html:60 msgid "Total:" msgstr "" -#: hosting/templates/hosting/bill_detail.html:68 +#: templates/hosting/bill_detail.html:68 #, python-format msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer." msgstr "" -#: hosting/templates/hosting/bill_detail.html:69 +#: templates/hosting/bill_detail.html:69 msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang." msgstr "" -#: hosting/templates/hosting/bill_detail.html:70 +#: templates/hosting/bill_detail.html:70 msgid "Kontoverbindung:" msgstr "" -#: hosting/templates/hosting/bill_detail.html:73 +#: templates/hosting/bill_detail.html:73 msgid "IBAN:" msgstr "" -#: hosting/templates/hosting/bill_detail.html:76 +#: templates/hosting/bill_detail.html:76 msgid "BIC:" msgstr "" -#: hosting/templates/hosting/bill_detail.html:81 +#: templates/hosting/bill_detail.html:81 msgid "CH02 0900 0000 6071 8848 8" msgstr "" -#: hosting/templates/hosting/bill_detail.html:84 +#: templates/hosting/bill_detail.html:84 msgid "POFICHBEXXX" msgstr "" -#: hosting/templates/hosting/bills.html:12 +#: templates/hosting/bills.html:12 msgid "Customers" msgstr "" -#: hosting/templates/hosting/bills.html:16 -#: hosting/templates/hosting/virtual_machine_key.html:45 +#: templates/hosting/bills.html:16 +#: templates/hosting/virtual_machine_key.html:45 msgid "Name" msgstr "" -#: hosting/templates/hosting/bills.html:17 +#: templates/hosting/bills.html:17 msgid "Email" msgstr "" -#: hosting/templates/hosting/bills.html:28 +#: templates/hosting/bills.html:28 msgid "View Bill" msgstr "" -#: hosting/templates/hosting/bills.html:41 -#: hosting/templates/hosting/orders.html:83 -#: hosting/templates/hosting/virtual_machines.html:70 +#: templates/hosting/bills.html:41 templates/hosting/orders.html.py:83 +#: templates/hosting/virtual_machines.html:70 msgid "previous" msgstr "" -#: hosting/templates/hosting/bills.html:47 -#: hosting/templates/hosting/orders.html:89 -#: hosting/templates/hosting/virtual_machines.html:76 +#: templates/hosting/bills.html:47 templates/hosting/orders.html.py:89 +#: templates/hosting/virtual_machines.html:76 msgid "next" msgstr "" -#: hosting/templates/hosting/confirm_reset_password.html:19 +#: templates/hosting/confirm_reset_password.html:10 +#: templates/hosting/login.html:9 templates/hosting/reset_password.html.py:9 +#: templates/hosting/signup.html:8 +msgid "Your VM hosted in Switzerland" +msgstr "Ihre VM in der Schweiz" + +#: templates/hosting/confirm_reset_password.html:14 msgid "Set your new password" msgstr "" -#: hosting/templates/hosting/confirm_reset_password.html:28 -#: hosting/templates/hosting/reset_password.html:20 +#: templates/hosting/confirm_reset_password.html:29 +#: templates/hosting/reset_password.html:21 msgid "Reset" msgstr "" -#: hosting/templates/hosting/confirm_reset_password.html:32 -#: hosting/templates/hosting/reset_password.html:24 -#: hosting/templates/hosting/signup.html:23 +#: templates/hosting/confirm_reset_password.html:35 +#: templates/hosting/reset_password.html:27 templates/hosting/signup.html:26 msgid "Already have an account ?" msgstr "" -#: hosting/templates/hosting/confirm_reset_password.html:32 -msgid "Log in" -msgstr "" - -#: hosting/templates/hosting/create_virtual_machine.html:19 +#: templates/hosting/create_virtual_machine.html:19 msgid "New Virtual Machine" msgstr "" -#: hosting/templates/hosting/create_virtual_machine.html:45 +#: templates/hosting/create_virtual_machine.html:45 msgid "Start VM" msgstr "" -#: hosting/templates/hosting/emails/password_reset_email.html:2 -#: hosting/templates/hosting/emails/password_reset_email.txt:2 +#: templates/hosting/emails/password_reset_email.html:2 +#: templates/hosting/emails/password_reset_email.txt:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: hosting/templates/hosting/emails/password_reset_email.html:4 -#: hosting/templates/hosting/emails/password_reset_email.txt:4 +#: templates/hosting/emails/password_reset_email.html:4 +#: templates/hosting/emails/password_reset_email.txt:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: hosting/templates/hosting/emails/password_reset_email.html:9 -#: hosting/templates/hosting/emails/password_reset_email.txt:9 +#: templates/hosting/emails/password_reset_email.html:9 +#: templates/hosting/emails/password_reset_email.txt:9 msgid "Thanks for using our site!" msgstr "" -#: hosting/templates/hosting/emails/password_reset_email.html:11 -#: hosting/templates/hosting/emails/password_reset_email.txt:11 +#: templates/hosting/emails/password_reset_email.html:11 +#: templates/hosting/emails/password_reset_email.txt:11 #, python-format msgid "The %(site_name)s team" msgstr "" -#: hosting/templates/hosting/login.html:22 +#: templates/hosting/login.html:25 msgid "You haven been logged out" msgstr "" -#: hosting/templates/hosting/login.html:44 +#: templates/hosting/login.html:48 msgid "Don't have an account yet ? " msgstr "" -#: hosting/templates/hosting/login.html:44 -#: hosting/templates/hosting/signup.html:10 -#: hosting/templates/hosting/signup.html:19 +#: templates/hosting/login.html:51 templates/hosting/signup.html.py:12 +#: templates/hosting/signup.html:20 msgid "Sign up" msgstr "" -#: hosting/templates/hosting/login.html:46 +#: templates/hosting/login.html:53 msgid "Forgot your password ? " msgstr "" -#: hosting/templates/hosting/notifications.html:9 +#: templates/hosting/notifications.html:9 msgid "Notifications" msgstr "" -#: hosting/templates/hosting/notifications.html:16 +#: templates/hosting/notifications.html:16 msgid "Unread" msgstr "" -#: hosting/templates/hosting/notifications.html:26 +#: templates/hosting/notifications.html:26 msgid "All" msgstr "" -#: hosting/templates/hosting/notifications.html:38 +#: templates/hosting/notifications.html:38 msgid "Unread notifications" msgstr "" -#: hosting/templates/hosting/notifications.html:48 +#: templates/hosting/notifications.html:48 msgid "Mark as read" msgstr "" -#: hosting/templates/hosting/notifications.html:59 +#: templates/hosting/notifications.html:59 msgid "All notifications" msgstr "" -#: hosting/templates/hosting/order_detail.html:16 -#: hosting/templates/hosting/order_detail.html:24 +#: templates/hosting/order_detail.html:16 +#: templates/hosting/order_detail.html:24 msgid "Billed To:" msgstr "" -#: hosting/templates/hosting/order_detail.html:26 +#: templates/hosting/order_detail.html:26 msgid "Status:" msgstr "" -#: hosting/templates/hosting/order_detail.html:38 +#: templates/hosting/order_detail.html:38 msgid "Payment Method:" msgstr "" -#: hosting/templates/hosting/order_detail.html:49 +#: templates/hosting/order_detail.html:49 msgid "Order summary" msgstr "" -#: hosting/templates/hosting/order_detail.html:52 -#: hosting/templates/hosting/virtual_machine_detail.html:75 +#: templates/hosting/order_detail.html:52 +#: templates/hosting/virtual_machine_detail.html:76 msgid "Cores" msgstr "" -#: hosting/templates/hosting/order_detail.html:54 -#: hosting/templates/hosting/virtual_machine_detail.html:81 +#: templates/hosting/order_detail.html:54 +#: templates/hosting/virtual_machine_detail.html:82 msgid "Memory" msgstr "" -#: hosting/templates/hosting/order_detail.html:56 +#: templates/hosting/order_detail.html:56 msgid "Disk space" msgstr "" -#: hosting/templates/hosting/order_detail.html:58 +#: templates/hosting/order_detail.html:58 msgid "Total" msgstr "" -#: hosting/templates/hosting/order_detail.html:64 +#: templates/hosting/order_detail.html:64 msgid "Finish Configuration" msgstr "" -#: hosting/templates/hosting/orders.html:17 +#: templates/hosting/orders.html:17 msgid "Date" msgstr "" -#: hosting/templates/hosting/orders.html:18 +#: templates/hosting/orders.html:18 msgid "Amount" msgstr "" -#: hosting/templates/hosting/orders.html:19 -#: hosting/templates/hosting/virtual_machine_detail.html:30 -#: hosting/templates/hosting/virtual_machine_key.html:47 -#: hosting/templates/hosting/virtual_machines.html:31 +#: templates/hosting/orders.html:19 +#: templates/hosting/virtual_machine_detail.html:30 +#: templates/hosting/virtual_machine_key.html:47 +#: templates/hosting/virtual_machines.html:31 msgid "Status" msgstr "" -#: hosting/templates/hosting/orders.html:30 +#: templates/hosting/orders.html:30 msgid "Approved" msgstr "" -#: hosting/templates/hosting/orders.html:32 +#: templates/hosting/orders.html:32 msgid "Declined" msgstr "" -#: hosting/templates/hosting/orders.html:37 -#: hosting/templates/hosting/virtual_machines.html:58 +#: templates/hosting/orders.html:37 templates/hosting/virtual_machines.html:58 msgid "View Detail" msgstr "" -#: hosting/templates/hosting/orders.html:41 +#: templates/hosting/orders.html:41 msgid "Cancel Order" msgstr "" -#: hosting/templates/hosting/orders.html:56 +#: templates/hosting/orders.html:56 msgid "Do You want do delete your order?" msgstr "" -#: hosting/templates/hosting/orders.html:64 +#: templates/hosting/orders.html:64 msgid "Close" msgstr "" -#: hosting/templates/hosting/orders.html:66 +#: templates/hosting/orders.html:66 msgid "Delete" msgstr "" -#: hosting/templates/hosting/reset_password.html:11 +#: templates/hosting/reset_password.html:13 msgid "Reset your password" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:19 +#: templates/hosting/virtual_machine_detail.html:19 msgid "Settings" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:25 +#: templates/hosting/virtual_machine_detail.html:25 msgid "Billing" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:60 +#: templates/hosting/virtual_machine_detail.html:60 msgid "Ip not assigned yet" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:87 +#: templates/hosting/virtual_machine_detail.html:89 msgid "Disk" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:96 +#: templates/hosting/virtual_machine_detail.html:98 msgid "Configuration" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:106 +#: templates/hosting/virtual_machine_detail.html:108 msgid "Current pricing" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:115 +#: templates/hosting/virtual_machine_detail.html:117 msgid "Current status" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:140 +#: templates/hosting/virtual_machine_detail.html:142 msgid "Terminate Virtual Machine" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:161 +#: templates/hosting/virtual_machine_detail.html:163 msgid "Terminate your Virtual Machine" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:164 +#: templates/hosting/virtual_machine_detail.html:166 msgid "Are you sure do you want to cancel your Virtual Machine " msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:164 +#: templates/hosting/virtual_machine_detail.html:166 msgid "plan?" msgstr "" -#: hosting/templates/hosting/virtual_machine_detail.html:167 +#: templates/hosting/virtual_machine_detail.html:169 msgid "Cancel" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:11 +#: templates/hosting/virtual_machine_key.html:11 msgid "Access Key" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:22 +#: templates/hosting/virtual_machine_key.html:22 msgid "Upload your own key. " msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:29 +#: templates/hosting/virtual_machine_key.html:29 msgid "Upload Key" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:33 +#: templates/hosting/virtual_machine_key.html:33 msgid "Or generate a new key pair." msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:37 +#: templates/hosting/virtual_machine_key.html:37 msgid "Generate Key Pair" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:46 +#: templates/hosting/virtual_machine_key.html:46 msgid "Created at" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:68 -#: hosting/templates/hosting/virtual_machine_key.html:81 +#: templates/hosting/virtual_machine_key.html:68 +#: templates/hosting/virtual_machine_key.html:81 msgid "Warning!" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:68 +#: templates/hosting/virtual_machine_key.html:68 msgid "You can download your SSH private key once. Don't lost your key" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:76 +#: templates/hosting/virtual_machine_key.html:76 msgid "Copy to Clipboard" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:77 +#: templates/hosting/virtual_machine_key.html:77 msgid "Download" msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:81 +#: templates/hosting/virtual_machine_key.html:81 msgid "" "Your SSH private key was already generated and downloaded, if you lost it, " "contact us. " msgstr "" -#: hosting/templates/hosting/virtual_machine_key.html:84 +#: templates/hosting/virtual_machine_key.html:84 msgid "Generate my key" msgstr "" -#: hosting/templates/hosting/virtual_machines.html:9 +#: templates/hosting/virtual_machines.html:9 msgid "Virtual Machines" msgstr "" -#: hosting/templates/hosting/virtual_machines.html:22 +#: templates/hosting/virtual_machines.html:22 msgid "Create VM" msgstr "" -#: hosting/templates/hosting/virtual_machines.html:28 +#: templates/hosting/virtual_machines.html:28 msgid "ID" msgstr "" -#: hosting/templates/hosting/virtual_machines.html:29 +#: templates/hosting/virtual_machines.html:29 msgid "Ipv4" msgstr "" -#: hosting/templates/hosting/virtual_machines.html:30 +#: templates/hosting/virtual_machines.html:30 msgid "Ipv6" msgstr "" diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 234b680f..6b2fcaf9 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -1,7 +1,20 @@ .dashboard-container { - padding-top:70px; padding-bottom: 11%; + padding-top:70px; padding-bottom: 70px; } +.content-dashboard{ + height: 100vh; + width: 80%; + margin: 0 auto; + max-width: 1120px; +} +.container-table{ + margin-top: 35px; + overflow-y: hidden; +} +.container-table table{ + overflow-y: auto; +} .borderless td { border: none !important; } @@ -26,3 +39,16 @@ .space-above-big { margin-top: 20%; } + +.table>tbody>tr>td{ + vertical-align: middle; +} +.fa-separate{ + margin-right: 15px; +} +@media (max-width: 540px) { + select { + width: 280px; + } +} + diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 5d4c6a90..269b687f 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -226,7 +226,7 @@ h6 { z-index: 1000; } .auth-container .auth-content{ - width: 80%; + width: 100%; margin: 0 auto; max-width: 390px; margin-top: 60px; @@ -351,6 +351,9 @@ h6 { padding: 15px; width: 90%; } + .auth-box .section-heading { + font-size: 15px; + } } footer { padding: 2%; diff --git a/hosting/static/hosting/css/order.css b/hosting/static/hosting/css/order.css index 2abc47db..e8bc0328 100644 --- a/hosting/static/hosting/css/order.css +++ b/hosting/static/hosting/css/order.css @@ -1,4 +1,4 @@ -.order-detail-container {padding-top: 70px; padding-bottom: 11%;} +.order-detail-container {padding-top: 70px; padding-bottom: 70px; margin-bottom: 70px;} .order-detail-container .invoice-title h2, .invoice-title h3 { display: inline-block; diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index b5cd27f4..aaf5c6aa 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -43,4 +43,38 @@ .virtual-machine-container .right-place{ margin-top: 15px; +} +.virtual-machine-container .separate-md{ + margin-top: 35px; +} +.virtual-machine-container .box-setting{ + height: 100px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} +.virtual-machine-container .box-setting .label-success{ + padding-top: 4px; +} + +@media (max-width: 990px) { + .virtual-machine-container .tabs-left { + border-right: 0; + } + .virtual-machine-container .tabs-left>li.active>a, + .virtual-machine-container .tabs-left>li.active>a:hover, + .virtual-machine-container .tabs-left>li.active>a:focus { + border: 1px solid #ddd; + } + .virtual-machine-container .tabs-left>li>a { + border-radius: 4px; + margin-right: 0; + display:block; + } +} +@media (max-width: 420px) { + .btn-create-vm { + float: left !important; + } } \ No newline at end of file diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index 864c8835..26bcac0c 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -118,10 +118,10 @@ {% endif %} - - - {% block content %} - {% endblock %} +
+ {% block content %} + {% endblock %} +
{% if request.user.is_authenticated %} @@ -129,7 +129,7 @@
-
    +

    Copyright © ungleich GmbH {% now "Y" %}. All Rights Reserved

diff --git a/hosting/templates/hosting/bill_detail.html b/hosting/templates/hosting/bill_detail.html index e34b2f11..f871e5ed 100644 --- a/hosting/templates/hosting/bill_detail.html +++ b/hosting/templates/hosting/bill_detail.html @@ -3,7 +3,7 @@ {% load i18n %} {% block content %} -
+
{# Adress bar #}
diff --git a/hosting/templates/hosting/bill_error.html b/hosting/templates/hosting/bill_error.html index 5374ecb5..b9edf86b 100644 --- a/hosting/templates/hosting/bill_error.html +++ b/hosting/templates/hosting/bill_error.html @@ -3,8 +3,8 @@ {% load i18n %} {% block content %} -
-
+
+

Error

Could not get HostingBill object for client.

Please create a HostingBill object via the admin page

diff --git a/hosting/templates/hosting/bills.html b/hosting/templates/hosting/bills.html index 1e789e12..770886f6 100644 --- a/hosting/templates/hosting/bills.html +++ b/hosting/templates/hosting/bills.html @@ -5,7 +5,7 @@ {% block content %}
-
+
diff --git a/hosting/templates/hosting/confirm_reset_password.html b/hosting/templates/hosting/confirm_reset_password.html index ce4f3ba3..d0dcf5ab 100644 --- a/hosting/templates/hosting/confirm_reset_password.html +++ b/hosting/templates/hosting/confirm_reset_password.html @@ -3,11 +3,15 @@ {% load i18n %} {% block content %} -
-
-
 
-
-
+
+
+
+
+

{% trans "Your VM hosted in Switzerland"%}

+
+
+ -
+
+
+ {% trans "Already have an account ?"%} +
+
+ {% trans "Login"%} +
+
+
+
{% endblock %} diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html index ac72046c..eaf11549 100644 --- a/hosting/templates/hosting/create_virtual_machine.html +++ b/hosting/templates/hosting/create_virtual_machine.html @@ -16,7 +16,7 @@ {% endif %}
{% if not error %} -

{% trans "New Virtual Machine"%}

+

{% trans "New Virtual Machine"%}

{% csrf_token %} diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html index e06099bd..49f6f75f 100644 --- a/hosting/templates/hosting/login.html +++ b/hosting/templates/hosting/login.html @@ -5,7 +5,6 @@
-

{% trans "Your VM hosted in Switzerland"%}

@@ -56,8 +55,6 @@
- - {% endblock %} diff --git a/hosting/templates/hosting/notifications.html b/hosting/templates/hosting/notifications.html index 6ba7977a..e0abb809 100644 --- a/hosting/templates/hosting/notifications.html +++ b/hosting/templates/hosting/notifications.html @@ -2,11 +2,11 @@ {% load staticfiles bootstrap3 i18n %} {% block content %}
-
+
-

{% trans "Notifications"%}

+

{% trans "Notifications"%}

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 7b63c927..7705a006 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -3,9 +3,9 @@ {% load i18n %} {% block content %} -
+
-
+

{% trans "Invoice"%}

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

diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html index 16a739a0..a9fae2e5 100644 --- a/hosting/templates/hosting/orders.html +++ b/hosting/templates/hosting/orders.html @@ -5,11 +5,11 @@ {% block content %}
-
+
-
+
-

{% trans "My Orders"%}

+

{% trans "My Orders"%}


diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 7db83f10..d18455a2 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -3,7 +3,7 @@ {% block content %}
-
+
diff --git a/hosting/templates/hosting/reset_password.html b/hosting/templates/hosting/reset_password.html index 63f1a669..7f21f79d 100644 --- a/hosting/templates/hosting/reset_password.html +++ b/hosting/templates/hosting/reset_password.html @@ -5,34 +5,32 @@ {% block content %}
-
-
-

{% trans "Your VM hosted in Switzerland"%}

-
-
- {% endblock %} diff --git a/hosting/templates/hosting/signup.html b/hosting/templates/hosting/signup.html index 6cbb2969..de668abc 100644 --- a/hosting/templates/hosting/signup.html +++ b/hosting/templates/hosting/signup.html @@ -4,34 +4,32 @@ {% block content %}
-
-
-

{% trans "Your VM hosted in Switzerland"%}

-
-
-
{% endblock %} diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 04b964a0..efa988e3 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -4,11 +4,11 @@ {% block content %}
-
+
-

{{virtual_machine.name}}

+

{{virtual_machine.name}}

@@ -71,20 +71,22 @@
-
- {% trans "Cores"%}
+
+ + {% trans "Cores"%} {{virtual_machine.cores}}
-
+
{% trans "Memory"%}
{{virtual_machine.memory}} GiB
-
- {% trans "Disk"%}
+
+ + {% trans "Disk"%} {{virtual_machine.disk_size|floatformat:2}} GiB
@@ -130,7 +132,7 @@
{% if not virtual_machine.status == 'canceled' %}
-
+
diff --git a/hosting/templates/hosting/virtual_machine_key.html b/hosting/templates/hosting/virtual_machine_key.html index d1917381..4ef8fb2e 100644 --- a/hosting/templates/hosting/virtual_machine_key.html +++ b/hosting/templates/hosting/virtual_machine_key.html @@ -2,13 +2,13 @@ {% load staticfiles bootstrap3 i18n %} {% block content %}
-
+
-
+
{% csrf_token %} -

{% trans "Access Key"%}

+

{% trans "Access Key"%}

{% if messages %}
{% for message in messages %} diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html index f71dac2a..2c0949af 100644 --- a/hosting/templates/hosting/virtual_machines.html +++ b/hosting/templates/hosting/virtual_machines.html @@ -2,11 +2,11 @@ {% load staticfiles bootstrap3 i18n %} {% block content %}
-
+
-
+
-

{% trans "Virtual Machines"%}

+

{% trans "Virtual Machines"%}


{% if messages %} @@ -18,7 +18,7 @@ {% endif %}
{% if not error %} -

+

{% trans "Create VM"%}