Skip to content

Commit 25bea7d

Browse files
caozhongzhengcaozhongzheng
authored
Merge pull request #4 from peersafe/ui-page-edit
ui page edit
2 parents 446754c + ffc1e40 commit 25bea7d

File tree

10 files changed

+78
-87
lines changed

10 files changed

+78
-87
lines changed

‎po/zh.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ msgstr "没找到匹配的记录"
277277

278278
#: public/views/address.html
279279
msgid "No. Transactions"
280-
msgstr "交易笔数"
280+
msgstr "交易号码"
281281

282282
#: public/views/block.html
283283
msgid "Number Of Transactions"

‎public/css/main.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/main.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/login.html

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<!doctype html>
2+
<html lang="en" data-ng-app="insight" data-ng-csp>
3+
<head>
4+
<base href="/" />
5+
<meta charset="UTF-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7+
<meta name="viewport" content="width=device-width,initial-scale=1.0">
8+
<meta name="fragment" content="!">
9+
<title data-ng-bind="$root.title + $root.titleDetail + ' | Insight'">Insight</title>
10+
<meta name="keywords" content="bitcoins, transactions, blocks, address, block chain, best block, mining difficulty, hash serialized">
11+
<meta name="description" content="Bitcoin Insight. View detailed information on all bitcoin transactions and blocks.">
12+
<link rel="shortcut icon" href="img/icons/favicon.ico" type="image/x-icon">
13+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,400italic">
14+
<link rel="stylesheet" href="css/main.min.css">
15+
</head>
16+
<body>
17+
<div class="login-nav">
18+
<!-- <img src="images/login-logo.png" height="62" width="309" alt=""> -->
19+
<b>比特币数据处理平台</b>
20+
</div>
21+
<div class="login-content">
22+
<div class="lon-con">
23+
<img src="images/login-bg.png" alt="" width="600">
24+
<form action="" class="form1">
25+
<div class="login-col">
26+
27+
<input type="text" class="lin" placeholder="账号">
28+
29+
</div>
30+
<div class="login-col">
31+
32+
<input type="password" class="lin" placeholder="密码">
33+
</div>
34+
35+
<div class="lo-btn">
36+
<a href="index-template" class="ddlu">登 录
37+
</a>
38+
39+
</div>
40+
</form>
41+
</div>
42+
</div>
43+
<div class="lo-foo">
44+
<p>Copyright © 2017 京ICP备15015411号-1</p>
45+
</div>
46+
<script src="/socket.io/socket.io.js"></script>
47+
<script src="js/vendors.min.js"></script>
48+
<script src="js/angularjs-all.min.js"></script>
49+
<script src="js/main.min.js"></script>
50+
</body>
51+
</html>

‎public/src/css/common.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,22 @@
66
html,
77
body {
88
color: #373D42;
9-
font-family: 'Ubuntu', sans-serif;
9+
font-family: '微软雅黑', sans-serif;
1010
height: 100%;
1111
/* The html and body elements cannot have any padding or margin. */
1212
}
1313

1414
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
1515
color: #373D42;
16-
font-family: 'Ubuntu', sans-serif;
16+
font-family: '微软雅黑', sans-serif;
1717
}
1818

1919
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
2020
.ng-cloak, .x-ng-cloak,
2121
.ng-hide {
2222
display: none !important;
2323
}
24+
table tr{height: 50px;}
2425

2526
/* Styling for the ngProgress itself */
2627
#ngProgress {
@@ -115,7 +116,7 @@ margin-left: 0;
115116
.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {background-color: #373D42;}
116117

117118
.navbar-default {
118-
background-color: #8DC429;
119+
background-color: #30bfa1;
119120
margin: 0;
120121
border: 0;
121122
}
@@ -846,7 +847,7 @@ a.v_highlight_more {
846847
width: 280px;
847848
}
848849
.navbar-form .form-control {
849-
width: 350px;
850+
width: 300px;
850851
}
851852
}
852853

‎public/src/css/style.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ table a{color: #30bfa1;}
168168
.lon-con{width: 1200px; height: 680px;margin: 0 auto;}
169169
.lon-con img{margin-top: 40px;}
170170
.lon-con .form1{width: 340px; height: 300px; background: #fff;float: right; margin-top: 130px;padding: 30px; border-radius: 3px;}
171-
.lon-con .lin{width: 300px; height: 33px; border: 1px solid #dfdfdf;padding-left: 10px;}
171+
.lon-con .lin{width: 260px; height: 33px; border: 1px solid #dfdfdf;padding-left: 10px;}
172172
.login-col{position: relative; margin-top: 40px;margin-left: 15px;}
173173
.login-col p{margin-bottom: 5px;}
174174
.lon-con .div1{width: 80px; height: 35px;line-height: 15px; background: #3080ec; position: absolute; top: 25px; right: 13px;}
175175
.laa{margin-left: 15px; color: #3080ec;line-height: 40px;}
176-
.lo-btn{width: 200px; margin: 50px 0 0 75px;}
176+
.lo-btn{width: 200px; margin: 50px 0 0 50px;}
177177
.lo-btn .ddlu{width:200px; height: 35px; background: #30bfa1; border-radius: 5px; color: #fff;display: inline-block;text-align: center;line-height: 33px;}
178178
.lo-btn .ddlu:hover{background: #38d6b5;}
179179
.lo-btn span{margin-top: 12px; margin-left: 15px;float: right;}

‎public/src/js/config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@ angular.module('insight').config(function($routeProvider) {
2424
title: 'Bitcoin Transaction '
2525
}).
2626
when('/', {
27-
templateUrl: 'views/index.html',
27+
templateUrl: 'views/home.html',
2828
title: 'Home'
2929
}).
3030
when('/blocks', {
3131
templateUrl: 'views/block_list.html',
3232
title: 'Bitcoin Blocks solved Today'
33+
}).
34+
when('/blocks-index', {
35+
templateUrl: 'views/index.html',
36+
title: 'Bitcoin Blocks solved Today'
3337
}).
3438
when('/blocks-date/:blockDate/:startTimestamp?', {
3539
templateUrl: 'views/block_list.html',

‎public/src/js/controllers/header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ angular.module('insight.system').controller('HeaderController',
1515
'link': 'home'
1616
},{
1717
'title': 'Blocks',
18-
'link': 'blocks'
18+
'link': 'blocks-index'
1919
}, {
2020
'title': 'Status',
2121
'link': 'status'

‎public/src/js/controllers/transactions.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ function($scope, $rootScope, $routeParams, $location, Global, Transaction, Trans
66
$scope.loading = false;
77
$scope.loadedBy = null;
88

9+
910
var pageNum = 0;
1011
var pagesTotal = 1;
1112
var COIN = 100000000;
@@ -101,10 +102,12 @@ function($scope, $rootScope, $routeParams, $location, Global, Transaction, Trans
101102
};
102103

103104
var _byAddress = function () {
105+
$routeParams.addrStr="2NCRHyeRjyo1bUiZXLLymapcPxLDrrXY5Gn";
104106
TransactionsByAddress.get({
105107
address: $routeParams.addrStr,
106108
pageNum: pageNum
107109
}, function(data) {
110+
console.log("-----------------------------"+data);
108111
_paginate(data);
109112
});
110113
};

‎public/views/home.html

Lines changed: 8 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -10,84 +10,16 @@
1010
<div class="tab1">
1111
<table>
1212
<tr class="bbt">
13-
<td class="td1"><a href="Wallet-address-details.html">1KP9YtDfko2WpPy95T6uNQxVEzJYzMenek</a></td>
13+
<td class="td1"><a href="address/2NCRHyeRjyo1bUiZXLLymapcPxLDrrXY5Gn">2NCRHyeRjyo1bUiZXLLymapcPxLDrrXY5Gn</a></td>
1414
<td>这是孙张三的账户地址</td>
1515
<td class="td2">0.017463 BTC</td>
1616
</tr>
1717
</table>
1818
</div>
19-
<div class="wallet">
20-
21-
<div class="jiay">
22-
<div class="jy1">
23-
<span class="span1"><a href="transaction-not-confirm.html">f6922345b73e5fe4d187930b03643f1a8fd4d75d0903e80f268fefa4412de9a7</a></span>
24-
<span class="span2">2017-06-12 12:30:31</span>
25-
</div>
26-
<div class="jy2">
27-
<div class="JYBA">
28-
<div class="jyb toya"><a href="Wallet-address-details.html">1KP9YtDfko2WpPy95T6uNQxVEzJYzMenek</a><span>0.04 BTC</span></div>
29-
30-
</div>
31-
<div class="mid">
32-
<span class="arr-r"><img src="images/arr-r.png" width="32" alt=""></span>
33-
</div>
34-
<div class="JYB">
35-
<div class="jyb jyba"><a href="Wallet-address-details.html">1KsFhYKLs8qb1GHqrPxHoywNQpet2CtP9t</a><span>0.04 BTC</span></div>
36-
<div class="jyb jybb"><a href="Wallet-address-details.html">1KsFhYKLs8qb1GHqrPxHoywNQpet2CtP9e</a><span>0.04 BTC</span></div>
37-
</div>
38-
</div>
39-
<div class="jy3">
40-
<span class="span1">手续费：0.00155208 BTC</span>
41-
<span class="span2 weiqr">未确认</span>
42-
<span class="span3 wtq1">- 0.03844792 BTC</span>
43-
</div>
44-
</div>
45-
<div class="jiay">
46-
<div class="jy1">
47-
<span class="span1"><a href="transaction-confirm.html">f6922345b73e5fe4d187930b03643f1a8fd4d75d0903e80f268fefa4412de9a7</a></span>
48-
<span class="span2">2017-06-12 12:30:31</span>
49-
</div>
50-
<div class="jy2">
51-
<div class="JYBA">
52-
<div class="jyb"><a href="Wallet-address-details.html">1KsFhYKLs8qb1GHqrPxHoywNQpet2CtP9e </a><span>0.04 BTC</span></div>
53-
54-
</div>
55-
<div class="mid">
56-
<span class="arr-r"><img src="images/arr-r.png" width="32" alt=""></span>
57-
</div>
58-
<div class="JYB">
59-
<div class="jyb jyba"><a href="Wallet-address-details.html">1KsFhYKLs8qb1GHqrPxHoywNQpet2CtP9t</a><span>0.04 BTC</span></div>
60-
<div class="jyb jybb"><a href="Wallet-address-details.html">1KsFhYKLs8qb1GHqrPxHoywNQpet2CtP9e</a><span>0.04 BTC</span></div>
61-
</div>
62-
</div>
63-
<div class="jy3">
64-
<span class="span1">手续费：0.00155208 BTC</span>
65-
<span class="span2">21个确认数</span>
66-
<span class="span3">0.03844792 BTC</span>
67-
</div>
68-
</div>
69-
<div class="jiay">
70-
<div class="jy1">
71-
<span class="span1"><a href="transaction-confirm.html">f6922345b73e5fe4d187930b03643f1a8fd4d75d0903e80f268fefa4412de9a7</a></span>
72-
<span class="span2">2017-06-12 12:30:31</span>
73-
</div>
74-
<div class="jy2">
75-
<div class="JYBA">
76-
<div class="jyb"><a href="Wallet-address-details.html">1KsFhYKLs8qb1GHqrPxHoywNQpet2CtP9e </a><span>0.04 BTC</span></div>
77-
78-
</div>
79-
<div class="mid">
80-
<span class="arr-r"><img src="images/arr-r.png" width="32" alt=""></span>
81-
</div>
82-
<div class="JYB">
83-
<div class="jyb jyba"><a href="Wallet-address-details.html">1KsFhYKLs8qb1GHqrPxHoywNQpet2CtP9t</a><span>0.04 BTC</span></div>
84-
<div class="jyb jybb"><a href="Wallet-address-details.html">1KsFhYKLs8qb1GHqrPxHoywNQpet2CtP9e</a><span>0.04 BTC</span></div>
85-
</div>
86-
</div>
87-
<div class="jy3">
88-
<span class="span1">手续费：0.00155208 BTC</span>
89-
<span class="span2">21个确认数</span>
90-
<span class="span3">0.03844792 BTC</span>
91-
</div>
92-
</div>
93-
</div>
19+
<div data-ng-include src="'views/includes/connection.html'"></div>
20+
21+
<div data-ng-if="true" data-ng-controller="transactionsController" data-ng-init="load('address')">
22+
<div data-ng-include src="'views/transaction/list.html'" when-scrolled="loadMore()"></div>
23+
</div>
24+
25+

0 commit comments

Comments
 (0)