diff --git a/Changelog b/Changelog
index 4cfa2564..6b8b1370 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
Next:
* #3911: [dcl] Integrate resend activation link into dcl landing payment page
+ * #3972: [hosting] Add ungleich company info to invoice footer
1.2.13: 2017-12-09
* [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts
* [cms] Remove
tag for ungleich cms customer item template
diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css
index 4ac531c2..7e9b0c11 100755
--- a/digitalglarus/static/digitalglarus/css/agency.css
+++ b/digitalglarus/static/digitalglarus/css/agency.css
@@ -235,7 +235,7 @@ fieldset[disabled] .btn-xl.active {
.navbar-default .navbar-brand {
font-family: "Helvetica Neue", Helvetica, Arial, cursive;
color: #a1cfd7;
- padding-top: 10px;
+ padding-top: 11px;
}
.navbar-default .navbar-brand:hover,
diff --git a/hosting/static/hosting/css/order.css b/hosting/static/hosting/css/order.css
index 8e9226e2..734566a5 100644
--- a/hosting/static/hosting/css/order.css
+++ b/hosting/static/hosting/css/order.css
@@ -7,7 +7,7 @@
@media(min-width: 768px) {
.order-detail-container {
- padding: 30px;
+ padding: 30px 30px 20px;
}
}
@@ -53,7 +53,7 @@
}
.order-detail-container .order-details {
- margin-bottom: 30px;
+ margin-bottom: 15px;
}
.order-detail-container .order-details strong {
@@ -90,3 +90,18 @@
width: 16px;
}
}
+
+.order_detail_footer {
+ font-size: 9px;
+ letter-spacing: 1px;
+ color: #333333;
+}
+
+.order_detail_footer strong {
+ font-size: 11px;
+}
+
+
+#virtual_machine_create_form {
+ padding: 15px 0;
+}
\ No newline at end of file
diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index fe200f6e..6ea4f36f 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -135,9 +135,7 @@
- {% if not order %}
-
- {% endif %}
+
{% if not order %}
{% block submit_btn %}
@@ -155,6 +153,11 @@
{% endblock submit_btn %}
+ {% else %}
+
{% endif %}
{% endif %}
diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html
index 6329cc10..467d9d39 100644
--- a/hosting/templates/hosting/virtual_machines.html
+++ b/hosting/templates/hosting/virtual_machines.html
@@ -39,27 +39,25 @@
{% for vm in vms %}
-
- {{vm.vm_id}} |
- {% if vm.ipv6 %}
- {{vm.ipv4}} |
- {{vm.ipv6}} |
- {% endif %}
-
-
- {% if vm.state == 'ACTIVE' %}
- {{vm.state|title}}
- {% elif vm.state == 'FAILED' %}
- {{vm.state|title}}
- {% else %}
- {{vm.state|title}}
- {% endif %}
-
- |
-
- {% trans "View Detail" %}
- |
-
+
+ {{vm.vm_id}} |
+ {% if vm.ipv4 %}{{vm.ipv4}}{% endif %} |
+ {% if vm.ipv6 %}{{vm.ipv6}}{% endif %} |
+
+
+ {% if vm.state == 'ACTIVE' %}
+ {{vm.state|title}}
+ {% elif vm.state == 'FAILED' %}
+ {{vm.state|title}}
+ {% else %}
+ {{vm.state|title}}
+ {% endif %}
+
+ |
+
+ {% trans "View Detail" %}
+ |
+
{% endfor %}
diff --git a/hosting/urls.py b/hosting/urls.py
index b00a199c..2112c493 100644
--- a/hosting/urls.py
+++ b/hosting/urls.py
@@ -8,7 +8,8 @@ from .views import (
MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView,
HostingPricingView, CreateVirtualMachinesView, HostingBillListView,
HostingBillDetailView, SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView,
- SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView)
+ SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView
+)
urlpatterns = [
diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css
index 6d1ce4c6..eca4036b 100755
--- a/ungleich_page/static/ungleich_page/css/agency.css
+++ b/ungleich_page/static/ungleich_page/css/agency.css
@@ -280,7 +280,10 @@ fieldset[disabled] .btn-xl.active {
}
.navbar-default .navbar-brand {
- padding: 8px;
+ padding: 4px 8px 12px;
+ }
+ .navbar-default.navbar-shrink .navbar-brand {
+ padding: 6px 8px 10px;
}
}