Commit a8730cd9 authored by Andrew Bonventre's avatar Andrew Bonventre

doc: hide video and share if being served from CN

In the case where requests are coming from mainland China, hide
links to locations that are blocked and functionality that is
not permitted.

Additionally, some very small cleanup of the JS.

This change requires https://go-review.googlesource.com/c/52873

Change-Id: I7fc68748e629dbe5b966d6bf117e7f7b546966eb
Reviewed-on: https://go-review.googlesource.com/52872Reviewed-by: default avatarChris Broadfoot <cbro@golang.org>
parent b63db76c
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
<div class="left"> <div class="left">
<div id="learn"> <div id="learn">
{{if not $.GoogleCN}}
<a class="popout share">Pop-out</a> <a class="popout share">Pop-out</a>
{{end}}
<div class="rootHeading">Try Go</div> <div class="rootHeading">Try Go</div>
<div class="input"> <div class="input">
<textarea spellcheck="false" class="code">// You can edit this code! <textarea spellcheck="false" class="code">// You can edit this code!
...@@ -26,10 +28,10 @@ Hello, 世界 ...@@ -26,10 +28,10 @@ Hello, 世界
</div> </div>
<div class="buttons"> <div class="buttons">
<a class="run" href="#" title="Run this code [shift-enter]">Run</a> <a class="run" href="#" title="Run this code [shift-enter]">Run</a>
{{if $.Share}} {{if not $.GoogleCN}}
<a class="share" href="#" title="Share this code">Share</a> <a class="share" href="#" title="Share this code">Share</a>
{{end}}
<a class="tour" href="//tour.golang.org/" title="Learn Go from your browser">Tour</a> <a class="tour" href="//tour.golang.org/" title="Learn Go from your browser">Tour</a>
{{end}}
</div> </div>
<div class="toys"> <div class="toys">
<select> <select>
...@@ -68,85 +70,92 @@ Linux, Mac OS X, Windows, and more. ...@@ -68,85 +70,92 @@ Linux, Mac OS X, Windows, and more.
<div style="clear: both"></div> <div style="clear: both"></div>
{{if not $.GoogleCN}}
<div class="left"> <div class="left">
<div id="video">
<div id="video"> <div class="rootHeading">Featured video</div>
<div class="rootHeading">Featured video</div> <iframe width="415" height="241" src="//www.youtube.com/embed/ytEkHepK08c" frameborder="0" allowfullscreen></iframe>
<iframe width="415" height="241" src="//www.youtube.com/embed/ytEkHepK08c" frameborder="0" allowfullscreen></iframe> </div>
</div> </div>
{{end}}
</div> <div {{if not $.GoogleCN}}class="right"{{end}}>
<div id="blog">
<div class="right"> <div class="rootHeading">Featured articles</div>
<div class="read"><a href="//blog.golang.org/">Read more</a></div>
<div id="blog"> </div>
<div class="rootHeading">Featured articles</div> </div>
<div class="read"><a href="//blog.golang.org/">Read more</a></div>
</div>
</div>
<div style="clear: both;"></div> <div style="clear: both;"></div>
<script type="text/javascript"> <script>
(function() {
function readableTime(t) { 'use strict';
var m = ["January", "February", "March", "April", "May", "June", "July",
"August", "September", "October", "November", "December"]; function readableTime(t) {
var p = t.substring(0, t.indexOf("T")).split("-"); var m = ["January", "February", "March", "April", "May", "June", "July",
var d = new Date(p[0], p[1]-1, p[2]); "August", "September", "October", "November", "December"];
return d.getDate() + " " + m[d.getMonth()] + " " + d.getFullYear(); var p = t.substring(0, t.indexOf("T")).split("-");
} var d = new Date(p[0], p[1]-1, p[2]);
return d.getDate() + " " + m[d.getMonth()] + " " + d.getFullYear();
function feedLoaded(result) {
var blog = document.getElementById("blog");
var read = blog.getElementsByClassName("read")[0];
for (var i = 0; i < result.length && i < 2; i++) {
var entry = result[i];
var title = document.createElement("a");
title.className = "title";
title.href = entry.Link;
title.innerHTML = entry.Title;
blog.insertBefore(title, read);
var extract = document.createElement("div");
extract.className = "extract";
extract.innerHTML = entry.Summary;
blog.insertBefore(extract, read);
var when = document.createElement("div");
when.className = "when";
when.innerHTML = "Published " + readableTime(entry.Time);
blog.insertBefore(when, read);
}
}
window.initFuncs.push(function() {
// Set up playground if enabled.
if (window.playground) {
window.playground({
"codeEl": "#learn .code",
"outputEl": "#learn .output",
"runEl": "#learn .run",
"shareEl": "#learn .share",
"shareRedirect": "//play.golang.org/p/",
"toysEl": "#learn .toys select"
});
} else {
$('#learn').hide()
} }
// Load blog feed. window.feedLoaded = function(result) {
$('<script/>').attr('text', 'text/javascript') var blog = document.getElementById("blog");
.attr('src', '//blog.golang.org/.json?jsonp=feedLoaded') var read = blog.getElementsByClassName("read")[0];
.appendTo('body'); for (var i = 0; i < result.length && i < 2; i++) {
var entry = result[i];
// Set the video at random. var title = document.createElement("a");
var videos = [ title.className = "title";
{h: 241, s: "//www.youtube.com/embed/ytEkHepK08c"}, // Tour of Go title.href = entry.Link;
{h: 241, s: "//www.youtube.com/embed/f6kdp27TYZs"}, // Concurrency Patterns title.innerHTML = entry.Title;
{h: 233, s: "//player.vimeo.com/video/69237265"} // Simple environment blog.insertBefore(title, read);
]; var extract = document.createElement("div");
var v = videos[Math.floor(Math.random()*videos.length)]; extract.className = "extract";
$('#video iframe').attr('height', v.h).attr('src', v.s); extract.innerHTML = entry.Summary;
}); blog.insertBefore(extract, read);
var when = document.createElement("div");
when.className = "when";
when.innerHTML = "Published " + readableTime(entry.Time);
blog.insertBefore(when, read);
}
}
window.initFuncs.push(function() {
// Set up playground if enabled.
if (window.playground) {
window.playground({
"codeEl": "#learn .code",
"outputEl": "#learn .output",
"runEl": "#learn .run",
"shareEl": "#learn .share",
"shareRedirect": "//play.golang.org/p/",
"toysEl": "#learn .toys select"
});
} else {
$('#learn').hide()
}
// Load blog feed.
$('<script/>').attr('text', 'text/javascript')
.attr('src', '//blog.golang.org/.json?jsonp=feedLoaded')
.appendTo('body');
});
{{if not $.GoogleCN}}
window.initFuncs.push(function() {
// Set the video at random.
var videos = [
{h: 241, s: "//www.youtube.com/embed/ytEkHepK08c"}, // Tour of Go
{h: 241, s: "//www.youtube.com/embed/f6kdp27TYZs"}, // Concurrency Patterns
{h: 233, s: "//player.vimeo.com/video/69237265"} // Simple environment
];
var v = videos[Math.floor(Math.random()*videos.length)];
$('#video iframe').attr('height', v.h).attr('src', v.s);
});
{{end}}
})();
</script> </script>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment