Better UI for #150

blockcypher · Oct 17, 2015 · c9af508 · c9af508
1 parent 1217e6f
commit c9af508
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/addresses/templatetags/btc_formats.py b/addresses/templatetags/btc_formats.py
@@ -48,7 +48,8 @@ def txn_outputs_to_data_dict(txn_outputs):
     https://github.com/blockcypher/explorer/issues/150#issuecomment-143899714
     '''
     for txn_output in txn_outputs:
-        if txn_output.get('data_hex'):
-            return {'data_hex': txn_output.get('data_hex'), 'data_string': None}
-        if txn_output.get('data_string'):
-            return {'data_hex': None, 'data_string': txn_output.get('data_string')}
+        if txn_output.get('data_hex') or txn_output.get('data_string'):
+            return {
+                    'data_hex': txn_output.get('data_hex'),
+                    'data_string': txn_output.get('data_string'),
+                    }
diff --git a/templates/transaction_overview.html b/templates/transaction_overview.html
@@ -122,17 +122,33 @@ <h2 class="tagline wrapit semi">{{ tx_hash }}</h2>
           <div class="alert alert-info" role="alert">
             <i class="fa fa-exclamation-triangle"></i>
             <strong>
-              {{ transaction.data_protocol }} transaction
+              {% if transaction.data_protocol == 'unknown' %}
+                Data Embedded in Transaction with Unknown Protocol
+              {% elif transaction.data_protocol == 'blockchainid' %}
+                BlockchainID Transaction
+              {% elif transaction.data_protocol == 'openassets' %}
+                Open Assets Transaction
+              {% elif transaction.data_protocol == 'factom' %}
+                Factom Transaction
+              {% elif transaction.data_protocol == 'colu' %}
+                Colu Transaction
+              {% elif transaction.data_protocol == 'coinspark' %}
+                CoinSpark Transaction
+              {% else %}
+                {# Catch all in case more are added #}
+                {{ transaction.data_protocol }} transaction
+              {% endif %}
             </strong>
             (<a href="http://dev.blockcypher.com/#tx">more</a>)
             <br />
             <p>
             {% with data_dict=transaction.outputs|txn_outputs_to_data_dict %}
               {% if data_dict.data_hex or data_dict.data_string %}
+                {% if data_dict.data_string %}
+                  <strong>String</strong>: {{ data_dict.data_string }} <br />
+                {% endif %}
                 {% if data_dict.data_hex %}
                   <strong>Hex</strong>: {{ data_dict.data_hex }}
-                {% elif data_dict.data_string %}
-                  <strong>String</strong>: {{ data_dict.data_hex }}
                 {% endif %}
               {% endif %}
             {% endwith %}