Merge branch 'master' into task/3974/improve_invoice_number
This commit is contained in:
PCoder
commit
4ee2ab8c45
8 changed files with 53 additions and 30 deletions
|
|
@ -1,3 +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
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<p>
|
||||
{% trans "Don't have an account yet?" %}<br>
|
||||
{% trans "You can sign up by filling in the information below." %}<br>
|
||||
<a href="{% url 'hosting:reset_password' %}">{% trans "Forgot password?" %}</a>
|
||||
<a href="{% url 'hosting:reset_password' %}" target="_blank">{% trans "Forgot password?" %}</a> or <a href="{% url 'hosting:resend_activation_link' %}" target="_blank">{% trans "Resend activation link" %}?</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -135,9 +135,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% if not order %}
|
||||
<hr>
|
||||
{% endif %}
|
||||
<hr>
|
||||
</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> Bahnhotstrasse 1, 8783 Linthal, Switzerland<br>
|
||||
www.datacenterlight.ch | info@datacenterlight.ch
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -39,27 +39,25 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
{% for vm in vms %}
|
||||
<tr>
|
||||
<td data-header="ID">{{vm.vm_id}}</td>
|
||||
{% if vm.ipv6 %}
|
||||
<td data-header="IPv4">{{vm.ipv4}}</td>
|
||||
<td data-header="IPv6">{{vm.ipv6}}</td>
|
||||
{% endif %}
|
||||
<td data-header="{% trans 'Status' %}">
|
||||
<strong>
|
||||
{% if vm.state == 'ACTIVE' %}
|
||||
<span class="vm-status-active">{{vm.state|title}}</span>
|
||||
{% elif vm.state == 'FAILED' %}
|
||||
<span class="vm-status-failed">{{vm.state|title}}</span>
|
||||
{% else %}
|
||||
<span class="vm-status">{{vm.state|title}}</span>
|
||||
{% endif %}
|
||||
</strong>
|
||||
</td>
|
||||
<td class="text-right last-td">
|
||||
<a class="btn btn-vm-detail" href="{% url 'hosting:virtual_machines' vm.vm_id %}">{% trans "View Detail" %}</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td data-header="ID">{{vm.vm_id}}</td>
|
||||
<td data-header="IPv4">{% if vm.ipv4 %}{{vm.ipv4}}{% endif %}</td>
|
||||
<td data-header="IPv6">{% if vm.ipv6 %}{{vm.ipv6}}{% endif %}</td>
|
||||
<td data-header="{% trans 'Status' %}">
|
||||
<strong>
|
||||
{% if vm.state == 'ACTIVE' %}
|
||||
<span class="vm-status-active">{{vm.state|title}}</span>
|
||||
{% elif vm.state == 'FAILED' %}
|
||||
<span class="vm-status-failed">{{vm.state|title}}</span>
|
||||
{% else %}
|
||||
<span class="vm-status">{{vm.state|title}}</span>
|
||||
{% endif %}
|
||||
</strong>
|
||||
</td>
|
||||
<td class="text-right last-td">
|
||||
<a class="btn btn-vm-detail" href="{% url 'hosting:virtual_machines' vm.vm_id %}">{% trans "View Detail" %}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue