doc: update front page and go_learning.html

This is a stop-gap change to give more current information visibility
before a more thorough reorganization.

R=r, rsc, gri
CC=golang-dev
http://codereview.appspot.com/1902042

9 files changed, 106 insertions, 58 deletions

diff --git a/doc/go_learning.html b/doc/go_learning.html
index 630daf086..ecc111106 100644
--- a/doc/go_learning.html
+++ b/doc/go_learning.html
@@ -111,7 +111,15 @@ Features and ideas being developed or discussed by the Go team.
 A summarization of the changes between tagged releases of Go.
 </p>
 
-<h2 id="videos">Videos</h2>
+<h2 id="videos_talks">Videos and Talks</h2>
+
+<h3 id="go_programming"><a href="http://www.youtube.com/watch?v=jgVhBThJdXc">Go Programming</a></h3>
+<p>
+A presentation delivered by Rob Pike and Russ Cox at Google I/O 2010.  It
+illustrates how programming in Go differs from other languages through a set of
+examples demonstrating features particular to Go.  These include concurrency,
+embedded types, methods on any type, and program construction using interfaces. 
+</p>
 
 <h3 id="techtalk"><a href="http://www.youtube.com/watch?v=rKnDgT73v8s">The Go Tech Talk</a></h3>
 <p>
@@ -120,15 +128,33 @@ The language's first public introduction. (See the <a href="talks/go_talk-200910
 but it's still a good introduction.
 </p>
 
-
 <h3 id="gocoding_channel"><a href="http://www.youtube.com/gocoding">gocoding YouTube Channel</a></h3>
 <p>
 A YouTube channel that includes screencasts and other Go-related videos:
 </p>
 <ul>
 <li><a href="http://www.youtube.com/gocoding#p/u/0/jDWBJOXs_iI">Screencast: Writing Go Packages</a> - writing, building, and distributing Go packages.</li>
+<li><a href="http://www.youtube.com/watch?v=3brH0zOqm0w">Screencast: Testing Go Packages</a> - writing unit tests and benchmarking Go packages.</li>
 </ul>
 
+<h3 id="oscon_go"><a href="http://www.oscon.com/oscon2010/public/schedule/detail/14760">Another Go at Language Design</a></h3>
+<p>
+A tour, with some background, of the major features of Go, intended for
+an audience new to the language.  The talk was presented at OSCON 2010.
+See the <a href="http://assets.en.oreilly.com/1/event/45/Another%20Go%20at%20Language%20Design%20Presentation.pdf">presentation slides</a>.
+</p>
+
+<h3 id="oscon_go"><a href="http://www.oscon.com/oscon2010/public/schedule/detail/15464">Go Emerging Languages Conference Talk</a></h3>
+<p>
+Rob Pike's Emerging Languages Conference presentation delivered in July 2010. See the <a href="http://assets.en.oreilly.com/1/event/45/Go%20Presentation.pdf">presentation slides</a>. Abstract:
+</p>
+<p><i>
+Go’s approach to concurrency differs from that of many languages, even those
+(such as Erlang) that make concurrency central, yet it has deep roots. The path
+from Hoare’s 1978 paper to Go provides insight into how and why Go works as it
+does.
+</i></p>
+
 <h3 id="promo_video"><a href="http://www.youtube.com/watch?v=wwoWei-GAPo">The Go Promo Video</a></h3>
 <p>
 A short promotional video featuring Russ Cox demonstrating Go's fast compiler.
diff --git a/doc/root.html b/doc/root.html
index 3a5a49515..5fd553854 100644
--- a/doc/root.html
+++ b/doc/root.html
@@ -23,6 +23,7 @@ function loadFeed() {
 		}
 		container.innerHTML = "";
 		var entries = result.feed.entries;
+		console.log(entries);
 		for (var i=0; i<entries.length; i++) {
 			var a = document.createElement("a");
 			a.setAttribute("href", entries[i].link);
@@ -36,41 +37,6 @@ google.setOnLoadCallback(loadFeed);
 </script>
 <!-- end blog post widget JS/styles -->
 
-<div id="gettingStarted">
-  <h1>Getting started</h1>
-
-  <ol>
-    <li>
-      <span><a href="/doc/install.html">Install Go</a>.</span>
-    </li>
-
-    <li>
-      <span>Read the <a href="/doc/go_tutorial.html">tutorial</a>.</span>
-    </li>
-
-    <li>
-      <span>Learn the <a href="/pkg">libraries</a>.</span>
-    </li>
-  </ol>
-
-  <h1>Slow compiles?<br>Watch this</h1>
-  <table width="100%">
-    <tr>
-      <td align=center width="100%">
-        <a href="http://www.youtube.com/watch?v=wwoWei-GAPo"><img src="/doc/video-snap.jpg"></a>
-      </td>
-    </tr>
-  </table>
-</div>
-
-<div id="blog">
-	<h1>From the <a href="http://blog.golang.org">Go Blog</a>:</h1>
-	<div id="blogFeed">Loading...</div>
-</div>
-
-
-<div id="frontpage">
-
 <table style="padding-top: 1em; padding-bottom: 2em;">
   <tr>
     <td>
@@ -82,6 +48,33 @@ google.setOnLoadCallback(loadFeed);
   </tr>
 </table>
 
+<div id="fp-videos">
+  <h1>Go videos</h1>
+  <div class="video">
+    <a href="http://www.youtube.com/watch?v=jgVhBThJdXc"><img src="/doc/video-snap-io.jpg"></a>
+    <div class="title">"Go Programming"</div>
+    <div class="subtitle">Google I/O Tech Talk</div>
+  </div>
+  <div class="video">
+    <a href="http://www.youtube.com/watch?v=wwoWei-GAPo"><img src="/doc/video-snap-fastcompiles.jpg"></a>
+    <div class="title">"Fast Compiles"</div>
+    <div class="subtitle">Go Promotional Video</div>
+  </div>
+  <div class="video">
+    <a href="http://www.youtube.com/gocoding"><img src="/doc/video-snap-gocoding.jpg"></a>
+    <div class="title">Go Youtube Channel</div>
+    <div class="subtitle">Screencasts and more</div>
+  </div>
+  <a class="more" href="/doc/go_learning.html#videos_talks">More videos and talks.</a>
+</div>
+
+<div id="frontpage">
+
+<div id="blog">
+  <h1>From the <a href="http://blog.golang.org">Go Blog</a>:</h1>
+  <div id="blogFeed">Loading...</div>
+</div>
+
 <p style="font-size: 1.5em; font-weight: bold;">Go is &hellip;</p>
 
 <h3>&hellip; simple</h3>
@@ -94,25 +87,27 @@ func main() {
   fmt.Printf("Hello, 世界\n")
 }</pre>
 
+<p>Go has a small, simple feature set, making it easy to learn.</p>
+
 <h3>&hellip; fast</h3>
 
 <p>
 Go compilers produce fast code fast. Typical builds take a fraction of a second yet the resulting programs run nearly as quickly as comparable C or C++ code.
 </p>
 
-<h3>&hellip; safe</h3>
-
-<p>Go is type safe and memory safe. Go has pointers but no pointer arithmetic.
-For random access, use slices, which know their limits.</p>
-
 <h3>&hellip; concurrent</h3>
 
 <p>
-Go promotes writing systems and servers as sets of lightweight
-communicating processes, called goroutines, with strong support from the language.
-Run thousands of goroutines if you want&mdash;and say good-bye to stack overflows.
+Go promotes writing systems and servers as sets of lightweight communicating
+processes, called goroutines, with strong support from the language.  Run
+thousands of goroutines if you want&mdash;and say good-bye to stack overflows.
 </p>
 
+<h3>&hellip; safe</h3>
+
+<p>Go is type safe and memory safe. Go has pointers but no pointer arithmetic.
+For random access, use slices, which know their limits.</p>
+
 <h3>&hellip; fun</h3>
 
 <p>
diff --git a/doc/style.css b/doc/style.css
index cd57232a7..4ced0f6bb 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -239,9 +239,9 @@ span.subtitle {
 /* ------------------------------------------------------------------------- */
 /* Styles for the frontpage */
 
-#gettingStarted, #blog {
+#fp-videos {
   margin-top: 1.5em;
-  margin-left: 1.75em;
+  margin-left: 1em;
   margin-right: 0em;
   float: right;
   clear: right;
@@ -249,26 +249,27 @@ span.subtitle {
   padding-left: 1em;
   padding-right: 1em;
   padding-bottom: 0.75em;
-  border: 2px solid #ba9836;
+  border: 1px solid #ba9836;
   width: 160px;
 }
 
 #blog { margin-bottom: 1.5em; }
-#blog h1 { font-size: 1.2em; }
-#blog #blogFeed a { font-size: 1.1em; display: block; margin-top: 1em; }
+#blog h1 { font-size: 1.2em; padding-top: 0.7em; }
+#blog #blogFeed a { display: block; margin-top: 1em; }
 
-#gettingStarted h1 {
-  padding-top: 0.3em;
+#fp-videos h1 {
+  padding-top: 0.5em;
   margin-bottom: 0.2em;
-  font-size: 1.5em;
+  font-size: 1.2em;
 }
 
-#gettingStarted ol {
-  padding-left: 2em;
+#fp-videos a img {
+  border: 1px solid blue;
 }
 
-#gettingStarted a img {
-  border: 1px solid blue;
+#fp-videos a.more {
+  text-align: center;
+  display: block;
 }
 
 #frontpage {
@@ -280,3 +281,29 @@ span.subtitle {
   font-size: 1.5em;
   font-weight: normal;
 }
+
+#blog {
+	float: right;
+	width: 160px;
+	background-color: ivory;
+	border: 1px solid #BA9836;
+	padding: 0 1em;
+	margin-left: 1em;
+	margin-bottom: 1em;
+}
+#blogFeed {
+	padding-bottom: 1em;
+}
+
+.video {
+  padding: 5px 0;
+  text-align: center;
+}
+.video img {
+  margin-bottom: 5px;
+}
+.video .title {
+  font-weight: bold;
+}
+.video .title {
+}
diff --git a/doc/video-snap-fastcompiles.jpg b/doc/video-snap-fastcompiles.jpg
new file mode 100644
index 000000000..94596def3
--- /dev/null
+++ b/doc/video-snap-fastcompiles.jpg
diff --git a/doc/video-snap-gocoding.jpg b/doc/video-snap-gocoding.jpg
new file mode 100644
index 000000000..bfffb040f
--- /dev/null
+++ b/doc/video-snap-gocoding.jpg
diff --git a/doc/video-snap-io.jpg b/doc/video-snap-io.jpg
new file mode 100644
index 000000000..f2dff722b
--- /dev/null
+++ b/doc/video-snap-io.jpg
diff --git a/doc/video-snap-oscon.jpg b/doc/video-snap-oscon.jpg
new file mode 100644
index 000000000..b437cd7fd
--- /dev/null
+++ b/doc/video-snap-oscon.jpg
diff --git a/doc/video-snap.jpg b/doc/video-snap.jpg
deleted file mode 100644
index ae66c558e..000000000
--- a/doc/video-snap.jpg
+++ /dev/null
diff --git a/lib/godoc/godoc.html b/lib/godoc/godoc.html
index aef7f4dc4..bb3c07fe0 100644
--- a/lib/godoc/godoc.html
+++ b/lib/godoc/godoc.html
@@ -78,8 +78,8 @@
     <li class="navhead"><a href="/">Home</a></li>
     <li class="blank">&nbsp;</li>
 
-    <li class="navhead"><a href="/doc/go_learning.html">Go Resources</a></li>
     <li class="navhead"><a href="/doc/install.html">Installing Go</a></li>
+    <li class="navhead"><a href="/doc/go_learning.html">Go Resources</a></li>
     <li class="blank">&nbsp;</li>
 
     <li class="navhead">Selected Documents</li>