From 554356773aeabc10cb5d310ed9e2749fcb5da125 Mon Sep 17 00:00:00 2001
From: Gustavo Cortez <cmgustavo83@gmail.com>
Date: Sun, 23 Feb 2014 20:16:28 -0300
Subject: [PATCH] 1) fix rounded value for address of txout collapsed. 2) fix
 link of spent tx id. 3) hightlight outpoints and spents

---
 public/src/css/common.css                 | 18 +++++++++++++++---
 public/src/js/config.js                   |  2 +-
 public/src/js/controllers/transactions.js | 12 ++++++++++--
 public/views/transaction/tx.html          | 21 ++++++++++-----------
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/public/src/css/common.css b/public/src/css/common.css
index e3427952..ff5038b5 100644
--- a/public/src/css/common.css
+++ b/public/src/css/common.css
@@ -568,9 +568,6 @@ margin-left: 0;
   margin: 30px 0;
 }
 
-.transaction-vin-vout .ellipsis { margin-bottom: 10px; }
-.transaction-vin-vout .btc-value { margin-left: 15px; }
-
 .page-header { margin-top: 0; }
 
 /* Index */
@@ -646,3 +643,18 @@ margin-left: 0;
   -webkit-animation-timing-function: linear;
 }
 
+.transaction-vin-vout {
+  
+}
+
+.v_hightlight {
+  background-color: #8DC429;
+  overflow: hidden;
+  color: #fff;
+}
+
+a.v_hightlight_more {
+  background-color: #8DC429;
+  color: #fff;
+}
+
diff --git a/public/src/js/config.js b/public/src/js/config.js
index b1b66f83..a48a7f70 100644
--- a/public/src/js/config.js
+++ b/public/src/js/config.js
@@ -11,7 +11,7 @@ angular.module('insight').config(function($routeProvider) {
       controller: 'BlocksController',
       templateUrl: '/views/redirect.html'
     }).
-    when('/tx/:txId', {
+    when('/tx/:txId/:v_type?/:v_index?', {
       templateUrl: '/views/transaction.html',
       title: 'Bitcoin Transaction '
     }).
diff --git a/public/src/js/controllers/transactions.js b/public/src/js/controllers/transactions.js
index e22897cb..9dbf48b4 100644
--- a/public/src/js/controllers/transactions.js
+++ b/public/src/js/controllers/transactions.js
@@ -58,14 +58,14 @@ function($scope, $rootScope, $routeParams, $location, Global, Transaction, Trans
       tmp[addr].doubleSpentIndex = tmp[addr].doubleSpentIndex || items[i].doubleSpentIndex;
       tmp[addr].unconfirmedInput += items[i].unconfirmedInput;
       tmp[addr].dbError = tmp[addr].dbError || items[i].dbError;
-      tmp[addr].valueSat += items[i].value * COIN;
+      tmp[addr].valueSat += Math.round(items[i].value * COIN);
       tmp[addr].items.push(items[i]);
       tmp[addr].notAddr = notAddr;
       tmp[addr].count++;
     }
 
     angular.forEach(tmp, function(v) {
-      v.value    = parseInt(v.valueSat) / COIN;
+      v.value    = v.value || parseInt(v.valueSat) / COIN;
       ret.push(v);
     });
     return ret;
@@ -154,6 +154,14 @@ function($scope, $rootScope, $routeParams, $location, Global, Transaction, Trans
     }
   };
 
+  // Highlighted txout
+  if ($routeParams.v_type == '>' || $routeParams.v_type == '<') {
+    $scope.from_vin = $routeParams.v_type == '<' ? true : false;
+    $scope.from_vout = $routeParams.v_type == '>' ? true : false;
+    $scope.v_index = $routeParams.v_index;
+    $scope.itemsExpanded = true;
+  }
+  
   //Init without txs
   $scope.txs = [];
 
diff --git a/public/views/transaction/tx.html b/public/views/transaction/tx.html
index cd6c2906..94910785 100644
--- a/public/views/transaction/tx.html
+++ b/public/views/transaction/tx.html
@@ -56,7 +56,7 @@
           <div class="col-md-12 transaction-vin-vout">
             <div class="pull-right btc-value"><p>{{$root.currency.getConvertion(vin.value)}}</p></div>
             <div class="ellipsis">
-              <a class="glyphicon glyphicon-chevron-right" href="/tx/{{vin.txid}}" title="Outpoint: {{vin.txid}},{{vin.vout}}"></a>&nbsp;&nbsp;
+              <a class="glyphicon glyphicon-chevron-right" href="/tx/{{vin.txid}}/>/{{vin.vout}}" title="Outpoint: {{vin.txid}},{{vin.vout}}"></a>&nbsp;&nbsp;
               <span data-ng-show="vin.notAddr">{{vin.addr}}</span>
               <a href="/address/{{vin.addr}}" data-ng-show="!vin.notAddr">{{vin.addr}}</a>
             </div>
@@ -65,11 +65,10 @@
             <div data-ng-show="vin.doubleSpentTxID" class="text-danger"> <span class="glyphicon glyphicon-warning-sign"></span> Double spent attempt detected. From tx:
               <a href="/tx/{{vin.doubleSpentTxID}}">{{vin.doubleSpentTxID}},{{vin.doubleSpentIndex}}</a>
             </div>
-
           </div>
           <div class="col-md-12">
             <div class="panel panel-default">
-              <div class="panel-body" style="word-wrap:break-word">
+              <div class="panel-body" style="word-wrap:break-word" data-ng-class="{true: 'v_hightlight', false: ''}[from_vin == true && v_index == vin.n]">
                 <small>
                   <strong>scriptSig</strong>
                   {{vin.scriptSig.asm}}
@@ -80,7 +79,7 @@
         </div>
         <div class="showmore_collapse text-right" data-ng-show="tx.vin.length > 5" data-ng-class="{ 'hidden': !itemsExpanded}">
           <a href="#" ng-hide="sizeInExpanded != tx.vin.length" ng-click="currentInExpanded=0; sizeInExpanded=5"><small>...less</small></a>
-          <a href="#" ng-hide="currentInExpanded >= tx.vin.length/sizeInExpanded - 1" ng-click="currentInExpanded=0; sizeInExpanded=tx.vin.length"><small>more...</small></a>
+          <a href="#" data-ng-class="{true: 'v_hightlight_more', false: ''}[from_vin == true && v_index > 5]" ng-hide="currentInExpanded >= tx.vin.length/sizeInExpanded - 1" ng-click="currentInExpanded=0; sizeInExpanded=tx.vin.length"><small>more...</small></a>
         </div>
       </div>
     </div>
@@ -101,9 +100,9 @@
             <div class="pull-right btc-value" data-ng-class="{'text-success': $root.currentAddr == vout.addr}">
 
               <p>
-                {{$root.currency.getConvertion(vout.value)}}
-                <span class="text-danger" data-ng-show="vout.isSpent" tooltip="Output is spent" tooltip-placement="left">(S)</span>
-                <span class="text-success" data-ng-show="!vout.isSpent"  tooltip="Output is unspent" tooltip-placement="left">(U)</span>
+              {{$root.currency.getConvertion(vout.value)}}
+              <span class="text-danger" data-ng-show="vout.isSpent" tooltip="Output is spent" tooltip-placement="left">(S)</span>
+              <span class="text-success" data-ng-show="!vout.isSpent"  tooltip="Output is unspent" tooltip-placement="left">(U)</span>
               </p>
             </div>
 
@@ -126,8 +125,8 @@
           <div class="col-md-12 transaction-vin-vout">
             <div class="pull-right btc-value">
               <p>{{$root.currency.getConvertion(vout.value)}}
-                <span class="text-success" data-ng-show="!vout.spendTxId" tooltip="Output is unspent" tooltip-placement="left">(U)</span>
-                <a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spendTxId" href="/tx/{{vout.spendTxId}}" title="Spent at: {{vout.spendTxId}},{{vout.spendIndex}}"></a>&nbsp;&nbsp;
+                <span class="text-success" data-ng-show="!vout.spentTxId" tooltip="Output is unspent" tooltip-placement="left">(U)</span>
+                <a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spentTxId" href="/tx/{{vout.spentTxId}}/</{{vout.spentIndex}}" title="Spent at: {{vout.spentTxId}},{{vout.spentIndex}}"></a>&nbsp;&nbsp;
               </p>
             </div>
             <div class="ellipsis">
@@ -136,7 +135,7 @@
           </div>
           <div class="col-md-12">
             <div class="panel panel-default">
-              <div class="panel-body" style="word-wrap:break-word">
+              <div class="panel-body" style="word-wrap:break-word" data-ng-class="{true: 'v_hightlight', false: ''}[from_vout == true && v_index == vout.n]">
                 <small>
                   <p>
                   <strong>Type</strong>
@@ -153,7 +152,7 @@
         </div>
         <div class="showmore_collapse text-right" data-ng-show="tx.vout.length > 5" data-ng-class="{ 'hidden': !itemsExpanded}">
           <a href="#" ng-hide="sizeOutExpanded != tx.vout.length" ng-click="currentOutExpanded=0; sizeOutExpanded=5"><small>...less</small></a>
-          <a href="#" ng-hide="currentOutExpanded >= tx.vout.length/sizeOutExpanded - 1" ng-click="currentOutExpanded=0; sizeOutExpanded=tx.vout.length"><small>more...</small></a>
+          <a href="#" data-ng-class="{true: 'v_hightlight_more', false: ''}[from_vout == true && v_index > 5]" ng-hide="currentOutExpanded >= tx.vout.length/sizeOutExpanded - 1" ng-click="currentOutExpanded=0; sizeOutExpanded=tx.vout.length"><small>more...</small></a>
         </div>
       </div>
     </div>