From e323f5a2d56eb259c697d49d434a24c1e4fe7b11 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 2 Jan 2017 19:27:27 +0100
Subject: [PATCH] This should fix most amounts for #511

---
 resources/views/list/accounts.twig          | 13 ++++++++++---
 resources/views/list/bills.twig             |  8 ++++++--
 resources/views/list/journals-tasker.twig   |  7 ++++---
 resources/views/list/piggy-bank-events.twig |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index 12b6111c8e..dbf3d7436c 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -10,7 +10,8 @@
         <th data-defaultsign="_19">{{ trans('list.currentBalance') }}</th>
         <th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
         <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th>
-        <th data-defaultsign="_19" class="hidden-sm hidden-xs">{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th>
+        <th data-defaultsign="_19"
+            class="hidden-sm hidden-xs">{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th>
     </tr>
     </thead>
     <tbody>
@@ -33,7 +34,11 @@
                 </td>
             {% endif %}
             <td class="hidden-sm hidden-xs">{{ account.iban }}</td>
-            <td data-value="{{ account.endBalance }}">{{ account.endBalance|formatAmount }}</td>
+            <td data-value="{{ account.endBalance }}" style="text-align: right;">
+                <span style="margin-right:5px;">
+                {{ account.endBalance|formatAmount }}
+                </span>
+            </td>
             <td class="hidden-sm hidden-xs" data-value="{{ account.active }}">
                 {% if account.active %}
                     <i class="fa fa-fw fa-check"></i>
@@ -50,8 +55,10 @@
                     <em>{{ 'never'|_ }}</em>
                 </td>
             {% endif %}
-            <td class="hidden-sm hidden-xs" data-value="{{ account.difference }}">
+            <td class="hidden-sm hidden-xs" data-value="{{ account.difference }}" style="text-align: right;">
+                <span style="margin-right:5px;">
                 {{ (account.difference)|formatAmount }}
+                </span>
             </td>
 
         </tr>
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index 2bf6f5b128..7e6d1af0b1 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -29,11 +29,15 @@
                     <span class="label label-info">{{ match }}</span>
                 {% endfor %}
             </td>
-            <td data-value="{{ entry.amount_min }}">
+            <td data-value="{{ entry.amount_min }}" style="text-align: right;">
+                <span style="margin-right:5px;">
                 {{ entry.amount_min|formatAmount }}
+                </span>
             </td>
-            <td data-value="{{ entry.amount_max }}">
+            <td data-value="{{ entry.amount_max }}" style="text-align: right;">
+                <span style="margin-right:5px;">
                 {{ entry.amount_max|formatAmount }}
+                </span>
             </td>
 
             {% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %}
diff --git a/resources/views/list/journals-tasker.twig b/resources/views/list/journals-tasker.twig
index 37cbcd1b72..a52df725be 100644
--- a/resources/views/list/journals-tasker.twig
+++ b/resources/views/list/journals-tasker.twig
@@ -1,6 +1,6 @@
 {{ journals.render|raw }}
 
-<table class="table table-hover table-compressed {% if sorting %}sortable-table{% endif %}">
+<table class="table table-hover table-condensed {% if sorting %}sortable-table{% endif %}">
     <thead>
     <tr class="ignore">
         <th class="hidden-xs no_select_boxes" colspan="2">&nbsp;</th>
@@ -62,12 +62,13 @@
                 {% endif %}
 
             </td>
-            <td>
+            <td style="text-align: right;">
+                <span style="margin-right:5px;">
                 <!-- format amount of transaction -->
                 {{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }}
                 <!-- and then amount of journal itself. -->
                 {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }}
-
+                </span>
 
             </td>
             <td class="hidden-sm hidden-xs">
diff --git a/resources/views/list/piggy-bank-events.twig b/resources/views/list/piggy-bank-events.twig
index 69caeb6247..df71625b69 100644
--- a/resources/views/list/piggy-bank-events.twig
+++ b/resources/views/list/piggy-bank-events.twig
@@ -22,7 +22,7 @@
                 {% endif %}
             </td>
 
-            <td>
+            <td style="text-align: right;">
                 {% if event.amount < 0 %}
                     <span class="text-danger">{{ trans('firefly.removed_amount', {amount: (event.amount)|formatAmountPlain})|raw }}</span>
                 {% else %}