Site clone menu item, Display update message on listModifications, Minor UI tweak

Author: shortcutme

css/ZeroHello.css

@@ -153,7 +153,7 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
 .menu-item { display: block; text-decoration: none; color: black; padding: 6px 24px; transition: all 0.2s }
 .menu-item-separator { margin-top: 5px; border-top: 1px solid #eee }
 
-.menu-item:hover { background-color: #EEE }
+.menu-item:hover { background-color: #F6F6F6; transition: none }
 .menu-item:active, .menu-item:focus { background-color: #AF3BFF; color: white; transition: none }
 
 

css/all.css

@@ -15,7 +15,7 @@
 
  <div class="user">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="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.2.9</a></div>
+ <div class="version latest new" title="New update available">Latest: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">0.3.0</a></div>
  <br><a href="#Update" class="button button-update button-submit">Update to new version</a>
  <br><span class='broken-autoupdate'>Err, we broke the autoupdate for this version.<br> Please overwrite your current <b>update.py</b> file<br> with the <a href="https://raw.githubusercontent.com/HelloZeroNet/ZeroNet/master/update.py" target="_top">latest one from github</a>, run it and restart ZeroNet.<br>Sorry for the troubles!</span> 
 </div>

index.html

@@ -48,6 +48,12 @@ class SiteMenu extends Menu
 			@addItem "Pause", (-> window.zero_hello.sitePause site.address )
 		else
 			@addItem "Resume", (-> window.zero_hello.siteResume site.address )
+		if site.content?.cloneable
+			if zero_hello.server_info.rev < 200
+				@addItem "Clone", (-> window.zero_hello.cmd "wrapperNotification", ["info", "Please update to version 0.3.1 to use the site clone feature!"] )
+			else
+				@addItem "Clone", (-> window.zero_hello.siteClone site.address )
+
 		@addItem("Delete", (-> window.zero_hello.siteDelete site.address ) ).addClass("menu-item-separator")
 
 

js/SiteMenu.coffee

@@ -10,6 +10,7 @@ class ZeroHello extends ZeroFrame
 
 		$(".button-update").on "click", =>
 			$(".button-update").addClass("loading")
+			$(".broken-autoupdate").css("display", "block").html "Please run update.py manually<br>if ZeroNet doesn't comes back within 1 minute."
 			@cmd "serverUpdate", {}
 
 
@@ -120,17 +121,19 @@ class ZeroHello extends ZeroFrame
 
 
 		# Show/hide loading
-		if site.tasks > 0 # Site tasks running
+		if site.tasks > 0 or site.event?[0] == "updating" # Site tasks running
 			$(".anim-updating", elem).addClass("visible")
 		else
 			$(".anim-updating", elem).removeClass("visible")
 
 		# Show success
-		if site.event?[0] == "file_done" or site.event?[0] == "file_started"
+		if site.event?[0] in ["file_done", "file_started", "updating", "updated"]
 			if site.bad_files > 0
 				success = "Updating: #{site.bad_files} left"
-			else if site.event[0] == "file_done" and site.bad_files == 0
+			else if site.event[0] in ["file_done", "updated"] and site.bad_files == 0
 				success = "Site updated"
+			else
+				success = "Site updating..."
 		if success
 			$(".notify", elem).text(success).addClass("success").addClassLater("visible")
 
@@ -201,6 +204,7 @@ class ZeroHello extends ZeroFrame
 				{"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": "1TaLk3zM7ZRskJvrh3ZNCDVGXvkJusPKQ", "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}}
 			]
 
@@ -279,6 +283,11 @@ class ZeroHello extends ZeroFrame
 		@cmd "siteResume", {"address": address}
 
 
+	# Create new site from this
+	siteClone: (address) ->
+		@cmd "siteClone", {"address": address}
+
+
 	# Delete site
 	siteDelete: (address) ->
 		site = @sites[address]

js/ZeroHello.coffee

@@ -841,6 +841,7 @@ jQuery.extend( jQuery.easing,
     __extends(SiteMenu, _super);
 
     function SiteMenu(elem, site) {
+      var _ref;
       SiteMenu.__super__.constructor.call(this, $(".hamburger", elem));
       this.elem.addClass("menu-site");
       this.addItem("Update", (function() {
@@ -855,6 +856,17 @@ jQuery.extend( jQuery.easing,
           return window.zero_hello.siteResume(site.address);
         }));
       }
+      if ((_ref = site.content) != null ? _ref.cloneable : void 0) {
+        if (zero_hello.server_info.rev < 200) {
+          this.addItem("Clone", (function() {
+            return window.zero_hello.cmd("wrapperNotification", ["info", "Please update to version 0.3.1 to use the site clone feature!"]);
+          }));
+        } else {
+          this.addItem("Clone", (function() {
+            return window.zero_hello.siteClone(site.address);
+          }));
+        }
+      }
       this.addItem("Delete", (function() {
         return window.zero_hello.siteDelete(site.address);
       })).addClass("menu-item-separator");
@@ -879,6 +891,7 @@ jQuery.extend( jQuery.easing,
 }).call(this);
 
 
+
 /* ---- data/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/js/ZeroHello.coffee ---- */
 
 
@@ -913,6 +926,7 @@ jQuery.extend( jQuery.easing,
       return $(".button-update").on("click", (function(_this) {
         return function() {
           $(".button-update").addClass("loading");
+          $(".broken-autoupdate").css("display", "block").html("Please run update.py manually<br>if ZeroNet doesn't comes back within 1 minute.");
           return _this.cmd("serverUpdate", {});
         };
       })(this));
@@ -991,7 +1005,7 @@ jQuery.extend( jQuery.easing,
     };
 
     ZeroHello.prototype.applySitedata = function(elem, site) {
-      var error, href, modified, success, _ref, _ref1, _ref2, _ref3;
+      var error, href, modified, success, _ref, _ref1, _ref2, _ref3, _ref4, _ref5;
       if (typeof site.bad_files === "object") {
         site.bad_files = site.bad_files.length;
       }
@@ -1034,16 +1048,18 @@ jQuery.extend( jQuery.easing,
         $(elem).addClass("site-paused");
         $(".status", elem).text("Paused");
       }
-      if (site.tasks > 0) {
+      if (site.tasks > 0 || ((_ref1 = site.event) != null ? _ref1[0] : void 0) === "updating") {
         $(".anim-updating", elem).addClass("visible");
       } else {
         $(".anim-updating", elem).removeClass("visible");
       }
-      if (((_ref1 = site.event) != null ? _ref1[0] : void 0) === "file_done" || ((_ref2 = site.event) != null ? _ref2[0] : void 0) === "file_started") {
+      if ((_ref2 = (_ref3 = site.event) != null ? _ref3[0] : void 0) === "file_done" || _ref2 === "file_started" || _ref2 === "updating" || _ref2 === "updated") {
         if (site.bad_files > 0) {
           success = "Updating: " + site.bad_files + " left";
-        } else if (site.event[0] === "file_done" && site.bad_files === 0) {
+        } else if (((_ref4 = site.event[0]) === "file_done" || _ref4 === "updated") && site.bad_files === 0) {
           success = "Site updated";
+        } else {
+          success = "Site updating...";
         }
       }
       if (success) {
@@ -1055,7 +1071,7 @@ jQuery.extend( jQuery.easing,
         } else {
           error = "Update failed";
         }
-      } else if (site.tasks === 0 && site.bad_files > 0 && ((_ref3 = site.event) != null ? _ref3[0] : void 0) !== "file_done") {
+      } else if (site.tasks === 0 && site.bad_files > 0 && ((_ref5 = site.event) != null ? _ref5[0] : void 0) !== "file_done") {
         error = site.bad_files + " file update failed";
       }
       if (error) {
@@ -1136,6 +1152,16 @@ jQuery.extend( jQuery.easing,
               "settings": {
                 "serving": false
               }
+            }, {
+              "content": {
+                "title": "ZeroID",
+                "description": "Sample trusted authorization provider",
+                "domain": "ZeroID.bit"
+              },
+              "address": "1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz",
+              "settings": {
+                "serving": false
+              }
             }, {
               "content": {
                 "title": "ZeroMarket",
@@ -1233,6 +1259,12 @@ jQuery.extend( jQuery.easing,
       });
     };
 
+    ZeroHello.prototype.siteClone = function(address) {
+      return this.cmd("siteClone", {
+        "address": address
+      });
+    };
+
     ZeroHello.prototype.siteDelete = function(address) {
       var site, title;
       site = this.sites[address];
@@ -1263,4 +1295,4 @@ jQuery.extend( jQuery.easing,
 
   window.zero_hello = new ZeroHello();
 
-}).call(this);
+}).call(this);