Secondary navbar when scroll on txpages, blockpages and addrpages

slowfx · Feb 24, 2014 · ce5ce82 · ce5ce82
1 parent 151d6b7
commit ce5ce82
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 5 deletions.
diff --git a/public/src/css/common.css b/public/src/css/common.css
@@ -392,6 +392,13 @@ margin-left: 0;
   background-color: #AC0015;
 }
 
+.txvalues-normal {
+  background-color: transparent;
+  text-transform: none;
+  color: #333;
+  font-size: 14px;
+  font-weight: normal;
+}
 .progress-bar-info { background-color: #8DC429; }
 
 /* Set the fixed height of the footer here */
@@ -670,6 +677,6 @@ a.v_highlight_more {
   border: 1px solid #eee;
   padding: 10px;
   text-align: center;
-  z-index: 10000;
+  z-index: 1000;
 }
 
diff --git a/public/views/address.html b/public/views/address.html
@@ -1,12 +1,25 @@
 <div data-ng-include src="'/views/includes/connection.html'"></div>
 <section data-ng-controller="AddressController" data-ng-init="findOne()">
+  <div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}" data-ng-show="address.addrStr">
+    <div class="row">
+      <div class="col-md-8 text-center">
+        <span class="ellipsis txvalues txvalues-normal">
+          <strong>Address</strong> {{address.addrStr}}
+          <span class="btn-copy" clip-copy="address.addrStr"></span>
+        </span>
+      </div>
+      <div class="col-md-4">
+        <span class="txvalues txvalues-primary"><strong>Final Balance</strong> {{$root.currency.getConvertion(address.balance) || address.balance + ' BTC' }}</span>
+      </div>
+    </div>
+  </div>
   <h1>Address <small data-ng-show="address.addrStr">{{$root.currency.getConvertion(address.balance) || address.balance + ' BTC'}}</small></h1>
   <div class="text-muted" data-ng-if="!address.addrStr">
     <span>Loading Address Information...</span>
   </div>
   <div data-ng-if="address.addrStr">
     <div class="well well-sm ellipsis">
-      <strong>String</strong> 
+      <strong>Address</strong> 
       <span class="text-muted">{{address.addrStr}}</span>
       <span class="btn-copy" clip-copy="address.addrStr"></span>
     </div>

diff --git a/public/views/block.html b/public/views/block.html
@@ -2,16 +2,22 @@
 <section data-ng-controller="BlocksController" data-ng-init="findOne()">
   <div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}">
     <div class="row">
-      <div class="col-md-2">
+      <div class="col-md-2 text-right">
+        <span class="ellipsis txvalues txvalues-normal">
         <a href="/block/{{block.previousblockhash}}">&larr; Previous Block</a>
+      </span>
       </div>
       <div class="col-md-8 text-center">
+        <div class="ellipsis txvalues txvalues-normal">
         <strong>Block</strong> #{{block.height}} &middot; 
         <strong>Hash</strong> {{block.hash}}
         <span class="btn-copy" clip-copy="block.hash"></span>
+        </div>
       </div>
-      <div class="col-md-2">
+      <div class="col-md-2 text-left">
+        <span class="ellipsis txvalues txvalues-normal">
         <a href="/block/{{block.nextblockhash}}">Next Block &rarr;</a>
+      </span>
       </div>
     </div>
   </div>

diff --git a/public/views/transaction.html b/public/views/transaction.html
@@ -1,5 +1,20 @@
 <div data-ng-include src="'/views/includes/connection.html'"></div>
 <section data-ng-controller="transactionsController" data-ng-init="findThis()">
+  <div class="secondary_navbar" scroll data-ng-class="{'hidden': !secondaryNavbar}">
+    <div class="row">
+      <div class="col-md-8 text-center">
+        <span class="ellipsis txvalues txvalues-normal">
+          <strong>Transaction</strong> {{tx.txid}}
+          <span class="btn-copy" clip-copy="tx.txid"></span>
+        </span>
+      </div>
+      <div class="col-md-4">
+        <span data-ng-show="tx.confirmations" class="txvalues txvalues-success">{{tx.confirmations}} Confirmations</span>
+        <span data-ng-show="!tx.confirmations" class="txvalues txvalues-danger">Unconfirmed Transaction!</span>
+        <span class="txvalues txvalues-primary">{{$root.currency.getConvertion(tx.valueOut) || tx.valueOut + ' BTC' }}</span>
+      </div>
+    </div>
+  </div>
   <div class="ng-cloak" data-ng-cloak data-ng-if="tx.txid">
     <h1>Transaction 
       <small data-ng-show="from_vin || from_vout">
@@ -15,7 +30,7 @@ <h1>Transaction
     </div>
     <div data-ng-if="tx.txid">
       <div class="well well-sm ellipsis">
-        <strong>Id</strong> 
+        <strong>Transaction</strong> 
         <span class="txid text-muted">{{tx.txid}}</span>
         <span class="btn-copy" clip-copy="tx.txid"></span>
       </div>