From ec8a2e9064f555adb0c120400b5a199a37855ac4 Mon Sep 17 00:00:00 2001
From: Bechi <bechilandia@gmail.com>
Date: Wed, 15 Jan 2014 17:40:29 -0300
Subject: [PATCH 1/4] fix get. blockpage ux

---
 public/css/common.css   |  45 ++++++++++-
 public/views/block.html | 161 ++++++++++++++++++++++++++++------------
 2 files changed, 156 insertions(+), 50 deletions(-)

diff --git a/public/css/common.css b/public/css/common.css
index 8853a578..d24c69a2 100644
--- a/public/css/common.css
+++ b/public/css/common.css
@@ -10,6 +10,7 @@
 -------------------------------------------------- */
 html,
 body {
+  color: #373D42;
   font-family: Ubuntu, sans-serif;
   height: 100%;
   /* The html and body elements cannot have any padding or margin. */
@@ -74,13 +75,53 @@ body {
   line-height: 18px;
 }
 
+.col-gray {
+  background-color: #F8F8F8;
+  padding: 15px;
+  margin-top: 10px;
+  width: 350px;
+  height: 89%;
+  border-radius: 5px;
+}
+
+.col-gray .address {
+  float: right;
+  display: block;
+  width: 150px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.block-id {
+  background: #373D42;
+  border: 3px solid #FFFFFF;
+  width: 165px;
+  height: 165px;
+  margin: 10px auto;
+  border-radius: :;px;
+}
+
+.block-id h1 {
+  font-family: Ubuntu-Medium;
+  font-size: 24px;
+  color: #FFFFFF;
+  line-height: 30px;
+  text-align: center;
+}
+
+.icon-block {
+  font-size: 27px;
+  color: white;
+  margin-top:  20px;
+}
+
 /* Set the fixed height of the footer here */
 #footer {
   height: 60px;
   background-color: #f5f5f5;
 }
 
-
 /* Custom page CSS
 -------------------------------------------------- */
 /* Not required for template or sticky footer method. */
@@ -102,7 +143,7 @@ body {
 }
 
 .address {
-  font-size: 10px;
+  font-size: 11px;
 }
 
 #search { width: 400px; }
diff --git a/public/views/block.html b/public/views/block.html
index b843503f..f7c1c919 100644
--- a/public/views/block.html
+++ b/public/views/block.html
@@ -1,29 +1,79 @@
 <section data-ng-controller="BlocksController" data-ng-init="findOne()">
-  <div class="page-header">
-    <h1 data-ng-if="block">Block #{{ block.height }}</h1>
-  </div>
-
   <div class="row">
-    <div class="col-md-6">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h3 class="panel-title">Summary</h3>
+    <div class="col-md-4">
+      <div class="bs-sidebar hidden-print affix  col-gray">
+        <div class="block-id">
+          <div class="icon-block text-center">
+            <span class="glyphicon glyphicon-list-alt"></span>
+          </div>
+          <h1 data-ng-if="block">Block #{{ block.height }}</h1>
         </div>
-        <div class="panel-body">
-          <table class="table table-striped">
+
+        <div data-ng-show="!tx.isCoinBase">
+          <div class="panel-heading">
+            <h3>Hashes</h3>
+          </div>
+          <div class="panel-body">
+            <table class="table table-striped">
+              <tbody>
+              <tr>
+                <td>Hash</td>
+                <td><a class="address" href="/#!/block/{{block.hash}}">{{block.hash}}</a></td>
+              </tr>
+              <tr>
+                <td>Previous Block</td>
+                <td><a class="address" href="/#!/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>
+              </tr>
+              <tr>
+                <td>Next Block</td>
+                <td><a class="address" href="/#!/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td>
+              </tr>
+              <tr>
+                <td>Merkle Root</td>
+                <td> <p class="address"> {{block.merkleroot}} </p> </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+
+      </div>
+    </div> <!-- END OF COL-GRAY   -->   
+
+    <div class="col-md-8">
+      <h3>Summary</h3>
+      <div class="row">
+        <div class="col-md-6">
+          <table class="table">
             <tbody>
-            <tr>
-              <td>Number Of Transactions</td>
-              <td>{{block.tx.length}}<td>
-            </tr>
-            <tr>
-              <td>Height</td>
-              <td>{{block.height}}</td>
-            </tr>
-            <tr>
-              <td>Timestamp</td>
-              <td>{{block.time * 1000 | date:'medium'}}</td>
-            </tr>
+
+
+
+              <tr>
+                <td> <strong> Number Of Transactions </strong> </td>
+                <td class="text-right text-muted">{{block.tx.length}}<td>
+              </tr>
+              <tr>
+                <td> <strong> Output Total</strong></td>
+                <td class="text-right text-muted">--</td>
+              </tr>
+              <tr>
+                <td> <strong> Estimated Transaction Volume </strong></td>
+                <td class="text-right text-muted">--</td>
+              </tr>
+              <tr>
+                <td> <strong> Transaction Fees </strong></td>
+                <td class="text-right text-muted">--</td>
+              </tr>
+              <tr>
+                <td> <strong> Height </strong></td>
+                <td class="text-right text-muted">{{block.height}}</td>
+              </tr>
+              <tr>
+                <td> <strong> Timestamp </strong></td>
+                <td class="text-right text-muted">{{block.time * 1000 | date:'medium'}}</td>
+              </tr>
+
             <tr>
               <td>Difficulty</td>
               <td>{{block.difficulty}}</td>
@@ -47,36 +97,51 @@
             </tbody>
           </table>
         </div>
-      </div>
-    </div>
-    <div class="col-md-6">
-      <div class="panel panel-default" data-ng-show="!tx.isCoinBase">
-        <div class="panel-heading">
-          <h3 class="panel-title">Hashes</h3>
-        </div>
-        <div class="panel-body">
-          <table class="table table-striped">
+        <div class="col-md-6">
+          <table class="table">
             <tbody>
-            <tr>
-              <td>Hash</td>
-              <td><a class="address" href="/#!/block/{{block.hash}}">{{block.hash}}</a></td>
-            </tr>
-            <tr>
-              <td>Previous Block</td>
-              <td><a class="address" href="/#!/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>
-            </tr>
-            <tr>
-              <td>Next Block</td>
-              <td><a class="address" href="/#!/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td>
-            </tr>
-            <tr>
-              <td>Merkle Root</td>
-              <td class="address">{{block.merkleroot}}</td>
-            </tr>
+              <tr>
+                <td> <strong> Relayed By </strong></td>
+                <td class="text-right text-muted">--</td>
+              </tr>
+              <tr>
+                <td> <strong> Difficulty </strong></td>
+                <td class="text-right text-muted">{{block.difficulty}}</td>
+              </tr>
+              <tr>
+                <td> <strong> Bits </strong></td>
+                <td class="text-right text-muted">{{block.bits}}</td>
+              </tr>
+              <tr>
+                <td> <strong> Size </strong></td>
+                <td class="text-right text-muted">{{block.size}}</td>
+              </tr>
+              <tr>
+                <td> <strong> Version </strong></td>
+                <td class="text-right text-muted">{{block.version}}</td>
+              </tr>
+              <tr>
+                <td> <strong> Nonce </strong></td>
+                <td class="text-right text-muted">{{block.nonce}}</td>
+              </tr>
             </tbody>
           </table>
         </div>
-      </div>
+      </div><!--  END OF ROW -->
+
+      <h2>Transactions <small>Transactions contained within this block</small></h2>
+      <table class="table table-striped">
+        <thead>
+          <tr>
+            <th>Hash</th>
+          </tr>
+        </thead>
+        <tbody>
+        <tr data-ng-repeat="tx in block.tx track by $index">
+          <td><a href="/#!/tx/{{tx}}">{{tx}}</a></td>
+        </tr>
+        </tbody>
+      </table>
     </div>
   </div>
 

From 12093e82506609b861b34ee0eef06bcb98f66a7a Mon Sep 17 00:00:00 2001
From: Bechi <bechilandia@gmail.com>
Date: Thu, 16 Jan 2014 14:16:01 -0300
Subject: [PATCH 2/4] block page

---
 public/views/block.html | 110 ++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 66 deletions(-)

diff --git a/public/views/block.html b/public/views/block.html
index f7c1c919..94ad6148 100644
--- a/public/views/block.html
+++ b/public/views/block.html
@@ -14,23 +14,23 @@
             <h3>Hashes</h3>
           </div>
           <div class="panel-body">
-            <table class="table table-striped">
+            <table class="table table">
               <tbody>
               <tr>
                 <td>Hash</td>
-                <td><a class="address" href="/#!/block/{{block.hash}}">{{block.hash}}</a></td>
+                <td><a class="address ellipsis" href="/#!/block/{{block.hash}}">{{block.hash}}</a></td>
               </tr>
               <tr>
                 <td>Previous Block</td>
-                <td><a class="address" href="/#!/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>
+                <td><a class="address ellipsis" href="/#!/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>
               </tr>
               <tr>
                 <td>Next Block</td>
-                <td><a class="address" href="/#!/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td>
+                <td><a class="address ellipsis" href="/#!/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td>
               </tr>
               <tr>
                 <td>Merkle Root</td>
-                <td> <p class="address"> {{block.merkleroot}} </p> </td>
+                <td> <p class="address ellipsis"> {{block.merkleroot}} </p> </td>
               </tr>
               </tbody>
             </table>
@@ -46,9 +46,6 @@
         <div class="col-md-6">
           <table class="table">
             <tbody>
-
-
-
               <tr>
                 <td> <strong> Number Of Transactions </strong> </td>
                 <td class="text-right text-muted">{{block.tx.length}}<td>
@@ -73,27 +70,6 @@
                 <td> <strong> Timestamp </strong></td>
                 <td class="text-right text-muted">{{block.time * 1000 | date:'medium'}}</td>
               </tr>
-
-            <tr>
-              <td>Difficulty</td>
-              <td>{{block.difficulty}}</td>
-            </tr>
-            <tr>
-              <td>Bits</td>
-              <td>{{block.bits}}</td>
-            </tr>
-            <tr>
-              <td>Size</td>
-              <td>{{block.size}}</td>
-            </tr>
-            <tr>
-              <td>Version</td>
-              <td>{{block.version}}</td>
-            </tr>
-            <tr>
-              <td>Nonce</td>
-              <td>{{block.nonce}}</td>
-            </tr>
             </tbody>
           </table>
         </div>
@@ -129,44 +105,46 @@
         </div>
       </div><!--  END OF ROW -->
 
-      <h2>Transactions <small>Transactions contained within this block</small></h2>
-      <table class="table table-striped">
-        <thead>
-          <tr>
-            <th>Hash</th>
-          </tr>
-        </thead>
-        <tbody>
-        <tr data-ng-repeat="tx in block.tx track by $index">
-          <td><a href="/#!/tx/{{tx}}">{{tx}}</a></td>
-        </tr>
-        </tbody>
-      </table>
+      <div data-ng-controller="transactionsController" data-ng-init="byBlock(params.blockHash)"> 
+        <h2>Transactions <small >Transactions contained within this block</small></h2>
+
+        <div class="block-tx" data-ng-repeat="tx in txs">
+          <div class="line-bot">
+              <a href="/#!/tx/{{tx.txid}}">{{tx.txid}}</a>
+              <span class="pull-right">{{tx.time * 1000 | date:'medium'}}</span>
+          </div> 
+
+          <div class="row">
+            <div class="col-md-5">
+              Emisor
+            </div>
+            <div class="col-md-2">
+              <span class="glyphicon glyphicon-arrow-right lead"></span>
+            </div>
+            <div class="col-md-5">
+              <div class="row">
+                <div class="col-md-6">
+                  <p>Receptor</p>
+                  <p>Receptor</p>
+                </div>
+                <div class="col-md-6 text-right">
+                  <p>plata del receptor</p>
+                  <p>plata del receptor</p>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="line-top">
+            <small class="text-muted">Feeds: {{tx.feeds}}</small>
+            <div class="btn btn-primary pull-right">
+              {{tx.valueOut}}
+            </div>
+          </div> 
+        </div><!--  END OF BLOCK-TX -->
+
+      </div>
     </div>
   </div>
 
-  <div data-ng-controller="transactionsController" data-ng-init="byBlock(params.blockHash)"> 
-    <h2>Transactions <small>Transactions contained within this block</small></h2>
-    <table class="table table-striped">
-      <thead>
-        <tr>
-          <th>Transaction Hash</th>
-          <th>Datetime</th>
-          <th>Fee</th>
-          <th>Transacted Amount</th>
-        </tr>
-      </thead>
-      <tbody>
-      <tr data-ng-show="!txs.length">
-        <td colspan="4" class="text-center">Loading...</td>
-      </tr>
-      <tr data-ng-repeat="tx in txs">
-        <td><a href="/#!/tx/{{tx.txid}}">{{tx.txid}}</a></td>
-        <td>{{tx.time * 1000 | date:'medium'}}</td>
-        <td>{{tx.feeds}}</td>
-        <td>{{tx.valueOut}}</td>
-      </tr>
-      </tbody>
-    </table>
-  </div>
 </section>

From 954b0f10b033925f59642c9ec92827452fa8679f Mon Sep 17 00:00:00 2001
From: Bechi <bechilandia@gmail.com>
Date: Thu, 16 Jan 2014 14:17:24 -0300
Subject: [PATCH 3/4] css fixes

---
 public/css/common.css | 55 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/public/css/common.css b/public/css/common.css
index d24c69a2..127e5be1 100644
--- a/public/css/common.css
+++ b/public/css/common.css
@@ -76,23 +76,36 @@ body {
 }
 
 .col-gray {
-  background-color: #F8F8F8;
+  background-color: #F4F4F4;
   padding: 15px;
   margin-top: 10px;
-  width: 350px;
+  width: 360px;
   height: 89%;
   border-radius: 5px;
 }
 
-.col-gray .address {
-  float: right;
+.ellipsis {
   display: block;
-  width: 150px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
+.line20 {
+  border: 1px solid #D4D4D4;
+  margin-bottom: 15px;
+}
+
+.line10 {
+  border: 1px solid #EAEAEA;
+  margin: 10px 0;
+}
+
+.col-gray .address {
+  float: right;
+  width: 150px;
+}
+
 .block-id {
   background: #373D42;
   border: 3px solid #FFFFFF;
@@ -116,12 +129,44 @@ body {
   margin-top:  20px;
 }
 
+.block-tx {
+  border-radius: 2px;
+  background: #F4F4F4;
+  margin: 20px 0;
+  padding: 15px;
+}
+
+.btn-primary {
+  border-radius: 2px;
+  background: #64920F;
+  border: 2px solid #557F08;
+}
+
+.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary {
+  background: #fff;
+  border: 2px solid #ccc;
+  color: #373D42;
+  font-weight: bold;
+}
+
 /* Set the fixed height of the footer here */
 #footer {
   height: 60px;
   background-color: #f5f5f5;
 }
 
+.line-bot {
+  padding: 0 0 10px 0;
+  margin-bottom: 10px;
+  border-bottom: 2px solid #EAEAEA;
+}
+
+.line-top {
+  padding: 10px 0;
+  margin-top: 10px;
+  border-top: 1px solid #EAEAEA;
+}
+
 /* Custom page CSS
 -------------------------------------------------- */
 /* Not required for template or sticky footer method. */

From cf61b04211b0337f73b017dba1b9e6177dca5e33 Mon Sep 17 00:00:00 2001
From: Bechi <bechilandia@gmail.com>
Date: Thu, 16 Jan 2014 14:25:00 -0300
Subject: [PATCH 4/4] fix tx

---
 public/views/block.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/views/block.html b/public/views/block.html
index 94ad6148..a81b42dc 100644
--- a/public/views/block.html
+++ b/public/views/block.html
@@ -116,7 +116,7 @@
 
           <div class="row">
             <div class="col-md-5">
-              Emisor
+              Transmitter
             </div>
             <div class="col-md-2">
               <span class="glyphicon glyphicon-arrow-right lead"></span>
@@ -128,8 +128,8 @@
                   <p>Receptor</p>
                 </div>
                 <div class="col-md-6 text-right">
-                  <p>plata del receptor</p>
-                  <p>plata del receptor</p>
+                  <p>Bitcoin of Receptor</p>
+                  <p>Bitcoin of Receptor</p>
                 </div>
               </div>
             </div>