From 1fdc533f4db345f180f1f2303cf3582f510290f9 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 26 Sep 2017 01:18:39 +0530 Subject: [PATCH 1/5] bills list page updated --- hosting/templates/hosting/orders.html | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html index 7ec3e91b..e295639c 100644 --- a/hosting/templates/hosting/orders.html +++ b/hosting/templates/hosting/orders.html @@ -1,6 +1,6 @@ {% extends "hosting/base_short.html" %} {% load staticfiles bootstrap3 %} -{% load i18n %} +{% load i18n l10n %} {% block content %}
@@ -30,15 +30,8 @@ {% for order in orders %} {{ order.id }} - {{ order.created_at | date:"M d, Y" }} - {{ order.price }} - - {% if order.approved %} - {% trans "Approved" %} - {% else %} - {% trans "Declined" %} - {% endif %} - + {{ order.created_at | date:"M d, Y H:i" }} + {{ order.price|unlocalize }} {% trans 'See Invoice' %} From 4194a7c2d738446bad9ae87f0c43aca9d9833b90 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 27 Sep 2017 22:50:42 +0530 Subject: [PATCH 2/5] table header fixed --- hosting/templates/hosting/orders.html | 1 - 1 file changed, 1 deletion(-) diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html index e295639c..d747979d 100644 --- a/hosting/templates/hosting/orders.html +++ b/hosting/templates/hosting/orders.html @@ -22,7 +22,6 @@ {% trans "Order Nr." %} {% trans "Date" %} {% trans "Amount" %} - {% trans "Status" %} From 77b2684217e16ce432bfe4d0cc7398fa809d61b9 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 28 Sep 2017 00:50:38 +0530 Subject: [PATCH 3/5] mobile alignment fix for btn --- hosting/templates/hosting/orders.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html index d747979d..4230ce0b 100644 --- a/hosting/templates/hosting/orders.html +++ b/hosting/templates/hosting/orders.html @@ -31,7 +31,7 @@ {{ order.id }} {{ order.created_at | date:"M d, Y H:i" }} {{ order.price|unlocalize }} - + {% trans 'See Invoice' %} From 8b9935f677b8052d7ae10c86eecc50dc86257c1c Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 28 Sep 2017 00:59:49 +0530 Subject: [PATCH 4/5] padding fix --- hosting/static/hosting/css/virtual-machine.css | 4 +--- hosting/templates/hosting/orders.html | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index a14abc31..6bd2ab1e 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -618,9 +618,7 @@ left: 8px; } .table-switch .last-td { - position: absolute; - bottom: 13px; - right: 0; + text-align: right; } .table-switch tbody tr .xs-td-inline { text-align: right; diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html index 4230ce0b..d747979d 100644 --- a/hosting/templates/hosting/orders.html +++ b/hosting/templates/hosting/orders.html @@ -31,7 +31,7 @@ {{ order.id }} {{ order.created_at | date:"M d, Y H:i" }} {{ order.price|unlocalize }} - + {% trans 'See Invoice' %} From d751aa6d63a0306277627370188dfc4a450d1a78 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 28 Sep 2017 18:48:21 +0530 Subject: [PATCH 5/5] padding fix --- hosting/static/hosting/css/virtual-machine.css | 1 + 1 file changed, 1 insertion(+) diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index 6bd2ab1e..3329d6fe 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -618,6 +618,7 @@ left: 8px; } .table-switch .last-td { + padding-top: 12px; text-align: right; } .table-switch tbody tr .xs-td-inline {