diff --git a/app/models/Transaction.js b/app/models/Transaction.js
index b2678e0..7b2c4f9 100644
--- a/app/models/Transaction.js
+++ b/app/models/Transaction.js
@@ -346,8 +346,13 @@ TransactionSchema.methods.fillInfo = function(next) {
if (err) return next(err);
that.info = info;
- that.info.time = that.time;
- return next();
+ if (! that.info) {
+ return next();
+ }
+ else {
+ that.info.time = that.time;
+ return next();
+ }
});
};
diff --git a/public/css/common.css b/public/css/common.css
index fb01695..685758a 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 -60px;
+ margin: 0 auto -44px;
/* Pad bottom by footer height */
padding: 0 0 60px;
}
@@ -87,22 +87,22 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
font-weight: 100;
}
-#search::-webkit-input-placeholder {
+#search::-webkit-input-placeholder {
font-family: Ubuntu, sans-serif;
font-weight: 100;
font-style: italic;
- font-size: 13px;
+ font-size: 15px;
color: #BCDF7E;
- line-height: 18px;
+ line-height: 20px;
}
-#search::-moz-placeholder {
+#search::-moz-placeholder {
font-family: Ubuntu, sans-serif;
font-weight: 100;
- font-size: 13px;
+ font-size: 15px;
color: #BCDF7E;
- line-height: 18px;
+ line-height: 20px;
}
.status {
@@ -122,8 +122,6 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
background-color: #F4F4F4;
padding: 15px;
margin-top: 21px;
- width: 265px;
- height: 87%;
border-radius: 5px;
}
@@ -223,8 +221,10 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
/* Set the fixed height of the footer here */
#footer {
- height: 60px;
- background-color: #f5f5f5;
+ height: 44px;
+ background-color: #8DC429;
+ border-top: 4px solid #64920F;
+ color: #fff;
}
.line-bot {
@@ -246,9 +246,14 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
#wrap > .container {
padding: 60px 15px 0;
}
-/*.container .text-muted {
- margin: 20px 0;
-}*/
+
+.container .text-muted {
+ margin: 10px 0;
+}
+
+.container .text-muted a {
+ color: #eee;
+}
#footer > .container {
padding-left: 15px;
@@ -265,7 +270,13 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
#search { width: 400px; }
-
+.no_matching {
+ background-color: #FFFFFF;
+ border: 2px solid #64920F;
+ padding: 10px 20px;
+ position: absolute;
+ top: 46px;
+}
/*Animations*/
.fader.ng-enter {
diff --git a/public/views/blocks/list.html b/public/views/blocks/list.html
index e7e0f60..494255f 100644
--- a/public/views/blocks/list.html
+++ b/public/views/blocks/list.html
@@ -1,27 +1,32 @@
-
-
- Hash
- Solved at
-
-
-
- {{block.hash}}
- {{block.time * 1000 | date:'medium'}}
-
-
-
- No blocks yet.
+
+
+
+
+
+
+ Hash
+ Solved at
+
+
+
+
+ {{block.hash}}
+ {{block.time * 1000 | date:'medium'}}
+
+
+
+
+
+ No blocks yet.
diff --git a/public/views/footer.html b/public/views/footer.html
index 4e08b20..7401eae 100644
--- a/public/views/footer.html
+++ b/public/views/footer.html
@@ -1,10 +1,6 @@
-
+
-
- Blocks: {{info.blocks}} |
- Connections: {{info.connections}} |
- Difficulty: {{info.difficulty}}
-
+
Insight
diff --git a/public/views/header.html b/public/views/header.html
index e831eb5..6d12e44 100755
--- a/public/views/header.html
+++ b/public/views/header.html
@@ -20,7 +20,7 @@
-
No matching records found!
+
No matching records found!
@@ -36,4 +36,4 @@
-
\ No newline at end of file
+
diff --git a/public/views/status.html b/public/views/status.html
index 7195119..da40879 100644
--- a/public/views/status.html
+++ b/public/views/status.html
@@ -5,8 +5,8 @@
-
-
getInfo
+
+
getInfo()
@@ -31,7 +31,7 @@
blocks
- {{info.blocks}}
+ {{info.blocks}}
timeoffset
@@ -71,9 +71,8 @@
-
-
-
sync status
+
+
Sync Status
@@ -95,14 +94,16 @@
start
- {{sync.start}}
- (genesisBlock)
+
+ {{sync.start}}
+ (genesisBlock)
end
- {{sync.end}}
- (genesisBlock)
+
+ {{sync.end}}
+ (genesisBlock)
@@ -116,14 +117,10 @@
-
-
-
-
-
getTxOutSetInfo
+
getTxOutSetInfo()
-
-
-
-
-
getDifficulty
+
getDifficulty()
-
-
-
getLastBlockHash
+
+
getLastBlockHash()
diff --git a/public/views/transaction/list.html b/public/views/transaction/list.html
index e0c036c..bd9b755 100644
--- a/public/views/transaction/list.html
+++ b/public/views/transaction/list.html
@@ -1,5 +1,9 @@
-Loading...
-There are not transactions
+
+There are not transactions