Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete

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 <p> tag for ungleich cms customer item template

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,

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;
+}

hosting/templates/hosting/order_detail.html

@@ -135,9 +135,7 @@
                     </div>
                 </div>
             </div>
-            {% if not order %}
+            <hr>
-                <hr>
-            {% endif %}
         </div>
         {% if not order %}
             {% block submit_btn %}
@@ -155,6 +153,11 @@
                     </div>
                 </form>
             {% endblock submit_btn %}
+        {% else %}
+            <div class="order_detail_footer">
+                <strong>ungleich glarus ag</strong>&nbsp;&nbsp;Bahnhotstrasse 1, 8783 Linthal, Switzerland<br>
+                www.datacenterlight.ch&nbsp;&nbsp;|&nbsp;&nbsp;info@datacenterlight.ch
+            </div>
         {% endif %}
     {% endif %}
 </div>

hosting/templates/hosting/virtual_machines.html

@@ -39,27 +39,25 @@
             </thead>
             <tbody>
                 {% for vm in vms %}
-                <tr>
+                    <tr>
-                    <td data-header="ID">{{vm.vm_id}}</td>
+                        <td data-header="ID">{{vm.vm_id}}</td>
-                    {% if vm.ipv6  %}
+                        <td data-header="IPv4">{% if vm.ipv4 %}{{vm.ipv4}}{% endif %}</td>
-                        <td data-header="IPv4">{{vm.ipv4}}</td>
+                        <td data-header="IPv6">{% if vm.ipv6 %}{{vm.ipv6}}{% endif %}</td>
-                        <td data-header="IPv6">{{vm.ipv6}}</td>
+                        <td data-header="{% trans 'Status' %}">
-                    {% endif %}
+                            <strong>
-                    <td data-header="{% trans 'Status' %}">
+                                {% if vm.state == 'ACTIVE' %}
-                        <strong>
+                                    <span class="vm-status-active">{{vm.state|title}}</span>
-                            {% if vm.state == 'ACTIVE' %}
+                                {% elif  vm.state == 'FAILED' %}
-                                <span class="vm-status-active">{{vm.state|title}}</span>
+                                    <span class="vm-status-failed">{{vm.state|title}}</span>
-                            {% elif  vm.state == 'FAILED' %}
+                                {% else %}
-                                <span class="vm-status-failed">{{vm.state|title}}</span>
+                                    <span class="vm-status">{{vm.state|title}}</span>
-                            {% else %}
+                                {% endif %}
-                                <span class="vm-status">{{vm.state|title}}</span>
+                            </strong>
-                            {% endif %}
+                        </td>
-                        </strong>
+                        <td class="text-right last-td">
-                    </td>
+                            <a class="btn btn-vm-detail" href="{% url 'hosting:virtual_machines' vm.vm_id %}">{% trans "View Detail" %}</a>
-                    <td class="text-right last-td">
+                        </td>
-                        <a class="btn btn-vm-detail" href="{% url 'hosting:virtual_machines' vm.vm_id %}">{% trans "View Detail" %}</a>
+                    </tr>
-                    </td>
-                </tr>
                 {% endfor %}
             </tbody>
         </table>

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 = [

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;
     }
 }