Skip to content

Commit

Permalink
Updated some small file changes
Browse files Browse the repository at this point in the history
  • Loading branch information
anoxxxy authored Sep 13, 2017
1 parent 0db1d2c commit 5d883e2
Show file tree
Hide file tree
Showing 10 changed files with 92 additions and 55 deletions.
8 changes: 4 additions & 4 deletions views/address.jade
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ block content
if settings.labels[address.a_id].url
a(href='#{settings.labels[address.a_id].url}', target='_blank')
span.fa.fa-question-circle(style='margin-left:5px;')
table.table.table-bordered.table-striped.summary-table
table.table.table-bordered.table-striped.summary-table
thead
tr
if settings.show_sent_received == true
Expand All @@ -34,11 +34,11 @@ block content
tbody
tr
if settings.show_sent_received == true
td #{sent.toFixed(8)}
td.total_sent.format_numbers #{sent.toFixed(8)}
if address.a_id !== 'coinbase'
if settings.show_sent_received == true
td #{received.toFixed(8)}
td #{balance.toFixed(8)}
td.total_received.format_numbers #{received.toFixed(8)}
td.balance.format_numbers #{balance.toFixed(8)}
.panel.panel-default.hidden-xs
.panel-heading
strong #{settings.locale.ex_latest_transactions}
Expand Down
4 changes: 2 additions & 2 deletions views/block.jade
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ block content
td #{txn.vout.length}
if txn.vout.length > 0
- var total = txn.total / 100000000
td #{total.toFixed(8)}
td.format_numbers #{total.toFixed(8)}
else
td #{txn.total.toFixed(8)}
td.format_numbers #{txn.total.toFixed(8)}
td.view_tx
a(href='/tx/#{txn.txid}')
span.glyphicon.glyphicon-eye-open
Expand Down
9 changes: 6 additions & 3 deletions views/includes/address_history.jade
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
thead
tr
th.hidden-xs #{settings.locale.timestamp}
th.hidden-xs #{settings.locale.tx_block}
th.hidden-xs #{settings.locale.tx_hash}
th #{settings.locale.mkt_amount} (#{settings.symbol})
tbody
each tx in txs
- var time = format_unixtime(tx.timestamp)
tr
td.hidden-xs #{time}
td.hidden-xs
a(href='/block/#{tx.blockhash}') #{tx.blockindex}
td.hidden-xs
a(href='/tx/#{tx.txid}') #{tx.txid}
- var done = false
Expand All @@ -20,7 +23,7 @@ tbody
if s.addresses == address.a_id
- vin = s.amount
if out > 0 && vin > 0
td.info
td.info.format_numbers
- var amount = (out - vin) / 100000000
if amount < 0
- amount = amount * -1
Expand All @@ -30,10 +33,10 @@ tbody
else
| #{amount.toFixed(8)}
else if out > 0
td.success
td.success.format_numbers
- var amount = out / 100000000
| + #{amount.toFixed(8)}
else
td.danger
td.danger.format_numbers
- var amount = vin / 100000000
| - #{amount.toFixed(8)}
2 changes: 1 addition & 1 deletion views/includes/rl_balance.jade
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
td
a(href='/address/#{item.a_id}') #{item.a_id}
include ./rl_labels.jade
td.hidden-xs
td.hidden-xs.format_numbers
=itemFixed.toFixed(8)
td.hidden-xs(style='text-align:center;')
=percentage.toFixed(2)
2 changes: 1 addition & 1 deletion views/includes/rl_received.jade
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
td
a(href='/address/#{item.a_id}') #{item.a_id}
include ./rl_labels.jade
td.hidden-xs
td.hidden-xs.format_numbers
=itemFixed.toFixed(8)
15 changes: 15 additions & 0 deletions views/info.jade
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,20 @@ block content
* **qrcode (/qr/hash)**
[#{address}/qr/#{hashes.address}](/qr/#{hashes.address})

------

### ElectrumX API calls
*Return data from ElectrumX server, use method and params*
*Method and Params parameters can be found at <br /><a href="https://github.com/kyuupichan/electrumx/blob/master/docs/PROTOCOL.rst">https://github.com/kyuupichan/electrumx/blob/master/docs/PROTOCOL.rst</a>*

* **method=blockchain.address.get_balance&amp;params=address**
*Returns current balance of given address*
<a href="http://195.181.242.206:9998/api?method=blockchain.address.get_balance&params=bHXLTu1HmR4uctK3kSEZWzc8REdk6shCnv">http://195.181.242.206:9998/?api&method=blockchain.address.get\_balance&params=bHXLTu1HmR4uctK3kSEZWzc8REdk6shCnv</a>

* **method=blockchain.address.listunspent&amp;params=address**
*Returns unspent outputs of given address*
<a href="http://195.181.242.206:9998/api?method=blockchain.address.listunspent&params=bHXLTu1HmR4uctK3kSEZWzc8REdk6shCnv">http://195.181.242.206:9998/?api&method=blockchain.address.listunspent&params=bHXLTu1HmR4uctK3kSEZWzc8REdk6shCnv</a>


.footer-padding

85 changes: 52 additions & 33 deletions views/layout.jade
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
doctype html
html
head
title= settings.title
link(rel='stylesheet', href='/themes/#{settings.theme}/bootstrap.min.css')
title= settings.title
link(rel='stylesheet', href='/themes/#{settings.theme}/bootstrap.min.css' id='theme_settings')
link(rel='stylesheet', href='/themes/custom.css')
link(rel='stylesheet', href='/vendor/jqplot/jquery.jqplot.css')
link(rel='stylesheet', href='//cdn.datatables.net/plug-ins/725b2a2115b/integration/bootstrap/3/dataTables.bootstrap.css')
link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css')
Expand All @@ -21,6 +22,7 @@ html
script(src='//cdn.datatables.net/responsive/1.0.1/js/dataTables.responsive.js')
script(src='//cdn.datatables.net/plug-ins/725b2a2115b/integration/bootstrap/3/dataTables.bootstrap.js')
script(src='/javascripts/chart.js')
script(src='/javascripts/custom.js')
script.
$(document).ready(function(){
$('##{active}').addClass('active');
Expand Down Expand Up @@ -125,36 +127,51 @@ html
a.navbar-link(href='/info')
span.glyphicon.glyphicon-info-sign
span.menu-text #{settings.locale.menu_api}
if settings.display.website == true
li#website
a.navbar-link(href="{settings.website}", target='_blank')
span.glyphicon.glyphicons-group-chat
span.menu-text #{settings.locale.menu_website}
li.dropdown
a#themes.dropdown-toggle(data-toggle='dropdown', href='#', aria-expanded='false')
| Themes
span.caret
ul.dropdown-menu(aria-labelledby='themes')
li
a(href='?theme=Default/') Default
li.divider
li
a(href='?theme=Cerulean/') Cerulean
li
a(href='?theme=Cosmo/') Cosmo
li
a(href='?theme=Cyborg/') Cyborg
li
a(href='?theme=Darkly/') Darkly
li
a(href='?theme=Flatly/') Flatly
li
a(href='?theme=Journal/') Journal
li
a(href='?theme=Lumen/') Lumen
li
a(href='?theme=Paper/') Paper
li
a(href='?theme=Readable/') Readable
li
a(href='?theme=Sandstone/') Sandstone
li
a(href='?theme=Simplex/') Simplex
li
a(href='?theme=Slate/') Slate
li
a(href='?theme=Solar/') Solar
li
a(href='?theme=Spacelab/') Spacelab
li
a(href='?theme=Superhero/') Superhero
li
a(href='?theme=United/') United
li
a(href='?theme=Yeti/') Yeti
.col-md-12
.row.text-center
.col-md-2.col-md-offset-1
.panel.panel-default.hidden-sm.hidden-xs
.panel-heading
if settings.nethash_units == 'K'
strong #{settings.locale.network} (KH/s)
else if settings.nethash_units == 'M'
strong #{settings.locale.network} (MH/s)
else if settings.nethash_units == 'G'
strong #{settings.locale.network} (GH/s)
else if settings.nethash_units == 'T'
strong #{settings.locale.network} (TH/s)
else if settings.nethash_units == 'P'
strong #{settings.locale.network} (PH/s)
else if settings.nethash_units == 'H'
strong #{settings.locale.network} (H/s)
.panel-body
if settings.index.difficulty == 'Hybrid'
label#hashrate -
<br>
label#lblX1
else
label#hashrate -
.col-md-2
.panel.panel-default.hidden-sm.hidden-xs
.panel-heading
strong #{settings.locale.difficulty}
Expand All @@ -173,11 +190,11 @@ html
strong #{settings.locale.ex_supply} (#{settings.symbol})
.panel-body
if settings.index.difficulty == 'Hybrid'
label#supply -
label#supply.format_numbers -
<br>
label#lblX1
else
label#supply -
label#supply.format_numbers -
.col-md-2
.panel.panel-default.hidden-sm.hidden-xs
.panel-heading
Expand Down Expand Up @@ -215,9 +232,11 @@ html
span.glyphicon.fa.fa-google-plus
.col-md-4
ul.nav
li.text-center(style='margin-left:80px;margin-right:80px;')
li.text-center(style='')
p(style='margin-top:15px;')
a.navbar-link(href='https://github.com/iquidus/explorer', target='_blank') Powered by Iquidus Explorer
a.navbar-link(href='https://github.com/anoxxxy/bitbay-blockexplorer', target='_blank') Bitbay Blockexplorer
span &nbsp;&nbsp;
a.navbar-link(href='http://bitbay.market', target='_blank') Bitbay Website
span.connections
label#lblBlockcount.label.label-default -
label#lblConnections.label.label-default -
Expand Down
6 changes: 3 additions & 3 deletions views/movement.jade
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ block content
json.data[i]['txid'] = "<a href='/tx/" + json.data[i]['txid'] + "' target='_blank'>" + json.data[i]['txid'] + "</a>"
var amount = json.data[i]['total'] / 100000000;
if (amount > '#{flagb}') {
json .data[i]['total'] = "<label class='label label-danger'>" + amount + "</label>";
json .data[i]['total'] = "<label class='label label-danger format_numbers'>" + amount + "</label>";
} else if (amount > '#{flaga}') {
json .data[i]['total'] = "<label class='label label-warning'>" + amount + "</label>";
json .data[i]['total'] = "<label class='label label-warning format_numbers'>" + amount + "</label>";
} else {
json .data[i]['total'] = "<label class='label label-success'>" + amount + "</label>";
json .data[i]['total'] = "<label class='label label-success format_numbers'>" + amount + "</label>";
}
}
return json.data;
Expand Down
8 changes: 4 additions & 4 deletions views/richlist.jade
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,25 @@ block content
th
div.pull-left(style='background-color:#d9534f;width:20px;height:20px;margin-right:6px;')
span #{settings.locale.rl_top25}
td #{parseFloat(dista.total).toFixed(8)}
td.format_numbers #{parseFloat(dista.total).toFixed(8)}
td.text-center #{parseFloat(dista.percent).toFixed(2)}
tr
th
div.pull-left(style='background-color:#5cb85c;width:20px;height:20px;margin-right:6px;')
span #{settings.locale.rl_top50}
td #{parseFloat(distb.total).toFixed(8)}
td.format_numbers #{parseFloat(distb.total).toFixed(8)}
td.text-center #{parseFloat(distb.percent).toFixed(2)}
tr
th
div.pull-left(style='background-color:#428bca;width:20px;height:20px;margin-right:6px;')
span #{settings.locale.rl_top75}
td #{parseFloat(distc.total).toFixed(8)}
td.format_numbers #{parseFloat(distc.total).toFixed(8)}
td.text-center #{parseFloat(distc.percent).toFixed(2)}
tr
th
div.pull-left(style='background-color:#222;width:20px;height:20px;margin-right:6px;')
span #{settings.locale.rl_top100}
td #{parseFloat(distd.total).toFixed(8)}
td.format_numbers #{parseFloat(distd.total).toFixed(8)}
td.text-center #{parseFloat(distd.percent).toFixed(2)}
tr
th
Expand Down
8 changes: 4 additions & 4 deletions views/tx.jade
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ block content
.col-md-6
.panel.panel-default
.panel-heading
strong #{settings.locale.tx_contributors}
strong #{settings.locale.tx_inputs}
span.glyphicon.glyphicon-arrow-right.pull-right.hidden-xs
table.table.table-bordered.table-striped.summary-table
thead
Expand Down Expand Up @@ -85,7 +85,7 @@ block content
.col-md-6
.panel.panel-default
.panel-heading
strong #{settings.locale.tx_recipients}
strong #{settings.locale.tx_outputs}
table.table.table-bordered.table-striped.summary-table
thead
tr
Expand All @@ -99,15 +99,15 @@ block content
td
a.loading(href='/address/#{r.addresses}')
=r.addresses
td.success.hidden-xs #{ramount.toFixed(8)}
td.success.hidden-xs.format_numbers #{ramount.toFixed(8)}
tr.hidden-lg.hidden-md
td.success #{ramount.toFixed(8)} #{settings.symbol}
else
tr
td
a.loading(href='/address/#{r.addresses}')
=r.addresses
td.success.hidden-xs #{ramount.toFixed(8)}
td.success.hidden-xs.format_numbers #{ramount.toFixed(8)}
tr.hidden-lg.hidden-md
td.success #{ramount.toFixed(8)} #{settings.symbol}
.footer-padding

0 comments on commit 5d883e2

Please sign in to comment.