diff --git a/static/favicon.ico b/static/favicon.ico deleted file mode 100644 index a1b20e0a..00000000 Binary files a/static/favicon.ico and /dev/null differ diff --git a/static/templates/base.html b/static/templates/base.html index b5256e2f..0a21cb7f 100644 --- a/static/templates/base.html +++ b/static/templates/base.html @@ -4,78 +4,163 @@ - + - - + + RanchiMall Blockbook +
-
- {{- template "specific" . -}} -
+ {{- template "specific" . -}}
- \ No newline at end of file + diff --git a/static/templates/block.html b/static/templates/block.html index fe9b7d2b..39fc5e06 100644 --- a/static/templates/block.html +++ b/static/templates/block.html @@ -45,12 +45,12 @@ {{$b.Version}} - Merkle Root - {{$b.MerkleRoot}} + Merkle Root + {{$b.MerkleRoot}} Nonce - {{$b.Nonce}} + {{$b.Nonce}} Bits diff --git a/static/templates/blocks.html b/static/templates/blocks.html index af450f85..1ff2c576 100644 --- a/static/templates/blocks.html +++ b/static/templates/blocks.html @@ -1,8 +1,6 @@ {{define "specific"}}{{$blocks := .Blocks}}{{$data := .}}
-
-

Blocks

-
+

Blocks

{{if $blocks.Blocks}}{{template "paging" $data }}{{end}}
{{if $blocks.Blocks}} @@ -29,4 +27,4 @@ {{template "paging" $data }} -{{end}}{{end}} \ No newline at end of file +{{end}}{{end}} diff --git a/static/templates/paging.html b/static/templates/paging.html index 0bdb86de..11ccff6f 100644 --- a/static/templates/paging.html +++ b/static/templates/paging.html @@ -3,15 +3,14 @@ Previous {{if $data.PagingRange}}
-
- {{range $p := $data.PagingRange}} - {{if $p}}{{$p}} +
+ {{range $p := $data.PagingRange}} + {{if $p}}{{$p}} {{else}}...{{end}} - {{end}} -
+ {{end}} +
{{end}} Next -{{end}}{{end}} \ No newline at end of file +{{end}}{{end}} diff --git a/static/templates/txdetail.html b/static/templates/txdetail.html index c9c73815..d2c669d5 100644 --- a/static/templates/txdetail.html +++ b/static/templates/txdetail.html @@ -3,16 +3,11 @@
{{$tx.Txid}} - {{if $tx.Rbf}} - RBF{{end}} + {{if $tx.Rbf}} RBF{{end}}
- {{if $tx.Blocktime}}
{{if $tx.Confirmations}}mined{{else}}first - seen{{end}} {{unixTimeSpan $tx.Blocktime}}
{{end}} + {{if $tx.Blocktime}}
{{if $tx.Confirmations}}mined{{else}}first seen{{end}} {{unixTimeSpan $tx.Blocktime}}
{{end}} {{if $tx.ConfirmationETABlocks}}
- confirmation estimated in - {{relativeTime $tx.ConfirmationETASeconds}} ({{$tx.ConfirmationETABlocks}} - blocks) + confirmation estimated in {{relativeTime $tx.ConfirmationETASeconds}} ({{$tx.ConfirmationETABlocks}} blocks)
{{end}}
@@ -45,16 +40,13 @@
{{range $a := $vout.Addresses}} - {{if and (ne $a $addr) $vout.IsAddress}}{{$a}}{{else}}{{$a}}{{end}} + {{if and (ne $a $addr) $vout.IsAddress}}{{$a}}{{else}}{{$a}}{{end}} {{else}} Unparsed address {{end}} - {{amountSpan $vout.ValueSat $data "copyable"}}{{if $vout.Spent}}→{{else}}× + {{amountSpan $vout.ValueSat $data "copyable"}}{{if $vout.Spent}}→{{else}}× {{end}} @@ -68,34 +60,33 @@
{{if $tx.FeesSat}}{{$fpb := feePerByte $tx}} - Fee {{amountSpan $tx.FeesSat $data "txvalue copyable ms-3"}}{{if $fpb}} ({{$fpb}}){{end}} + Fee {{amountSpan $tx.FeesSat $data "txvalue copyable ms-3"}}{{if $fpb}} ({{$fpb}}){{end}} {{end}}
- {{if $tx.Confirmations}} - {{formatUint32 $tx.Confirmations}} confirmations - {{else}} - Unconfirmed Transaction! - {{end}} + {{if $tx.Confirmations}} + {{formatUint32 $tx.Confirmations}} confirmations + {{else}} + Unconfirmed Transaction! + {{end}} {{amountSpan $tx.ValueOutSat $data "txvalue copyable"}}
-
- floData: - -
+ })() +
-{{end}} \ No newline at end of file +{{end}}