moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #503 from tiwariav/task/3785/my_bills_page

Browse source 
Task/3785 update my bills page
This commit is contained in:
Arvind Tiwari 2017-10-03 21:31:27 +05:30 committed by GitHub
commit bfbf4d87cc
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hosting/static/hosting/css/virtual-machine.css
View file

@ -618,9 +618,8 @@
left: 8px; left: 8px;
} }
.table-switch .last-td { .table-switch .last-td {
position: absolute; padding-top: 12px;
bottom: 13px; text-align: right;
right: 0;
} }
.table-switch tbody tr .xs-td-inline { .table-switch tbody tr .xs-td-inline {
text-align: right; text-align: right;

14
hosting/templates/hosting/orders.html
View file

@ -1,6 +1,6 @@
{% extends "hosting/base_short.html" %} {% extends "hosting/base_short.html" %}
{% load staticfiles bootstrap3 %} {% load staticfiles bootstrap3 %}
{% load i18n %} {% load i18n l10n %}
{% block content %} {% block content %}
<div class="dashboard-container"> <div class="dashboard-container">
@ -22,7 +22,6 @@
<th>{% trans "Order Nr." %}</th> <th>{% trans "Order Nr." %}</th>
<th>{% trans "Date" %}</th> <th>{% trans "Date" %}</th>
<th>{% trans "Amount" %}</th> <th>{% trans "Amount" %}</th>
<th>{% trans "Status" %}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
@ -30,15 +29,8 @@
{% for order in orders %} {% for order in orders %}
<tr> <tr>
<td class="xs-td-inline" data-header="{% trans 'Order Nr.' %}">{{ order.id }}</td> <td class="xs-td-inline" data-header="{% trans 'Order Nr.' %}">{{ order.id }}</td>
<td class="xs-td-bighalf" data-header="{% trans 'Date' %}">{{ order.created_at | date:"M d, Y" }}</td> <td class="xs-td-bighalf" data-header="{% trans 'Date' %}">{{ order.created_at | date:"M d, Y H:i" }}</td>
<td class="xs-td-smallhalf" data-header="{% trans 'Amount' %}">{{ order.price }}</td> <td class="xs-td-smallhalf" data-header="{% trans 'Amount' %}">{{ order.price|unlocalize }}</td>
<td data-header="{% trans 'Status' %}">
{% if order.approved %}
<span class="vm-status-active"><strong>{% trans "Approved" %}</strong></span>
{% else %}
<span class="vm-status-failed"><strong>{% trans "Declined" %}</strong></span>
{% endif %}
</td>
<td class="text-right last-td"> <td class="text-right last-td">
<a class="btn btn-order-detail" href="{% url 'hosting:orders' order.pk %}">{% trans 'See Invoice' %}</a> <a class="btn btn-order-detail" href="{% url 'hosting:orders' order.pk %}">{% trans 'See Invoice' %}</a>
</td> </td>