Port retry, Donate text, Update change time every min, Add ZeroMail

HelloZeroNet · Dec 15, 2015 · 5d94a95 · 5d94a95
1 parent 9be49f6
commit 5d94a95
Show file tree

Hide file tree

Showing 7 changed files with 217 additions and 46 deletions.
diff --git a/content.json b/content.json
@@ -4,8 +4,8 @@
  "domain": "ZeroNetwork.bit", 
  "files": {
   "css/all.css": {
-   "sha512": "3ce05c1b154841b3c05f8793a140870eba2dfd7bc3e80fedfeec1eee279ee614", 
-   "size": 82381
+   "sha512": "b0fe7efde6087038971270772fa3191885383541cebb79b740d7e11727e57db4", 
+   "size": 82892
   }, 
   "favicon.ico": {
    "sha512": "4b16ceb40191f83af1286438e4b069ab613736a199d5c5cc32a44cd60051ca13", 
@@ -28,12 +28,12 @@
    "size": 723
   }, 
   "index.html": {
-   "sha512": "95e530bcd77f1907bb44e4eb092a3c9e862df2667a9448669ab7a09615a5e68c", 
-   "size": 2427
+   "sha512": "f88247fc91152bf6affeb4be26d250a6a793784bb80d894bf55008ecaa019df2", 
+   "size": 2700
   }, 
   "js/all.js": {
-   "sha512": "e0d361fd45962a66f9627ab7e2348459a5c549d4b831019d69d6d4d841b80578", 
-   "size": 127842
+   "sha512": "9eb0331718696fa28a4a0e3deabca0d85496a54ca0826f3c91a0d37daa28e098", 
+   "size": 128969
   }, 
   "test/jquery.min.js": {
    "sha512": "eda31b5c7d371d4b3acced51fa92f27a417515317cf437aae09a47c3acc8a36b", 
@@ -50,20 +50,16 @@
   "test/stats.js": {
    "sha512": "a304ab798b9bbd1581f8aac90ea0b3b12a6ae2e9c7dd64846cd40ce0bbd099b3", 
    "size": 3560
-  }, 
-  "test/worker.js": {
-   "sha512": "d6d4a1ca6da7dba9407d49696006203c1490c6950be7dae33186b232a2354737", 
-   "size": 170
   }
  }, 
  "ignore": "(js|css)/(?!all.(js|css))", 
- "modified": 1446157245.305, 
+ "modified": 1449780690.029, 
  "sign": [
-  58598948272987971672880641261474506496946239807757113975467309956147036565622, 
-  37550783650406805114966245531828209064490731924026470826633990362051429177611
+  42358599513687854655700957130861396358086955517123500015244897460190619166669, 
+  27200718880115340847505557693050839493998194776739787970383068787553748692290
  ], 
  "signers_sign": null, 
  "signs_required": 1, 
  "title": "ZeroHello", 
- "zeronet_version": "0.3.2"
+ "zeronet_version": "0.3.4"
 }
diff --git a/css/ZeroHello.css b/css/ZeroHello.css
@@ -46,6 +46,16 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
 .version.latest { display: inline-block }
 .version.latest.new { background-color: #FFF85F; margin-right: -3px; display: none }
 
+.port { padding: 5px }
+.port a { transition: all 1s; background-position: -20px center }
+.port.closed a { color: #C58276 }
+.port.opened a { color: #24A26E }
+.port.loading a { color: rgba(0,0,0,0); background: transparent url(../img/loading.gif) no-repeat center center }
+
+.donate { padding: 5px; }
+.donate a { color: #A99D9B }
+.donate .heart { color: #DA3D32; font-family: Tahoma, Arial }
+
 .plugin-multiuser { display: none }
 .plugin-uipassword { display: none }
 .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 }
 
 .site-container .hamburger {
 	margin-left: -60px; position: relative; top: 30px; z-index: 1; transition: all 0.3s; padding: 14px 25px 0px 10px;
-	text-decoration: none; color: white; font-size: 29px; line-height: 18px; opacity: 0; margin-right: 5px;
+	text-decoration: none; color: white; font-size: 29px; line-height: 18px; opacity: 0; margin-right: 8px;
 }
 .site-container .hamburger:hover { opacity: 1 !important }
 .site-container .hamburger.menu-active { opacity: 1 !important }
@@ -115,7 +125,7 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
 .site-small .title.long { font-size: 30px }
 .site-small .action { bottom: 15px; right: 15px }
 .site-small .bottom { bottom: 4px }
-.site-small .hamburger { margin-left: -53px; top: 25px; padding: 14px 23px 0px 10px }
+.site-small .hamburger { margin-left: -53px; top: 25px; padding: 14px 23px 0px 10px; margin-right: 5px; }
 
 
 /* Site events */

diff --git a/css/all.css b/css/all.css
diff --git a/index.html b/index.html
@@ -15,8 +15,10 @@
 
  <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>
  <div class="plugin-uipassword"><a href="#Logout" class="button button-logout">Logout</a></div>
+ <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>
+ <div class="port closed" style="display: none">Port: <a href="#Re+check">Closed</a></div>
  <div class="version current">Version: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">Unknown</a></div>
- <div class="version latest new" title="New update available">Latest: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">0.3.2</a></div>
+ <div class="version latest new" title="New update available">Latest: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">0.3.4</a></div>
  <br><a href="#Update" class="button button-update button-submit">Update to new version</a>
  <br><span class='broken-autoupdate'></span>
 </div>

diff --git a/js/ZeroHello.coffee b/js/ZeroHello.coffee
@@ -97,7 +97,7 @@ class ZeroHello extends ZeroFrame
 			$(".title", elem).html(site.content.title).removeClass("long")
 		$(".description", elem).html(site.content.description)
 		modified = if site.settings.modified then site.settings.modified else site.content.modified
-		$(".modified-date", elem).html @formatSince(modified)
+		new DateSince($(".modified-date", elem)[0], modified)
 
 		# Add href
 		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
 
 			# Append sample sites
 			sample_sites = [
-				{"content": {"title": "ZeroBoard", "description": "Messaging board demo", "domain": "Board.ZeroNetwork.bit"}, "address": "1Gfey7wVXXg1rxk751TBTxLJwhddDNfcdp", "settings": {"serving": false}}
 				{"content": {"title": "ZeroBlog", "description": "Blogging platform Demo", "domain": "Blog.ZeroNetwork.bit"}, "address": "1BLogC9LN4oPDcruNz3qo1ysa133E9AGg8", "settings": {"serving": false}}
 				{"content": {"title": "ZeroTalk", "description": "Decentralized forum demo", "domain": "Talk.ZeroNetwork.bit"}, "address": "1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT", "settings": {"serving": false}}
+				{"content": {"title": "ZeroMail", "description": "End-to-end encrypted messaging", "domain": "Mail.ZeroNetwork.bit"}, "address": "1MaiL5gfBM1cyb4a8e3iiL8L5gXmoAJu27", "settings": {"serving": false}}
+				{"content": {"title": "ZeroBoard", "description": "Messaging board demo", "domain": "Board.ZeroNetwork.bit"}, "address": "1Gfey7wVXXg1rxk751TBTxLJwhddDNfcdp", "settings": {"serving": false}}
 				{"content": {"title": "ZeroID", "description": "Sample trusted authorization provider", "domain": "ZeroID.bit"}, "address": "1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz", "settings": {"serving": false}}
 				{"content": {"title": "ZeroMarket", "description": "Simple market demo (coming soon)"}, "address": "ZeroMarket", "disabled": true, "settings": {"serving": false}}
 			]
@@ -261,6 +262,22 @@ class ZeroHello extends ZeroFrame
 
 			$(".topright").css("opacity", 1)
 
+			# Port info
+			if server_info.ip_external
+				$(".port").removeClass("closed").addClass("opened")
+				$(".port a").text("opened")
+			else
+				$(".port").removeClass("opened").addClass("closed").css("display", "block")
+				$(".port a").text("closed")
+			$(".port a").off("click").on "click", =>
+				$(".port").addClass("loading")
+				@cmd "serverPortcheck", [], (res) =>
+					if @server_info.rev < 600
+						@cmd "wrapperNotification", ["info", "Please restart your ZeroNet client to re-check opened port."]
+					$(".port").removeClass("loading")
+					@log "Port open result:", res
+					@reloadServerInfo()
+
 			# Multiuser info
 			if server_info.multiuser
 				$(".plugin-multiuser").css("display", "block")