diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 2efe15cb..12d5fd47 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -231,7 +231,7 @@

2 GiB RAM,

{% trans "15 GiB storage(SSD)" %}

- {% trans "Buy Now!" %} {% trans "More Info" %}

+ {% trans "Buy Now!" %}

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index adbe0242..0b1a0844 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -8,6 +8,8 @@ from django.conf import settings from hosting.views import RailsHostingView, DjangoHostingView, NodeJSHostingView from membership import urls as membership_urls from ungleich_page.views import LandingView +from django.views.generic import RedirectView +from django.core.urlresolvers import reverse_lazy import debug_toolbar urlpatterns = [ url(r'^index.html$', LandingView.as_view()), @@ -28,6 +30,7 @@ urlpatterns += i18n_patterns('', url(r'^/?$', LandingView.as_view()), url(r'^admin/', include(admin.site.urls)), url(r'^datacenterlight', include('datacenterlight.urls', namespace="datacenterlight")), + url(r'^hosting/', RedirectView.as_view(url=reverse_lazy('hosting:login')), name='redirect_hosting_login'), url(r'^alplora', include('alplora.urls', namespace="alplora")), url(r'^membership/', include(membership_urls)), url(r'^digitalglarus/', include('digitalglarus.urls', diff --git a/hosting/models.py b/hosting/models.py index f8f180a5..25f852f1 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -41,7 +41,7 @@ class HostingPlan(models.Model): for cfg in cls.objects.all()] def price(self): - price = self.disk_size * 0.2 + price = self.disk_size * 0.6 price += self.cpu_cores * 5 price += self.memory * 2 return price diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html index 67a61ead..af618740 100644 --- a/hosting/templates/hosting/create_virtual_machine.html +++ b/hosting/templates/hosting/create_virtual_machine.html @@ -5,9 +5,19 @@
+
+
+ {% if messages %} +
+ {% for message in messages %} + {{ message }} + {% endfor %} +
+ {% endif %} +
+ {% if not error %}

{% trans "New Virtual Machine"%}


-
{% csrf_token %}
@@ -34,6 +44,7 @@
+ {% endif %}
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index e2f38d60..0b17878d 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -87,7 +87,7 @@
- {% trans "Configuration"%}: {{virtual_machine.get_configuration_display}} + {% trans "Configuration"%}: {{virtual_machine.configuration}}
diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html index 2387f89d..e7dee999 100644 --- a/hosting/templates/hosting/virtual_machines.html +++ b/hosting/templates/hosting/virtual_machines.html @@ -7,10 +7,6 @@

{% trans "Virtual Machines"%}

-

- {% trans "Create VM"%} -

-

{% if messages %} @@ -21,6 +17,12 @@
{% endif %} + {% if not error %} +

+ {% trans "Create VM"%} +

+
+ @@ -53,6 +55,7 @@ {% endfor %}
{% trans "ID"%}
+ {% endif %} {% if is_paginated %}