Imported Upstream version 2012.03.22upstream-weekly/2012.03.22

author: Ondřej Surý <ondrej@sury.org> 2012-03-26 16:50:58 +0200
committer: Ondřej Surý <ondrej@sury.org> 2012-03-26 16:50:58 +0200
commit: 519725bb3c075ee2462c929f5997cb068e18466a (patch)
tree: 5b162e8488ad147a645048c073577821b4a2bee9 /lib/godoc
parent: 842623c5dd2819d980ca9c58048d6bc6ed82475f (diff)
download: golang-upstream-weekly/2012.03.22.tar.gz
4 files changed, 23 insertions, 23 deletions
diff --git a/lib/godoc/example.html b/lib/godoc/example.html
index d7b219371..43ee4bddc 100644
--- a/lib/godoc/example.html
+++ b/lib/godoc/example.html
@@ -1,9 +1,9 @@
 <div id="example_{{.Name}}" class="example">
 	<div class="collapsed">
-		<p class="exampleHeading">▹ Example{{example_suffix .Name}}</p>
+		<p class="exampleHeading">▹ <span class="text">Example{{example_suffix .Name}}</span></p>
 	</div>
 	<div class="expanded">
-		<p class="exampleHeading">▾ Example{{example_suffix .Name}}</p>
+		<p class="exampleHeading">▾ <span class="text">Example{{example_suffix .Name}}</span></p>
 		{{with .Doc}}<p>{{html .}}</p>{{end}}
 		<p>Code:</p>
 		<pre class="code">{{.Code}}</pre>
diff --git a/lib/godoc/godoc.html b/lib/godoc/godoc.html
index 09a2cc4c2..feb96e50f 100644
--- a/lib/godoc/godoc.html
+++ b/lib/godoc/godoc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-{{with .Title}}
+{{with .Tabtitle}}
   <title>{{html .}} - The Go Programming Language</title>
 {{else}}
   <title>The Go Programming Language</title>
@@ -15,10 +15,9 @@
 </head>
 <body>
 
-<div id="topbar"><div class="container">
+<div id="topbar"><div class="container{{if .Title}} wide{{end}}">
 
 <form method="GET" action="/search">
-<div id="heading"><a href="/">The Go Programming Language</a></div>
 <div id="menu">
 <a href="/doc/">Documents</a>
 <a href="/ref/">References</a>
@@ -27,13 +26,12 @@
 <a href="/help/">Help</a>
 <input type="text" id="search" name="q" class="inactive" value="Search">
 </div>
+<div id="heading"><a href="/">The Go Programming Language</a></div>
 </form>
 
 </div></div>
 
-<div id="page">
-
-<div id="content">
+<div id="page"{{if .Title}} class="wide"{{end}}>
 
 {{with .Title}}
   <div id="plusone"><g:plusone size="small" annotation="none"></g:plusone></div>
@@ -52,8 +50,6 @@
 
 </div>
 
-</div>
-
 <div id="copyright">
 Build version {{html .Version}}.
 Except as noted, this content is licensed under a
@@ -61,7 +57,6 @@ Creative Commons Attribution 3.0 License.
 </div>
 
 </body>
-<!--
 <script type="text/javascript">
   (function() {
     var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
@@ -69,6 +64,5 @@ Creative Commons Attribution 3.0 License.
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
   })();
 </script>
--->
 </html>
 
diff --git a/lib/godoc/package.html b/lib/godoc/package.html
index fdebbf5d9..848e68df7 100644
--- a/lib/godoc/package.html
+++ b/lib/godoc/package.html
@@ -70,7 +70,7 @@
 			<p>
 			<span style="font-size:90%">
 			{{range .}}
-				<a href="/{{.|srcLink}}">{{.|filename|html}}</a>
+				<a href="{{.|srcLink|html}}">{{.|filename|html}}</a>
 			{{end}}
 			</span>
 			</p>
@@ -93,7 +93,7 @@
 		{{range .Funcs}}
 			{{/* Name is a string - no need for FSet */}}
 			{{$name_html := html .Name}}
-			<h2 id="{{$name_html}}">func <a href="/{{posLink_url .Decl $.FSet}}">{{$name_html}}</a></h2>
+			<h2 id="{{$name_html}}">func <a href="{{posLink_url .Decl $.FSet}}">{{$name_html}}</a></h2>
 			<pre>{{node_html .Decl $.FSet}}</pre>
 			{{comment_html .Doc}}
 			{{example_html .Name $.Examples $.FSet}}
@@ -101,7 +101,7 @@
 		{{range .Types}}
 			{{$tname := .Name}}
 			{{$tname_html := html .Name}}
-			<h2 id="{{$tname_html}}">type <a href="/{{posLink_url .Decl $.FSet}}">{{$tname_html}}</a></h2>
+			<h2 id="{{$tname_html}}">type <a href="{{posLink_url .Decl $.FSet}}">{{$tname_html}}</a></h2>
 			<pre>{{node_html .Decl $.FSet}}</pre>
 			{{comment_html .Doc}}
 
@@ -119,7 +119,7 @@
 
 			{{range .Funcs}}
 				{{$name_html := html .Name}}
-				<h3 id="{{$name_html}}">func <a href="/{{posLink_url .Decl $.FSet}}">{{$name_html}}</a></h3>
+				<h3 id="{{$name_html}}">func <a href="{{posLink_url .Decl $.FSet}}">{{$name_html}}</a></h3>
 				<pre>{{node_html .Decl $.FSet}}</pre>
 				{{comment_html .Doc}}
 				{{example_html .Name $.Examples $.FSet}}
@@ -127,7 +127,7 @@
 
 			{{range .Methods}}
 				{{$name_html := html .Name}}
-				<h3 id="{{$tname_html}}.{{$name_html}}">func ({{html .Recv}}) <a href="/{{posLink_url .Decl $.FSet}}">{{$name_html}}</a></h3>
+				<h3 id="{{$tname_html}}.{{$name_html}}">func ({{html .Recv}}) <a href="{{posLink_url .Decl $.FSet}}">{{$name_html}}</a></h3>
 				<pre>{{node_html .Decl $.FSet}}</pre>
 				{{comment_html .Doc}}
 				{{$name := printf "%s_%s" $tname .Name}}
@@ -163,7 +163,13 @@
 
 {{with .Dirs}}
 	{{/* DirList entries are numbers and strings - no need for FSet */}}
-	{{if $.PDoc}}<h2 id="subdirectories">Subdirectories</h2>{{end}}
+	{{if $.PDoc}}
+		<h2 id="subdirectories">Subdirectories</h2>
+	{{else}}
+		<div class="pkgGopher">
+			<img class="gopher" src="/doc/gopher/pkg.png"/>
+		</div>
+	{{end}}
 	<table class="dir">
 	<tr>
 	<th>Name</th>
diff --git a/lib/godoc/search.html b/lib/godoc/search.html
index db90935d8..5b54d7126 100644
--- a/lib/godoc/search.html
+++ b/lib/godoc/search.html
@@ -38,7 +38,7 @@
 				{{$src_html := srcLink .File.Path | html}}
 				{{range .Groups}}
 					{{range .}}
-						<a href="/{{$src_html}}?h={{$query_url}}#L{{infoLine .}}">{{$src_html}}:{{infoLine .}}</a>
+						<a href="{{$src_html}}?h={{$query_url}}#L{{infoLine .}}">{{$src_html}}:{{infoLine .}}</a>
 						{{infoSnippet_html .}}
 					{{end}}
 				{{end}}
@@ -52,7 +52,7 @@
 			<h3 id="Local_{{$pkg_html}}">package <a href="/{{$pkg_html}}">{{html .Pak.Name}}</a></h3>
 			{{range .Files}}
 				{{$src_html := srcLink .File.Path | html}}
-				<a href="/{{$src_html}}?h={{$query_url}}">{{$src_html}}</a>
+				<a href="{{$src_html}}?h={{$query_url}}">{{$src_html}}</a>
 				<table class="layout">
 				{{range .Groups}}
 					<tr>
@@ -61,7 +61,7 @@
 					<td align="left" width="4"></td>
 					<td>
 					{{range .}}
-						<a href="/{{$src_html}}?h={{$query_url}}#L{{infoLine .}}">{{infoLine .}}</a>
+						<a href="{{$src_html}}?h={{$query_url}}#L{{infoLine .}}">{{infoLine .}}</a>
 					{{end}}
 					</td>
 					</tr>
@@ -86,14 +86,14 @@
 		{{$src_html := srcLink .Filename | html}}
 		<tr>
 		<td align="left" valign="top">
-		<a href="/{{$src_html}}?h={{$query_url}}">{{$src_html}}</a>:
+		<a href="{{$src_html}}?h={{$query_url}}">{{$src_html}}</a>:
 		</td>
 		<td align="left" width="4"></td>
 		<th align="left" valign="top">{{len .Lines}}</th>
 		<td align="left" width="4"></td>
 		<td align="left">
 		{{range .Lines}}
-			<a href="/{{$src_html}}?h={{$query_url}}#L{{html .}}">{{html .}}</a>
+			<a href="{{$src_html}}?h={{$query_url}}#L{{html .}}">{{html .}}</a>
 		{{end}}
 		{{if not $.Complete}}
 			...
author	Ondřej Surý <ondrej@sury.org>	2012-03-26 16:50:58 +0200
committer	Ondřej Surý <ondrej@sury.org>	2012-03-26 16:50:58 +0200
commit	519725bb3c075ee2462c929f5997cb068e18466a (patch)
tree	5b162e8488ad147a645048c073577821b4a2bee9 /lib/godoc
parent	842623c5dd2819d980ca9c58048d6bc6ed82475f (diff)
download	golang-upstream-weekly/2012.03.22.tar.gz