From 377f82319d5c8094f5d6827672b872c04b52fe7f Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 19 Aug 2017 02:21:34 +0530 Subject: [PATCH] buttons made to work --- hosting/locale/de/LC_MESSAGES/django.po | 196 +++++++++++++++++- .../static/hosting/css/virtual-machine.css | 11 +- .../hosting/virtual_machine_detail.html | 12 +- hosting/urls.py | 2 +- hosting/views.py | 7 +- 5 files changed, 216 insertions(+), 12 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index f2602182..a3d983c9 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-18 23:59+0530\n" +"POT-Creation-Date: 2017-08-19 02:18+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,274 +18,401 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: .\hosting\forms.py:29 msgid "Your username and/or password were incorrect." msgstr "Dein Benutzername und/oder Dein Passwort ist falsch." +#: .\hosting\forms.py:32 msgid "Your account is not activated yet." msgstr "Dein Account wurde noch nicht aktiviert." +#: .\hosting\forms.py:68 msgid "Paste here your public key" msgstr "Füge deinen Public Key ein" +#: .\hosting\forms.py:74 msgid "Give a name to your key" msgstr "Gebe deinem SSH-Key einen Name" +#: .\hosting\forms.py:79 msgid "Key name" msgstr "Key-Name" +#: .\hosting\templates\hosting\base_short.html:74 msgid "My Virtual Machines" msgstr "Meine virtuellen Maschinen" +#: .\hosting\templates\hosting\base_short.html:79 +#: .\hosting\templates\hosting\orders.html:12 msgid "My Orders" msgstr "Meine Bestellungen" +#: .\hosting\templates\hosting\base_short.html:88 msgid "SSH Keys" msgstr "SSH Key" +#: .\hosting\templates\hosting\base_short.html:93 msgid "Notifications " msgstr "Benachrichtigungen" +#: .\hosting\templates\hosting\base_short.html:96 msgid "Logout" msgstr "Abmelden" +#: .\hosting\templates\hosting\base_short.html:118 +#: .\hosting\templates\hosting\includes\_footer.html:29 msgid "All Rights Reserved" msgstr "Alle Rechte vorbehalten" +#: .\hosting\templates\hosting\bill_detail.html:11 .\hosting\views.py:675 msgid "Invoice" msgstr "Rechnung" +#: .\hosting\templates\hosting\bill_detail.html:11 +#: .\hosting\templates\hosting\order_detail.html:23 msgid "Order #" msgstr "Bestellung #" +#: .\hosting\templates\hosting\bill_detail.html:25 msgid "ungleich GmbH" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:26 msgid "buchhaltung@ungleich.ch" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:27 msgid "Hauptstrasse 14" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:28 msgid "CH-8775 Luchsingen" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:29 msgid "Mwst-Nummer: CHE-109.549.333 MWST" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:60 msgid "Total:" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:68 #, python-format msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer." msgstr "All prices in CHF including 8%% VAT" +#: .\hosting\templates\hosting\bill_detail.html:69 msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang." msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:70 msgid "Kontoverbindung:" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:73 msgid "IBAN:" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:76 msgid "BIC:" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:81 msgid "CH02 0900 0000 6071 8848 8" msgstr "" +#: .\hosting\templates\hosting\bill_detail.html:84 msgid "POFICHBEXXX" msgstr "" +#: .\hosting\templates\hosting\bills.html:12 msgid "Customers" msgstr "Kunden" +#: .\hosting\templates\hosting\bills.html:16 +#: .\hosting\templates\hosting\user_keys.html:25 msgid "Name" msgstr "" +#: .\hosting\templates\hosting\bills.html:17 msgid "Email" msgstr "" +#: .\hosting\templates\hosting\bills.html:28 msgid "View Bill" msgstr "Rechnung anzeigen" +#: .\hosting\templates\hosting\bills.html:41 +#: .\hosting\templates\hosting\orders.html:78 +#: .\hosting\templates\hosting\virtual_machines.html:70 msgid "previous" msgstr "vorherige" +#: .\hosting\templates\hosting\bills.html:47 +#: .\hosting\templates\hosting\orders.html:84 +#: .\hosting\templates\hosting\virtual_machines.html:76 msgid "next" msgstr "nächste" +#: .\hosting\templates\hosting\choice_ssh_keys.html:8 msgid "SSH Key" msgstr "SSH Key" +#: .\hosting\templates\hosting\choice_ssh_keys.html:9 msgid "Choose a key option in order to access your VM" msgstr "Wähle eine Option um Zugriff auf deine VM zu erhalten" +#: .\hosting\templates\hosting\choice_ssh_keys.html:20 msgid "Generating a new key pair" msgstr "Neuen SSH-Key erstellen" +#: .\hosting\templates\hosting\choice_ssh_keys.html:21 msgid "I want to generate a new key pair" msgstr "Ich möchte einen neuen SSH-Key erstellen" +#: .\hosting\templates\hosting\choice_ssh_keys.html:25 +#: .\hosting\templates\hosting\user_key.html:36 msgid "Generate" msgstr "Generieren" +#: .\hosting\templates\hosting\choice_ssh_keys.html:31 msgid "Using existing key" msgstr "Nutzung eines existierenden SSH-Keys" +#: .\hosting\templates\hosting\choice_ssh_keys.html:32 msgid "I want to use my existing public key" msgstr "Ich möchte einen existierenden SSH-Key nutzen" +#: .\hosting\templates\hosting\choice_ssh_keys.html:35 msgid "Upload" msgstr "Hochladen" +#: .\hosting\templates\hosting\confirm_reset_password.html:14 +#: .\hosting\templates\hosting\login.html:14 +#: .\hosting\templates\hosting\reset_password.html:15 +#: .\hosting\templates\hosting\signup.html:13 +#: .\hosting\templates\hosting\signup_validate.html:9 msgid "Your VM hosted in Switzerland" msgstr "deine VM in der Schweiz" +#: .\hosting\templates\hosting\confirm_reset_password.html:18 msgid "Set your new password" msgstr "Setze dein neues Passwort" +#: .\hosting\templates\hosting\confirm_reset_password.html:33 +#: .\hosting\templates\hosting\reset_password.html:27 msgid "Reset" msgstr "Zurücksetzen" +#: .\hosting\templates\hosting\confirm_reset_password.html:39 +#: .\hosting\templates\hosting\reset_password.html:33 +#: .\hosting\templates\hosting\signup.html:31 msgid "Already have an account ?" msgstr "Hast Du bereits ein Benutzerkonto?" +#: .\hosting\templates\hosting\confirm_reset_password.html:42 +#: .\hosting\templates\hosting\login.html:18 +#: .\hosting\templates\hosting\login.html:34 +#: .\hosting\templates\hosting\reset_password.html:36 +#: .\hosting\templates\hosting\signup.html:34 msgid "Login" msgstr "Anmelden" +#: .\hosting\templates\hosting\create_virtual_machine.html:20 msgid "New Virtual Machine" msgstr "Neue virtuelle Maschine" +#: .\hosting\templates\hosting\create_virtual_machine.html:28 msgid "Step 1. Select VM Template:" msgstr "Wähle eine Vorlage" +#: .\hosting\templates\hosting\create_virtual_machine.html:42 msgid "Step2. Select VM Configuration" msgstr "Wähle eine Konfiguration" +#: .\hosting\templates\hosting\create_virtual_machine.html:59 msgid "Price " msgstr "Preis" +#: .\hosting\templates\hosting\create_virtual_machine.html:59 msgid "CHF/Month" msgstr "CHF/Monat" +#: .\hosting\templates\hosting\create_virtual_machine.html:61 msgid "Start VM" msgstr "VM jetzt starten" +#: .\hosting\templates\hosting\emails\password_reset_email.html:2 +#: .\hosting\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 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 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 #, python-format msgid "The %(site_name)s team" msgstr "" +#: .\hosting\templates\hosting\login.html:41 msgid "Don't have an account yet ? " msgstr "Besitzt du kein Benutzerkonto?" +#: .\hosting\templates\hosting\login.html:44 +#: .\hosting\templates\hosting\signup.html:17 +#: .\hosting\templates\hosting\signup.html:25 .\hosting\views.py:226 msgid "Sign up" msgstr "Registrieren" +#: .\hosting\templates\hosting\login.html:46 msgid "Forgot your password ? " msgstr "Passwort vergessen?" +#: .\hosting\templates\hosting\notifications.html:9 msgid "Notifications" msgstr "Benachrichtigungen" +#: .\hosting\templates\hosting\notifications.html:16 msgid "Unread" msgstr "Ungelesen" +#: .\hosting\templates\hosting\notifications.html:26 msgid "All" msgstr "Alle" +#: .\hosting\templates\hosting\notifications.html:38 msgid "Unread notifications" msgstr "Ungelesene Benachrichtigungen" +#: .\hosting\templates\hosting\notifications.html:48 msgid "Mark as read" msgstr "Als gelesen markieren" +#: .\hosting\templates\hosting\notifications.html:59 msgid "All notifications" msgstr "Alle Benachrichtigungen" +#: .\hosting\templates\hosting\order_detail.html:29 +#: .\hosting\templates\hosting\orders.html:17 msgid "Date" msgstr "Datum" +#: .\hosting\templates\hosting\order_detail.html:31 msgid "Status:" msgstr "" +#: .\hosting\templates\hosting\order_detail.html:41 msgid "Billed To:" msgstr "Rechnungsadresse" +#: .\hosting\templates\hosting\order_detail.html:52 msgid "Payment Method:" msgstr "Bezahlmethode" +#: .\hosting\templates\hosting\order_detail.html:63 msgid "Order summary" msgstr "Bestellungsübersicht" +#: .\hosting\templates\hosting\order_detail.html:66 +#: .\hosting\templates\hosting\payment.html:13 +#: .\hosting\templates\hosting\virtual_machine_detail.html:38 msgid "Cores" msgstr "Prozessorkerne" +#: .\hosting\templates\hosting\order_detail.html:68 +#: .\hosting\templates\hosting\payment.html:16 +#: .\hosting\templates\hosting\virtual_machine_detail.html:39 msgid "Memory" msgstr "Arbeitsspeicher" +#: .\hosting\templates\hosting\order_detail.html:70 +#: .\hosting\templates\hosting\payment.html:19 msgid "Disk space" msgstr "Festplattenkapazität" +#: .\hosting\templates\hosting\order_detail.html:72 +#: .\hosting\templates\hosting\payment.html:41 msgid "Total" msgstr "Gesamt" +#: .\hosting\templates\hosting\order_detail.html:78 msgid "Finish Configuration" msgstr "Konfiguration beenden" +#: .\hosting\templates\hosting\orders.html:18 msgid "Amount" msgstr "Betrag" +#: .\hosting\templates\hosting\orders.html:19 +#: .\hosting\templates\hosting\virtual_machine_detail.html:53 +#: .\hosting\templates\hosting\virtual_machines.html:31 msgid "Status" msgstr "" +#: .\hosting\templates\hosting\orders.html:30 msgid "Approved" msgstr "Akzeptiert" +#: .\hosting\templates\hosting\orders.html:32 msgid "Declined" msgstr "Abgelehnt" +#: .\hosting\templates\hosting\orders.html:37 +#: .\hosting\templates\hosting\virtual_machines.html:58 msgid "View Detail" msgstr "Details anzeigen" +#: .\hosting\templates\hosting\orders.html:40 msgid "Cancel Order" msgstr "Bestellung stornieren" +#: .\hosting\templates\hosting\orders.html:56 #, fuzzy #| msgid "Do You want to delete your order?" msgid "Do you want to delete your order?" msgstr "Willst du deine Bestellung löschen?" +#: .\hosting\templates\hosting\orders.html:62 +#: .\hosting\templates\hosting\user_keys.html:38 +#: .\hosting\templates\hosting\user_keys.html:57 msgid "Delete" msgstr "Löschen" +#: .\hosting\templates\hosting\payment.html:10 msgid "Your Order" msgstr "Deine Bestellung" +#: .\hosting\templates\hosting\payment.html:22 +#: .\hosting\templates\hosting\virtual_machine_detail.html:41 msgid "Configuration" msgstr "Konfiguration" +#: .\hosting\templates\hosting\payment.html:41 msgid "including VAT" msgstr "inkl. Mehrwertsteuer" +#: .\hosting\templates\hosting\payment.html:55 msgid "Billing Address" msgstr "Rechnungsadresse" +#: .\hosting\templates\hosting\payment.html:66 msgid "Credit Card" msgstr "Kreditkarte" +#: .\hosting\templates\hosting\payment.html:71 msgid "" "\n" " Please fill in your credit card information " @@ -300,6 +427,7 @@ msgstr "" "\"https://stripe.com\" target=\"_blank\">Stripe für die Bezahlung und " "speichern keine Informationen in unserer Datenbank." +#: .\hosting\templates\hosting\payment.html:90 msgid "" "\n" " You are not making any payment yet. " @@ -313,21 +441,28 @@ msgstr "" "Kreditkateninformationen wirst du auf die Bestellbestätigungsseite " "weitergeleitet." +#: .\hosting\templates\hosting\payment.html:100 +#: .\hosting\templates\hosting\payment.html:142 msgid "Submit" msgstr "Absenden" +#: .\hosting\templates\hosting\payment.html:112 msgid "Card Number" msgstr "Kreditkartennummer" +#: .\hosting\templates\hosting\payment.html:116 msgid "Expiry Date" msgstr "Ablaufdatum" +#: .\hosting\templates\hosting\payment.html:121 msgid "CVC" msgstr "" +#: .\hosting\templates\hosting\payment.html:125 msgid "Card Type" msgstr "Kartentyp" +#: .\hosting\templates\hosting\payment.html:134 msgid "" "\n" " You are not making any payment " @@ -341,30 +476,40 @@ msgstr "" "Kreditkateninformationen wirst du auf die Bestellbestätigungsseite " "weitergeleitet." +#: .\hosting\templates\hosting\payment.html:177 msgid "Processing" msgstr "Weiter" +#: .\hosting\templates\hosting\payment.html:178 msgid "Enter your credit card number" msgstr "Deine Kreditkartennummer" +#: .\hosting\templates\hosting\reset_password.html:19 msgid "Reset your password" msgstr "Passwort zurücksetzen" +#: .\hosting\templates\hosting\user_key.html:11 msgid "Add your public SSH key" msgstr "Füge deinen öffentlichen SSH-Key hinzu" +#: .\hosting\templates\hosting\user_key.html:25 msgid "Use your created key to access to the VM" msgstr "Benutze deinen erstellten SSH-Key um auf deine VM zugreifen zu können" +#: .\hosting\templates\hosting\user_key.html:28 +#: .\hosting\templates\hosting\user_keys.html:17 msgid "Add SSH Key" msgstr "Hinzufügen" +#: .\hosting\templates\hosting\user_key.html:33 msgid "Or you can generate a new key pair" msgstr "Erstelle dein neues Keypaar" +#: .\hosting\templates\hosting\user_key.html:45 msgid "Warning!" msgstr "Achtung!" +#: .\hosting\templates\hosting\user_key.html:45 #, fuzzy #| msgid "You can download your SSH private key once. Don't lost your key" msgid "You can download your SSH private key once. Don't loose your key" @@ -372,135 +517,177 @@ msgstr "" "Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn " "sicher auf." +#: .\hosting\templates\hosting\user_keys.html:6 msgid "Your SSH Keys" msgstr "Deine SSH Keys" +#: .\hosting\templates\hosting\user_keys.html:15 msgid "" "To generate a new key pair or to upload your existing key, click 'Add Key'" msgstr "" "Um einen neuen SSH-Key zu erstellen oder um einen vorhandenen SSH-Key " "hinzuzufügen, klicke auf 'Hinzufügen'" +#: .\hosting\templates\hosting\user_keys.html:26 msgid "Delete Key" msgstr "Löschen" +#: .\hosting\templates\hosting\user_keys.html:27 msgid "Public Key" msgstr "" +#: .\hosting\templates\hosting\user_keys.html:28 msgid "Private Key" msgstr "" +#: .\hosting\templates\hosting\user_keys.html:52 msgid "Delete SSH Key" msgstr "SSH Key löschen" +#: .\hosting\templates\hosting\user_keys.html:53 msgid "Do you want to delete this key?" msgstr "Möchtest Du den Schlüssel löschen?" +#: .\hosting\templates\hosting\user_keys.html:68 msgid "Show" msgstr "Anzeigen" +#: .\hosting\templates\hosting\user_keys.html:80 #, fuzzy #| msgid "Public SSH Key" msgid "Public SSH key" msgstr "Public SSH Key" +#: .\hosting\templates\hosting\user_keys.html:95 msgid "Download" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:14 #, fuzzy #| msgid "Virtual Machines" msgid "Your Virtual Machine Detail" msgstr "Virtuelle Maschinen Detail" +#: .\hosting\templates\hosting\virtual_machine_detail.html:17 #, fuzzy #| msgid "Settings" msgid "VM Settings" msgstr "Einstellungen" +#: .\hosting\templates\hosting\virtual_machine_detail.html:24 +#: .\hosting\templates\hosting\virtual_machine_detail.html:31 +msgid "Copied" +msgstr "" + +#: .\hosting\templates\hosting\virtual_machine_detail.html:40 msgid "Disk" msgstr "Festplatte" +#: .\hosting\templates\hosting\virtual_machine_detail.html:45 msgid "Billing" msgstr "Abrechnungen" +#: .\hosting\templates\hosting\virtual_machine_detail.html:47 #, fuzzy #| msgid "Current pricing" msgid "Current Pricing" msgstr "Aktueller Preis" +#: .\hosting\templates\hosting\virtual_machine_detail.html:48 #, fuzzy #| msgid "CHF/Month" msgid "Month" msgstr "CHF/Monat" +#: .\hosting\templates\hosting\virtual_machine_detail.html:49 #, fuzzy #| msgid "Invoice" msgid "See Invoice" msgstr "Rechnung" +#: .\hosting\templates\hosting\virtual_machine_detail.html:55 #, fuzzy #| msgid "Your SSH Keys" msgid "Your VM is" msgstr "Deine SSH Keys" +#: .\hosting\templates\hosting\virtual_machine_detail.html:57 msgid "Pending" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:59 msgid "Online" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:61 msgid "Failed" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:67 #, fuzzy #| msgid "Create VM" msgid "Terminate VM" msgstr "Neue VM" +#: .\hosting\templates\hosting\virtual_machine_detail.html:74 msgid "Support / Contact" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:77 msgid "Something doesn't work?" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:77 msgid "We are here to help you!" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:80 msgid "CONTACT" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:84 msgid "BACK TO LIST" msgstr "" +#: .\hosting\templates\hosting\virtual_machine_detail.html:96 msgid "Terminate your Virtual Machine" msgstr "Ihre virtuelle Maschine beenden" +#: .\hosting\templates\hosting\virtual_machine_detail.html:98 #, fuzzy #| msgid "Are you sure do you want to cancel your Virtual Machine " msgid "Do you want to cancel your Virtual Machine" msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen " +#: .\hosting\templates\hosting\virtual_machine_detail.html:103 msgid "OK" msgstr "" +#: .\hosting\templates\hosting\virtual_machines.html:9 msgid "Virtual Machines" msgstr "Virtuelle Maschinen" +#: .\hosting\templates\hosting\virtual_machines.html:22 msgid "Create VM" msgstr "Neue VM" +#: .\hosting\templates\hosting\virtual_machines.html:28 msgid "ID" msgstr "" +#: .\hosting\templates\hosting\virtual_machines.html:29 msgid "Ipv4" msgstr "IPv4" +#: .\hosting\templates\hosting\virtual_machines.html:30 msgid "Ipv6" msgstr "IPv6" +#: .\hosting\views.py:213 .\hosting\views.py:237 msgid "login" msgstr "einloggen" +#: .\hosting\views.py:219 msgid "" "Thank you for signing up. We have sent an email to you. Please follow the " "instructions in it to activate your account. Once activated, you can login " @@ -510,24 +697,31 @@ msgstr "" "den Anweisungen um deinen Account zu aktivieren. Danach kannst du dich über " "diesen" +#: .\hosting\views.py:221 .\hosting\views.py:251 msgid "Go back to" msgstr "Zurück" +#: .\hosting\views.py:238 msgid "Account activation" msgstr "Accountaktivierung" +#: .\hosting\views.py:242 msgid "Your account has been activated." msgstr "Dein Account wurde aktiviert." +#: .\hosting\views.py:243 msgid "You can now" msgstr "Du kannst dich nun" +#: .\hosting\views.py:250 msgid "Sorry. Your request is invalid." msgstr "Entschuldigung, deine Anfrage ist ungültig." +#: .\hosting\views.py:673 msgid "Confirm Order" msgstr "Bestellung Bestätigen" +#: .\hosting\views.py:811 msgid "" "We could not find the requested VM. Please " "contact Data Center Light Support." diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index 4e5960c1..fcb94803 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -278,9 +278,14 @@ .vm-detail-ip .un-icon { height: 14px; width: 14px; +} + +.vm-detail-ip .to_copy { position: absolute; right: 0; top: 1px; + padding: 0; + line-height: 1; } .vm-vmid { @@ -385,11 +390,7 @@ padding: 4px 18px; letter-spacing: 0.6px; } -.btn-vm-term:hover, .btn-vm-term:focus { - color: #8396C4; - border-color: #8396C4; -} -.btn-vm-term:active { +.btn-vm-term:hover, .btn-vm-term:focus, .btn-vm-term:active { color: #eb4d5c; border-color: #eb4d5c; } diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index b1a33013..7badfe14 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -21,12 +21,16 @@

IPv4: {{virtual_machine.ipv4}} - +

IPv6: {{virtual_machine.ipv6}} - +

{% endif %} @@ -42,7 +46,7 @@
{% trans "Current Pricing" %}
{{virtual_machine.price|floatformat}} CHF/{% trans "Month" %}
- {% trans "See Invoice" %} + {% trans "See Invoice" %}
@@ -73,7 +77,7 @@ {% trans "Something doesn't work?" %} {% trans "We are here to help you!" %}
- {% trans "CONTACT" %} + {% trans "CONTACT" %}
diff --git a/hosting/urls.py b/hosting/urls.py index de46a442..c5189940 100644 --- a/hosting/urls.py +++ b/hosting/urls.py @@ -11,7 +11,7 @@ from .views import DjangoHostingView, RailsHostingView, PaymentVMView,\ SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView, SSHKeyChoiceView urlpatterns = [ - # url(r'test/$', TemplateView.as_view(template_name='hosting/virtual_machine_detail.html')), + # url(r'test/?$', TemplateView.as_view(template_name='hosting/virtual_machine_detail.html')), url(r'index/?$', IndexView.as_view(), name='index'), url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'), url(r'nodejs/?$', NodeJSHostingView.as_view(), name='nodejshosting'), diff --git a/hosting/views.py b/hosting/views.py index f5fbd0a7..d9cdefb6 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -244,7 +244,8 @@ class SignupValidatedView(SignupValidateView): lurl=login_url) else: home_url = 'Data Center Light' + reverse('datacenterlight:index') + \ + '">Data Center Light' message = '{sorry_message}
{go_back_to} {hurl}'.format( sorry_message=_("Sorry. Your request is invalid."), go_back_to=_('Go back to'), @@ -821,6 +822,10 @@ class VirtualMachineView(LoginRequiredMixin, View): print(error) raise Http404() + def get_context_data(self): + context = super(VirtualMachineView, self).get_context_data(**kwargs) + context['order'] = HostingOrder.objects.get(vm_id=context['vm'].id) + def get_success_url(self): final_url = reverse('hosting:virtual_machines') return final_url