From 446ab62d38e4b985cbd80e2c0fad9edadfc666a1 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 14 May 2016 23:14:49 +0200
Subject: [PATCH] View updates. [skip ci]

---
 resources/views/popup/list/journals.twig       | 18 +++++++-----------
 resources/views/popup/report/income-entry.twig |  1 +
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig
index f4bf459842..a75d9e445e 100644
--- a/resources/views/popup/list/journals.twig
+++ b/resources/views/popup/list/journals.twig
@@ -39,27 +39,23 @@
                 <a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a>
             </td>
             <td>
-                {{ journal|formatJournal }}
+                {% if not accountPerspective %}
+                    {{ journal|formatJournal }}
+                {% else %}
+                    {{ formatPerspective(journal, accountPerspective)|raw }}
+                {% endif %}
             </td>
             <td class="hidden-sm hidden-xs">
                 {{ journal.date.formatLocalized(monthAndDayFormat) }}
             </td>
             {% if not hideSource %}
                 <td class="hidden-xs">
-                    {% if journal.source_account_type == 'Cash account' %}
-                        <span class="text-success">(cash)</span>
-                    {% else %}
-                        <a href="{{ route('accounts.show',journal.source_account_id) }}">{{ journal.source_account_name }}</a>
-                    {% endif %}
+                    {{ sourceAccount(journal)|raw }}
                 </td>
             {% endif %}
             {% if not hideDestination %}
                 <td class="hidden-xs">
-                    {% if journal.destination_account_type == 'Cash account' %}
-                        <span class="text-success">(cash)</span>
-                    {% else %}
-                        <a href="{{ route('accounts.show',journal.destination_account_id) }}">{{ journal.destination_account_name }}</a>
-                    {% endif %}
+                    {{ destinationAccount(journal)|raw }}
                 </td>
             {% endif %}
 
diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig
index 504960ea69..71ffb20f65 100644
--- a/resources/views/popup/report/income-entry.twig
+++ b/resources/views/popup/report/income-entry.twig
@@ -8,6 +8,7 @@
         <div class="modal-body">
             {% set hideBudget = true %}
             {% set hideSource = true %}
+            {% set accountPerspective = account %}
             {% include 'popup/list/journals.twig' %}
         </div>
         <div class="modal-footer">