Skip to content

Commit 5d94a95

Browse files
committed
Port retry, Donate text, Update change time every min, Add ZeroMail
1 parent 9be49f6 commit 5d94a95

File tree

7 files changed

+217
-46
lines changed

7 files changed

+217
-46
lines changed

content.json

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"domain": "ZeroNetwork.bit",
55
"files": {
66
"css/all.css": {
7-
"sha512": "3ce05c1b154841b3c05f8793a140870eba2dfd7bc3e80fedfeec1eee279ee614",
8-
"size": 82381
7+
"sha512": "b0fe7efde6087038971270772fa3191885383541cebb79b740d7e11727e57db4",
8+
"size": 82892
99
},
1010
"favicon.ico": {
1111
"sha512": "4b16ceb40191f83af1286438e4b069ab613736a199d5c5cc32a44cd60051ca13",
@@ -28,12 +28,12 @@
2828
"size": 723
2929
},
3030
"index.html": {
31-
"sha512": "95e530bcd77f1907bb44e4eb092a3c9e862df2667a9448669ab7a09615a5e68c",
32-
"size": 2427
31+
"sha512": "f88247fc91152bf6affeb4be26d250a6a793784bb80d894bf55008ecaa019df2",
32+
"size": 2700
3333
},
3434
"js/all.js": {
35-
"sha512": "e0d361fd45962a66f9627ab7e2348459a5c549d4b831019d69d6d4d841b80578",
36-
"size": 127842
35+
"sha512": "9eb0331718696fa28a4a0e3deabca0d85496a54ca0826f3c91a0d37daa28e098",
36+
"size": 128969
3737
},
3838
"test/jquery.min.js": {
3939
"sha512": "eda31b5c7d371d4b3acced51fa92f27a417515317cf437aae09a47c3acc8a36b",
@@ -50,20 +50,16 @@
5050
"test/stats.js": {
5151
"sha512": "a304ab798b9bbd1581f8aac90ea0b3b12a6ae2e9c7dd64846cd40ce0bbd099b3",
5252
"size": 3560
53-
},
54-
"test/worker.js": {
55-
"sha512": "d6d4a1ca6da7dba9407d49696006203c1490c6950be7dae33186b232a2354737",
56-
"size": 170
5753
}
5854
},
5955
"ignore": "(js|css)/(?!all.(js|css))",
60-
"modified": 1446157245.305,
56+
"modified": 1449780690.029,
6157
"sign": [
62-
58598948272987971672880641261474506496946239807757113975467309956147036565622,
63-
37550783650406805114966245531828209064490731924026470826633990362051429177611
58+
42358599513687854655700957130861396358086955517123500015244897460190619166669,
59+
27200718880115340847505557693050839493998194776739787970383068787553748692290
6460
],
6561
"signers_sign": null,
6662
"signs_required": 1,
6763
"title": "ZeroHello",
68-
"zeronet_version": "0.3.2"
64+
"zeronet_version": "0.3.4"
6965
}

css/ZeroHello.css

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
4646
.version.latest { display: inline-block }
4747
.version.latest.new { background-color: #FFF85F; margin-right: -3px; display: none }
4848

49+
.port { padding: 5px }
50+
.port a { transition: all 1s; background-position: -20px center }
51+
.port.closed a { color: #C58276 }
52+
.port.opened a { color: #24A26E }
53+
.port.loading a { color: rgba(0,0,0,0); background: transparent url(../img/loading.gif) no-repeat center center }
54+
55+
.donate { padding: 5px; }
56+
.donate a { color: #A99D9B }
57+
.donate .heart { color: #DA3D32; font-family: Tahoma, Arial }
58+
4959
.plugin-multiuser { display: none }
5060
.plugin-uipassword { display: none }
5161
.identicon { width: 24px; height: 24px; display: inline-block; vertical-align: middle; margin-bottom: 2px; margin-right: 10px; margin-left: 5px; border: 1px solid #F0F0F0 }
@@ -99,7 +109,7 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
99109

100110
.site-container .hamburger {
101111
margin-left: -60px; position: relative; top: 30px; z-index: 1; transition: all 0.3s; padding: 14px 25px 0px 10px;
102-
text-decoration: none; color: white; font-size: 29px; line-height: 18px; opacity: 0; margin-right: 5px;
112+
text-decoration: none; color: white; font-size: 29px; line-height: 18px; opacity: 0; margin-right: 8px;
103113
}
104114
.site-container .hamburger:hover { opacity: 1 !important }
105115
.site-container .hamburger.menu-active { opacity: 1 !important }
@@ -115,7 +125,7 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
115125
.site-small .title.long { font-size: 30px }
116126
.site-small .action { bottom: 15px; right: 15px }
117127
.site-small .bottom { bottom: 4px }
118-
.site-small .hamburger { margin-left: -53px; top: 25px; padding: 14px 23px 0px 10px }
128+
.site-small .hamburger { margin-left: -53px; top: 25px; padding: 14px 23px 0px 10px; margin-right: 5px; }
119129

120130

121131
/* Site events */

css/all.css

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515

1616
<div class="plugin-multiuser">Current user: <a class='identicon' href='#Show+Private+key' title='Show private key'></a><a href="#Logout" class="button button-logout">Logout</a></div>
1717
<div class="plugin-uipassword"><a href="#Logout" class="button button-logout">Logout</a></div>
18+
<div class="donate"><span class='heart'></span> <a href="http://zeronet.readthedocs.org/en/latest/help_zeronet/donate/" target="_blank">Help to keep this project alive</a></div>
19+
<div class="port closed" style="display: none">Port: <a href="#Re+check">Closed</a></div>
1820
<div class="version current">Version: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">Unknown</a></div>
19-
<div class="version latest new" title="New update available">Latest: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">0.3.2</a></div>
21+
<div class="version latest new" title="New update available">Latest: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">0.3.4</a></div>
2022
<br><a href="#Update" class="button button-update button-submit">Update to new version</a>
2123
<br><span class='broken-autoupdate'></span>
2224
</div>

js/ZeroHello.coffee

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class ZeroHello extends ZeroFrame
9797
$(".title", elem).html(site.content.title).removeClass("long")
9898
$(".description", elem).html(site.content.description)
9999
modified = if site.settings.modified then site.settings.modified else site.content.modified
100-
$(".modified-date", elem).html @formatSince(modified)
100+
new DateSince($(".modified-date", elem)[0], modified)
101101

102102
# Add href
103103
if @server_info.plugins? and ("Zeroname" in @server_info.plugins or "Dnschain" in @server_info.plugins or "Zeroname-local" in @server_info.plugins) and site.content?.domain # Domain
@@ -214,9 +214,10 @@ class ZeroHello extends ZeroFrame
214214

215215
# Append sample sites
216216
sample_sites = [
217-
{"content": {"title": "ZeroBoard", "description": "Messaging board demo", "domain": "Board.ZeroNetwork.bit"}, "address": "1Gfey7wVXXg1rxk751TBTxLJwhddDNfcdp", "settings": {"serving": false}}
218217
{"content": {"title": "ZeroBlog", "description": "Blogging platform Demo", "domain": "Blog.ZeroNetwork.bit"}, "address": "1BLogC9LN4oPDcruNz3qo1ysa133E9AGg8", "settings": {"serving": false}}
219218
{"content": {"title": "ZeroTalk", "description": "Decentralized forum demo", "domain": "Talk.ZeroNetwork.bit"}, "address": "1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT", "settings": {"serving": false}}
219+
{"content": {"title": "ZeroMail", "description": "End-to-end encrypted messaging", "domain": "Mail.ZeroNetwork.bit"}, "address": "1MaiL5gfBM1cyb4a8e3iiL8L5gXmoAJu27", "settings": {"serving": false}}
220+
{"content": {"title": "ZeroBoard", "description": "Messaging board demo", "domain": "Board.ZeroNetwork.bit"}, "address": "1Gfey7wVXXg1rxk751TBTxLJwhddDNfcdp", "settings": {"serving": false}}
220221
{"content": {"title": "ZeroID", "description": "Sample trusted authorization provider", "domain": "ZeroID.bit"}, "address": "1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz", "settings": {"serving": false}}
221222
{"content": {"title": "ZeroMarket", "description": "Simple market demo (coming soon)"}, "address": "ZeroMarket", "disabled": true, "settings": {"serving": false}}
222223
]
@@ -261,6 +262,22 @@ class ZeroHello extends ZeroFrame
261262

262263
$(".topright").css("opacity", 1)
263264

265+
# Port info
266+
if server_info.ip_external
267+
$(".port").removeClass("closed").addClass("opened")
268+
$(".port a").text("opened")
269+
else
270+
$(".port").removeClass("opened").addClass("closed").css("display", "block")
271+
$(".port a").text("closed")
272+
$(".port a").off("click").on "click", =>
273+
$(".port").addClass("loading")
274+
@cmd "serverPortcheck", [], (res) =>
275+
if @server_info.rev < 600
276+
@cmd "wrapperNotification", ["info", "Please restart your ZeroNet client to re-check opened port."]
277+
$(".port").removeClass("loading")
278+
@log "Port open result:", res
279+
@reloadServerInfo()
280+
264281
# Multiuser info
265282
if server_info.multiuser
266283
$(".plugin-multiuser").css("display", "block")

0 commit comments

Comments
 (0)