Merge pull request #301 from colkito/bug/new-copy-icon

added a new copy icon #293 and several improvements in the block page
This commit is contained in:
Gustavo Maximiliano Cortez 2014-02-13 17:48:01 -02:00
commit b8d2a863d9
5 changed files with 28 additions and 22 deletions

BIN
public/img/icons/copy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 B

View File

@ -486,11 +486,15 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
color: #9b9b9b; color: #9b9b9b;
display: inline-block; display: inline-block;
height: 25px; height: 25px;
padding: 0;
outline: none; outline: none;
text-align: center; text-align: center;
width: 30px; 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 { .btn-copy .tooltip {
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;

View File

@ -39,7 +39,7 @@ angular.module('insight')
return { return {
restric: 'A', restric: 'A',
scope: { clipCopy: '=clipCopy' }, 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) { link: function(scope, elm) {
var clip = new ZeroClipboard(elm); var clip = new ZeroClipboard(elm);

0
public/src/js/services/global.js Executable file → Normal file
View File

View File

@ -14,18 +14,14 @@
<div class="m20v" data-ng-show="!tx.isCoinBase"> <div class="m20v" data-ng-show="!tx.isCoinBase">
<h4>Hashes</h4> <h4>Hashes</h4>
<table class="table" style="table-layout: fixed"> <table class="table" style="table-layout: fixed">
<tbody> <tbody class="small">
<tr> <tr data-ng-show="block.previousblockhash">
<td class="small"> Previous Block</td> <td> Previous Block</td>
<td><a class="address ellipsis" href="/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td> <td class="text-right"><a href="/block/{{block.previousblockhash}}">{{block.height-1}}</a></td>
</tr> </tr>
<tr> <tr data-ng-show="block.nextblockhash">
<td class="small"> Next Block</td> <td> Next Block</td>
<td><a class="address ellipsis" href="/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td> <td class="text-right"><a href="/block/{{block.nextblockhash}}">{{block.height+1}}</a></td>
</tr>
<tr>
<td class="small">Merkle Root</td>
<td> <p class="address ellipsis"> {{block.merkleroot}} </p> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -53,11 +49,17 @@
<td><strong>Block Reward</strong></td> <td><strong>Block Reward</strong></td>
<td class="text-right text-muted">{{$root.currency.getConvertion(block.reward)}}</td> <td class="text-right text-muted">{{$root.currency.getConvertion(block.reward)}}</td>
</tr> </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> <td class="text-right text-muted">{{block.time * 1000 | date:'medium'}}</td>
</tr> </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> </tbody>
</table> </table>
</div> </div>