website: add Go Blog widget to frontpage,

add Blog and Wiki links to sideba

R=r, rsc, gri
CC=golang-dev
https://golang.org/cl/611042

diff --git a/doc/root.html b/doc/root.html
index 655ac238dbb880e240589b854669a68255770284..19ebcfec7918e38c893af94afcfa34ba960e257d 100644 (file)
--- a/doc/root.html
+++ b/doc/root.html
@@ -7,6 +7,22 @@
   document.getElementById('nav').style.display = 'none';
 </script>
 
+<!-- begin blog post widget JS/styles -->
+<script src="http://www.google.com/jsapi/?key=ABQIAAAA4TEcjQ5y1r35xLDoRydN_RQJvypqxg_hbbvOIUrMXndwfI6kkBStplaG-3V8WLePPIt0A4nJSKKJdA" type="text/javascript"></script>
+<script src="http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.js" type="text/javascript"></script>
+<script type="text/javascript">
+function loadFeedControl() {
+       var feed  = "http://blog.golang.org/feeds/posts/default"
+       var fg = new GFdynamicFeedControl(feed, "feedControl", {
+               numResults: 5,
+               displayTime: 5000
+       });
+}
+google.load("feeds", "1");
+google.setOnLoadCallback(loadFeedControl);
+</script>
+<!-- end blog post widget JS/styles -->
+
 <div id="gettingStarted">
   <h1>Getting started</h1>
 
@@ -34,6 +50,12 @@
   </table>
 </div>
 
+<div id="blog">
+       <h1>From the <a href="http://blog.golang.org">Go Blog</a>:</h1>
+       <div id="feedControl">Loading...</div>
+</div>
+
+
 <div id="frontpage">
 
 <table style="padding-top: 1em; padding-bottom: 2em;">

diff --git a/doc/style.css b/doc/style.css
index 184b80e6e27f7984483a05acc968a30d3c8069dc..597e70bb342b5d59953bb30d4811ffa38527c3b6 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -228,18 +228,27 @@ span.highlight {
 /* ------------------------------------------------------------------------- */
 /* Styles for the frontpage */
 
-#gettingStarted {
+#gettingStarted, #blog {
   margin-top: 1.5em;
   margin-left: 1.75em;
   margin-right: 0em;
   float: right;
+  clear: right;
   background-color: #fffff0;
   padding-left: 1em;
   padding-right: 1em;
   padding-bottom: 0.75em;
   border: 2px solid #ba9836;
+  width: 180px;
 }
 
+#blog { margin-bottom: 1.5em; }
+#blog h1 { font-size: 1.2em; }
+#blog .gfg-title, #blog .gf-author, #blog .gf-spacer { display: none; }
+#blog .gfg-list { margin-top: 1em; }
+#blog .gf-title { font-size: 1.1em; }
+#blog .gfg-listentry-highlight { font-weight: bold; }
+
 #gettingStarted h1 {
   padding-top: 0.3em;
   margin-bottom: 0.2em;

diff --git a/lib/godoc/godoc.html b/lib/godoc/godoc.html
index a078b11d7454c323146ef3e1c9be7008afc30539..f41b46a2737b6ba4bc67541b56fc079932cc23ea 100644 (file)
--- a/lib/godoc/godoc.html
+++ b/lib/godoc/godoc.html
@@ -102,11 +102,15 @@
     <li><a href="/doc/devel/">The Go project</a></li>
 
     <li class="blank">&nbsp;</li>
-    <li class="navhead">Help</li>
-    <li>#go-nuts on irc.freenode.net</li>
+    <li class="navhead">Help &amp; Community</li>
+    <li><a href="http://blog.golang.org/">Go Blog</a></li>
     <li><a href="http://groups.google.com/group/golang-nuts">Go Nuts mailing list</a></li>
+    <li>#go-nuts on irc.freenode.net</li>
     <li><a href="http://code.google.com/p/go/issues/list">Issue tracker</a></li>
+    <li><a href="http://code.google.com/p/go/wiki/WikiIndex">Go Wiki</a></li>
 
+
+    <li class="blank">&nbsp;</li>
     <li class="blank">&nbsp;</li>
     <li class="navhead">Go code search</li>
     <form method="GET" action="/search" class="search">