From 25caa397fdcebdaef7d2aac77017fd7df610694a Mon Sep 17 00:00:00 2001
From: Sander Ferdinand <xmrdsc@protonmail.com>
Date: Thu, 25 Oct 2018 22:26:23 +0200
Subject: [PATCH] Jinja2 macro for transaction items

---
 .../proposal/macros/transaction.html          | 28 ++++++++++++++
 funding/templates/proposal/proposal.html      | 38 ++-----------------
 2 files changed, 31 insertions(+), 35 deletions(-)
 create mode 100644 funding/templates/proposal/macros/transaction.html

diff --git a/funding/templates/proposal/macros/transaction.html b/funding/templates/proposal/macros/transaction.html
new file mode 100644
index 0000000..3b2866e
--- /dev/null
+++ b/funding/templates/proposal/macros/transaction.html
@@ -0,0 +1,28 @@
+{% macro tx_item(tx) %}
+<li class="list-group-item tx_item">
+    <span class="datetime">
+        {{tx['datetime'].strftime('%Y-%m-%d %H:%M')}}
+    </span>
+
+    <span class="height">
+        <b>Blockheight</b>: {{tx['height']}}</span>
+    <br>
+
+    <a target="_blank" href="https://explore.wownero.com/tx/{{tx['txid']}}">{{tx['txid'][:32]}}...</a>
+    <span class="amount{% if tx['type'] == 'in' %} in{% endif %}">
+        {% if tx['type'] == 'in' %}
+            +
+        {% else %}
+            -
+        {% endif %}
+
+        {{tx['amount_human']|round(3)}} WOW
+
+        {% if 'amount_usd' in tx %}
+        <small style="color: black">
+            ➞ $ {{tx['amount_usd']}}
+        </small>
+        {% endif %}
+    </span>
+</li>
+{% endmacro %}
diff --git a/funding/templates/proposal/proposal.html b/funding/templates/proposal/proposal.html
index bcd7cec..bff2ed4 100644
--- a/funding/templates/proposal/proposal.html
+++ b/funding/templates/proposal/proposal.html
@@ -165,12 +165,7 @@
 
     {% include 'comments.html' %}
 
-    <style>
-        #incoming_txs li.list-group-item {
-            padding-top: 4px;
-            padding-bottom: 4px;
-        }
-    </style>
+    {% from 'proposal/macros/transaction.html' import tx_item %}
 
     {% if proposal.balance['txs'] %}
     <div class="row">
@@ -180,20 +175,7 @@
                 <div class="card-body">
                     <ul class="list-group">
                         {% for tx in proposal.balance['txs'] %}
-                        <li class="list-group-item">
-                            {{tx['datetime'].strftime('%Y-%m-%d %H:%M')}}
-                            <span style="float:right"><b>Blockheight</b>: {{tx['height']}}</span>
-                            <br>
-                            <a target="_blank" href="https://explore.wownero.com/tx/{{tx['txid']}}">{{tx['txid'][:32]}}...</a>
-                            <span style="float:right;color:#008926;font-weight:bold;">
-                                + {{tx['amount_human']|round(3)}} WOW
-                                {% if 'amount_usd' in tx %}
-                                <small style="color: black">
-                                    ➞ $ {{tx['amount_usd']}}
-                                </small>
-                                {% endif %}
-                            </span>
-                        </li>
+                            {{ tx_item(tx) }}
                         {% endfor %}
                     </ul>
                 </div>
@@ -203,7 +185,6 @@
     <!-- /.row -->
     {% endif %}
 
-
     {% if proposal.spends['txs'] %}
         <div class="row">
             <div class="col-md-12">
@@ -212,20 +193,7 @@
                     <div class="card-body">
                         <ul class="list-group">
                             {% for tx in proposal.spends['txs'] %}
-                            <li class="list-group-item">
-                                {{tx['datetime'].strftime('%Y-%m-%d %H:%M')}}
-                                <span style="float:right"><b>Blockheight</b>: {{tx['height']}}</span>
-                                <br>
-                                <a target="_blank" href="https://explore.wownero.com/tx/{{tx['txid']}}">{{tx['txid'][:32]}}...</a>
-                                <span style="float:right;color:#890000;font-weight:bold;">
-                                    - {{tx['amount_human']|round(3)}} WOW
-                                    {% if 'amount_usd' in tx %}
-                                    <small style="color: black">
-                                        ➞ $ {{tx['amount_usd']}}
-                                    </small>
-                                    {% endif %}
-                                </span>
-                            </li>
+                                {{ tx_item(tx) }}
                             {% endfor %}
                         </ul>
                     </div>