From f96d0e0033e9d172d48fef22b6b1db376a3ca6d2 Mon Sep 17 00:00:00 2001 From: Bechi Date: Tue, 21 Jan 2014 14:58:04 -0300 Subject: [PATCH 1/5] footer --- public/css/common.css | 15 ++++++++++++--- public/views/footer.html | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/public/css/common.css b/public/css/common.css index f51137d..ccbc427 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -223,12 +223,21 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { /* Set the fixed height of the footer here */ #footer { - height: 44px; - background-color: #8DC429; - border-top: 4px solid #64920F; + height: 51px; + background-color: #373D42; + border-top: 4px solid #656E76; color: #fff; } +#footer .insight { + font-size: 20px; + text-decoration: none; +} + +.line-footer { + border-top: 2px dashed #ccc; +} + .line-bot { padding: 0 0 10px 0; margin-bottom: 10px; diff --git a/public/views/footer.html b/public/views/footer.html index 24a739e..aac69ff 100644 --- a/public/views/footer.html +++ b/public/views/footer.html @@ -1,3 +1,3 @@
-

Insight

+ Insight
From 24694939ea31f87d5d86042ccf9e6656f56c7102 Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Tue, 21 Jan 2014 15:10:34 -0300 Subject: [PATCH 2/5] fix height of footer --- public/css/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/common.css b/public/css/common.css index ccbc427..300daeb 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -29,7 +29,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { min-height: 100%; height: auto; /* Negative indent footer by its height */ - margin: 0 auto -44px; + margin: 0 auto -51px; /* Pad bottom by footer height */ padding: 0 0 60px; } From ee275dde12b514349c0702cc629f49bfb83c7a7f Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 21 Jan 2014 15:49:25 -0300 Subject: [PATCH 3/5] show tx by reverse order in addr --- app/models/Address.js | 2 +- public/views/address.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/Address.js b/app/models/Address.js index e054ff1..12a4a28 100644 --- a/app/models/Address.js +++ b/app/models/Address.js @@ -60,7 +60,7 @@ function spec() { // TODO TXout! //T function (cb) { - TransactionItem.find({addr:that.addrStr}).sort({ts:1}).exec(function(err,txItems){ + TransactionItem.find({addr:that.addrStr}).sort({ts:-1}).exec(function(err,txItems){ if (err) return cb(err); txItems.forEach(function(txItem){ diff --git a/public/views/address.html b/public/views/address.html index 2736b03..3063a0f 100644 --- a/public/views/address.html +++ b/public/views/address.html @@ -36,7 +36,7 @@
-

Transactions Transactions contained within this block

+

Transactions Transactions for this address

From 30bdbf051e353c43af6694ffadb7cffcb34f48e2 Mon Sep 17 00:00:00 2001 From: Bechi Date: Tue, 21 Jan 2014 16:06:21 -0300 Subject: [PATCH 4/5] status page --- public/css/common.css | 4 + public/views/status.html | 226 ++++++++++++++++++++------------------- 2 files changed, 118 insertions(+), 112 deletions(-) diff --git a/public/css/common.css b/public/css/common.css index ccbc427..b2b5e2e 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -221,6 +221,10 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { border: 2px solid #6C0000; } +#status .table { + margin-bottom: 45px; +} + /* Set the fixed height of the footer here */ #footer { height: 51px; diff --git a/public/views/status.html b/public/views/status.html index da40879..94cfaf7 100644 --- a/public/views/status.html +++ b/public/views/status.html @@ -1,79 +1,11 @@
-
-

- Status -

-
-
-
-

getInfo()

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Loading... -
{{infoError}} -
Version{{info.version}}
protocolversion{{info.protocolversion}}
walletversion{{info.walletversion}}
balance{{info.balance}}
blocks{{info.blocks}}
timeoffset{{info.timeoffset}}
connections{{info.connections}}
proxy{{info.proxy}}
difficulty{{info.difficulty}}
testnet{{info.testnet}}
keypoololdest{{info.keypoololdest}}
keypoolsize{{info.keypoolsize}}
paytxfee{{info.paytxfee}}
infoErrors{{info.infoErrors}}
- -

Sync Status

- +
+
+

Status

+
+
+

Sync Status

+
{{ syncError }} @@ -119,9 +51,9 @@
- -

getTxOutSetInfo()

- + +

getTxOutSetInfo()

+
@@ -160,39 +92,109 @@
Loading...
-

getDifficulty()

- - - - - - - - - - - - - - -
Loading...
{{infoError}}
Difficulty{{difficulty}}
- -

getLastBlockHash()

- - - - - - - - - - - - - -
Loading...
{{infoError}}
Last block hash{{lastblockhash}}
-
-
+

getLastBlockHash()

+ + + + + + + + + + + + + +
Loading...
{{infoError}}
Last block hash{{lastblockhash}}
+ + +
+
+

getInfo()

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Loading... +
{{infoError}} +
Version{{info.version}}
protocolversion{{info.protocolversion}}
walletversion{{info.walletversion}}
balance{{info.balance}}
blocks{{info.blocks}}
timeoffset{{info.timeoffset}}
connections{{info.connections}}
proxy{{info.proxy}}
difficulty{{info.difficulty}}
testnet{{info.testnet}}
keypoololdest{{info.keypoololdest}}
keypoolsize{{info.keypoolsize}}
paytxfee{{info.paytxfee}}
infoErrors{{info.infoErrors}}
+ +

getDifficulty()

+ + + + + + + + + + + + + + +
Loading...
{{infoError}}
Difficulty{{difficulty}}
+
+
+
From b53fbc3fd2cfc908eaaaf444f2d9276cecf16f47 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Tue, 21 Jan 2014 16:12:58 -0300 Subject: [PATCH 5/5] Several UI improvements --- public/views/transaction/list.html | 6 +++--- public/views/transaction/tx.html | 21 ++++++++------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/public/views/transaction/list.html b/public/views/transaction/list.html index c1262f2..8b68db0 100644 --- a/public/views/transaction/list.html +++ b/public/views/transaction/list.html @@ -2,8 +2,8 @@
-
-
- Loading... +
+
+ Loading...
diff --git a/public/views/transaction/tx.html b/public/views/transaction/tx.html index 76be786..3c53d76 100644 --- a/public/views/transaction/tx.html +++ b/public/views/transaction/tx.html @@ -1,14 +1,9 @@
{{tx.txid}} - - - + - {{tx.time * 1000 | date:'medium'}} - -
@@ -25,8 +20,8 @@
  • - {{vin.addr}} - {{vin.addr}} + {{vin.addr}} + {{vin.addr}}

    {{vin.value}} BTC

    @@ -38,8 +33,8 @@
    - {{vin.addr}} - {{vin.addr}} + {{vin.addr}} + {{vin.addr}}
    scriptSig {{vin.scriptSig.asm}} @@ -59,7 +54,7 @@
    - {{vout.addr}} + {{vout.addr}} {{address}}
    @@ -72,7 +67,7 @@
    {{address}}
    - type {{vout.scriptPubKey.type}} + type {{vout.scriptPubKey.type}}
    scriptPubKey {{vout.scriptPubKey.asm}}
    @@ -81,7 +76,7 @@

    {{vout.value}} BTC

    - +