From 596d090ca522d5571f8d420d4d8e361ef0a72fea Mon Sep 17 00:00:00 2001
From: Mario Colque <colquemario@gmail.com>
Date: Thu, 13 Feb 2014 16:34:14 -0300
Subject: [PATCH] added a new copy icon #293 and several improvements in the
 block page

---
 public/img/icons/copy.png        | Bin 0 -> 148 bytes
 public/src/css/common.css        |   6 ++++-
 public/src/js/directives.js      |   2 +-
 public/src/js/services/global.js |   0
 public/views/block.html          |  42 ++++++++++++++++---------------
 5 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 public/img/icons/copy.png
 mode change 100755 => 100644 public/src/js/services/global.js

diff --git a/public/img/icons/copy.png b/public/img/icons/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..b43ca063492c22a1436ae1d2ce852d638df9e38c
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`(Vi}jAr-fhQyQAu+S>l}xG*h<
za+8=Xc(dWxud1e5($dl|6Bs-MH!>_|JhH3p8(YF>zD;*LiWzq;yi(3+R-bgag-2qe
w=Ar3p64y1WW^UqXSe1C>HB(KU`#B$mX;bUjd88Ho0j**1boFyt=akR{0FnYUOaK4?

literal 0
HcmV?d00001

diff --git a/public/src/css/common.css b/public/src/css/common.css
index 38f7d10..9d3496a 100644
--- a/public/src/css/common.css
+++ b/public/src/css/common.css
@@ -486,11 +486,15 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   color: #9b9b9b;
   display: inline-block;
   height: 25px;
+  padding: 0;
   outline: none;
   text-align: center;
   width: 30px;
 }
-.btn-copy { margin-left: 5px; }
+.btn-copy {
+  background: #fff url('/img/icons/copy.png') center center no-repeat;
+  margin-left: 5px;
+}
 .btn-copy .tooltip {
   display: inline-block;
   margin-left: 10px;
diff --git a/public/src/js/directives.js b/public/src/js/directives.js
index ed0b1cf..e576245 100644
--- a/public/src/js/directives.js
+++ b/public/src/js/directives.js
@@ -39,7 +39,7 @@ angular.module('insight')
     return {
       restric: 'A',
       scope: { clipCopy: '=clipCopy' },
-      template: '<span class="glyphicon glyphicon-paperclip"></span><div class="tooltip fade right in"><div class="tooltip-arrow"></div><div class="tooltip-inner">Copied!</div></div>',
+      template: '<div class="tooltip fade right in"><div class="tooltip-arrow"></div><div class="tooltip-inner">Copied!</div></div>',
       link: function(scope, elm) {
         var clip = new ZeroClipboard(elm);
 
diff --git a/public/src/js/services/global.js b/public/src/js/services/global.js
old mode 100755
new mode 100644
diff --git a/public/views/block.html b/public/views/block.html
index 6eaa1e6..e983dbd 100644
--- a/public/views/block.html
+++ b/public/views/block.html
@@ -5,7 +5,7 @@
       <h1 class="text-center">Block</h1>
       <div class="block-id">
         <span class="glyphicon glyphicon-list-alt"></span>
-        <h2 data-ng-if="block">#{{ block.height }}</h2>
+        <h2 data-ng-if="block">#{{block.height}}</h2>
       </div>
       <div class="m10v">
         <button class="pull-right btn-copy" clip-copy="block.hash"></button>
@@ -14,19 +14,15 @@
       <div class="m20v" data-ng-show="!tx.isCoinBase">
         <h4>Hashes</h4>
         <table class="table" style="table-layout: fixed">
-          <tbody>
-          <tr>
-            <td class="small"> Previous Block</td>
-            <td><a class="address ellipsis" href="/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>
-          </tr>
-          <tr>
-            <td class="small"> Next Block</td>
-            <td><a class="address ellipsis" href="/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td>
-          </tr>
-          <tr>
-            <td class="small">Merkle Root</td>
-            <td> <p class="address ellipsis"> {{block.merkleroot}} </p> </td>
-          </tr>
+          <tbody class="small">
+            <tr data-ng-show="block.previousblockhash">
+              <td> Previous Block</td>
+              <td class="text-right"><a href="/block/{{block.previousblockhash}}">{{block.height-1}}</a></td>
+            </tr>
+            <tr data-ng-show="block.nextblockhash">
+              <td> Next Block</td>
+              <td class="text-right"><a href="/block/{{block.nextblockhash}}">{{block.height+1}}</a></td>
+            </tr>
           </tbody>
         </table>
       </div> <!-- END OF TRANSACTIONS TABLE -->
@@ -40,24 +36,30 @@
           <table class="table">
             <tbody>
               <tr>
-                <td> <strong> Number Of Transactions </strong> </td>
+                <td><strong>Number Of Transactions</strong></td>
                 <td class="text-right text-muted">{{block.tx.length}}<td>
               </tr>
               <tr>
-                <td> <strong> Height </strong></td>
+                <td><strong>Height</strong></td>
                 <td class="text-right text-muted">{{block.height}}
                 <span data-ng-show="block.isMainChain" class="text-success">(Mainchain)</span>
                 <span data-ng-show="!block.isMainChain" class="text-danger"> <span class="glyphicon glyphicon-warning-sign"></span> (Orphaned)</span>
               </tr>
               <tr>
-                <td> <strong> Block Reward </strong></td>
+                <td><strong>Block Reward</strong></td>
                 <td class="text-right text-muted">{{$root.currency.getConvertion(block.reward)}}</td>
-              </tr>
- 
+              </tr> 
               <tr>
-                <td> <strong> Timestamp </strong></td>
+                <td><strong>Timestamp</strong></td>
                 <td class="text-right text-muted">{{block.time * 1000 | date:'medium'}}</td>
               </tr>
+              <tr>
+                <td><strong>Merkle Root</strong></td>
+                <td class="text-right text-muted">
+                  <button class="pull-right btn-copy" clip-copy="block.merkleroot"></button>
+                  <span class="ellipsis" style="width:155px">{{block.merkleroot}}</span>
+                </td>
+              </tr>
             </tbody>
           </table>
         </div>