godoc/static: redirect to download from installation instructions page

automerge: a29e96e

* commit 'a29e96e3bfc4dafdcda1d4910f88807048169feb':
  godoc/static: redirect to download from installation instructions page

3 files changed, 36 insertions, 2 deletions

diff --git a/godoc/static/godocs.js b/godoc/static/godocs.js
index eee508d..997616c 100644
--- a/godoc/static/godocs.js
+++ b/godoc/static/godocs.js
@@ -254,7 +254,7 @@ function personalizeInstallInstructions() {
   }
 
   var filename = s.substr(prefix.length);
-  var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)-([a-z0-9]+)\.(.+)$/
+  var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)(-[a-z0-9-.]+)?\.([a-z.]+)$/;
   $('.downloadFilename').text(filename);
   $('.hideFromDownload').hide();
   var m = filenameRE.exec(filename);
@@ -281,6 +281,16 @@ function personalizeInstallInstructions() {
       $('#windowsZipInstructions').hide();
     }
   }
+
+  var download = "https://storage.googleapis.com/golang/" + filename;
+
+  var message = $('<p class="downloading">'+
+    'Your download should begin shortly. '+
+    'If it does not, click <a>this link</a>.</p>');
+  message.find('a').attr('href', download);
+  message.insertAfter('#nav');
+
+  window.location = download;
 }
 
 $(document).ready(function() {
diff --git a/godoc/static/static.go b/godoc/static/static.go
index 49d5420..a4b3451 100644
--- a/godoc/static/static.go
+++ b/godoc/static/static.go
@@ -819,7 +819,7 @@ function personalizeInstallInstructions() {
   }
 
   var filename = s.substr(prefix.length);
-  var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)-([a-z0-9]+)\.(.+)$/
+  var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)(-[a-z0-9-.]+)?\.([a-z.]+)$/;
   $('.downloadFilename').text(filename);
   $('.hideFromDownload').hide();
   var m = filenameRE.exec(filename);
@@ -846,6 +846,16 @@ function personalizeInstallInstructions() {
       $('#windowsZipInstructions').hide();
     }
   }
+
+  var download = "https://storage.googleapis.com/golang/" + filename;
+
+  var message = $('<p class="downloading">'+
+    'Your download should begin shortly. '+
+    'If it does not, click <a>this link</a>.</p>');
+  message.find('a').attr('href', download);
+  message.insertAfter('#nav');
+
+  window.location = download;
 }
 
 $(document).ready(function() {
@@ -3399,6 +3409,13 @@ a.error {
 	display: none;
 }
 
+.downloading {
+	background: #F9F9BE;
+	padding: 10px;
+	text-align: center;
+	border-radius: 5px;
+}
+
 @media (max-width: 930px) {
 	#heading-wide {
 		display: none;
diff --git a/godoc/static/style.css b/godoc/static/style.css
index 241fa90..4d2b07a 100644
--- a/godoc/static/style.css
+++ b/godoc/static/style.css
@@ -643,6 +643,13 @@ a.error {
 	display: none;
 }
 
+.downloading {
+	background: #F9F9BE;
+	padding: 10px;
+	text-align: center;
+	border-radius: 5px;
+}
+
 @media (max-width: 930px) {
 	#heading-wide {
 		display: none;