aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2012-02-13 21:22:36 +1100
committerAndrew Gerrand <adg@golang.org>2012-02-13 21:22:36 +1100
commitd84de09e1d46efe6e0dc5edcbb6c30b02733aa70 (patch)
tree231d42fa6c6f5e1c7ae969856dacd8aa0c96be39 /lib
parent159ee8a42f2ad9216267a1da0217427346d1d331 (diff)
downloadgo-d84de09e1d46efe6e0dc5edcbb6c30b02733aa70.tar.xz
godoc: new design
This is not the finished product, but a good checkpoint from which to proceed with further development. R=golang-dev, dsymonds, r CC=golang-dev https://golang.org/cl/5571061
Diffstat (limited to 'lib')
-rw-r--r--lib/godoc/godoc.html105
-rw-r--r--lib/godoc/package.html54
2 files changed, 76 insertions, 83 deletions
diff --git a/lib/godoc/godoc.html b/lib/godoc/godoc.html
index e99b758586..380a3910d9 100644
--- a/lib/godoc/godoc.html
+++ b/lib/godoc/godoc.html
@@ -1,72 +1,73 @@
<!DOCTYPE html>
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
{{with .Title}}
<title>{{html .}} - The Go Programming Language</title>
{{else}}
<title>The Go Programming Language</title>
{{end}}
-<link rel="stylesheet" href="/doc/all.css" type="text/css" media="all" charset="utf-8">
-<!--[if lt IE 8]>
-<link rel="stylesheet" href="/doc/ie.css" type="text/css">
-<![endif]-->
+<link type="text/css" rel="stylesheet" href="/doc/style.css">
<script type="text/javascript" src="/doc/godocs.js"></script>
{{if .SearchBox}}
<link rel="search" type="application/opensearchdescription+xml" title="godoc" href="/opensearch.xml" />
{{end}}
</head>
<body>
-<div id="container">
- <div id="topnav">
- <h1 id="title">The Go Programming Language</h1>
- <div id="nav-main">
- <ul>
- <li><a href="/">Home</a></li><li><a href="/doc/install.html">Getting Started</a></li><li><a href="/doc/docs.html">Documentation</a></li><li><a href="/doc/contrib.html">Contributing</a></li><li><a href="/doc/community.html">Community</a></li>
- </ul>
- <div class="quickref">
- <form method="GET" action="/search">
- {{range .PkgRoots}}
- <a href="/pkg/{{html .}}">{{html .}}</a> <span class="sep">|</span>
- {{else}}
- References:
- {{end}}
- <a href="/pkg/">Packages</a> <span class="sep">|</span>
- <a href="/cmd/">Commands</a> <span class="sep">|</span>
- <a href="/doc/go_spec.html">Specification</a>
- {{if .SearchBox}}
- <input id="search" type="search" name="q" value="{{with .Query}}{{html .}}{{end}}" class="{{if not .Query}}inactive{{end}}" placeholder="code search" results="0" />
- {{end}}
- </form>
- </div>
- </div>
- <a id="logo-box" href="/"></a>
- </div>
- <div id="content">
- <!-- Menu is HTML-escaped elsewhere -->
- {{with .Menu}}
- <div id="menu">
- {{printf "%s" .}}
- </div>
- {{end}}
- {{with .Title}}
- <h1 id="generatedHeader">{{html .}}</h1>
- {{end}}
- {{with .Subtitle}}
- <span class="subtitle">{{html .}}</span>
- {{end}}
+<div id="topbar"><div class="container">
- <!-- The Table of Contents is automatically inserted in this <div>.
- Do not delete this <div>. -->
- <div id="nav"></div>
+<form method="GET" action="/search">
+<div id="heading"><a href="/">The Go Programming Language</a></div>
+<div id="menu">
+<a href="/doc/">Learn</a>
+<a href="/install/">Install</a>
+<a href="/project/">Project</a>
+<a href="/doc/reference.html">Reference</a>
+<input type="text" id="search" name="q" class="inactive" value="Search">
+</div>
+</form>
+
+</div></div>
+
+<div id="page">
+
+<div id="content">
+
+{{with .Title}}
+ <div id="plusone"><g:plusone size="small" annotation="none"></g:plusone></div>
+ <h1>{{html .}}</h1>
+{{end}}
+{{with .Subtitle}}
+ <h2>{{html .}}</h2>
+{{end}}
+
+{{/* The Table of Contents is automatically inserted in this <div>.
+ Do not delete this <div>. */}}
+<div id="nav"></div>
+
+{{/* Content is HTML-escaped elsewhere */}}
+{{printf "%s" .Content}}
+
+</div>
- <!-- Content is HTML-escaped elsewhere -->
- {{printf "%s" .Content}}
- </div>
- <div id="site-info">
- <p>Build version {{html .Version}}. Except as noted, this content is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 License</a>.</p>
- </div>
</div>
+
+<div id="copyright">
+Build version {{html .Version}}.
+Except as noted, this content is licensed under a
+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;
+ po.src = 'https://apis.google.com/js/plusone.js';
+ 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 afb0d4ae1f..f4b6a0b7e3 100644
--- a/lib/godoc/package.html
+++ b/lib/godoc/package.html
@@ -50,19 +50,18 @@
{{if .Bugs}}
<dd><a href="#Bugs">Bugs</a></dd>
{{end}}
- <dd>
- {{with .Filenames}}
- <h4>Package files</h4>
- <p>
- <span style="font-size:90%">
- {{range .}}
- <a href="/{{.|srcLink}}">{{.|filename|html}}</a>
- {{end}}
- </span>
- </p>
- {{end}}
- </dd>
</dl>
+
+ {{with .Filenames}}
+ <h4>Package files</h4>
+ <p>
+ <span style="font-size:90%">
+ {{range .}}
+ <a href="/{{.|srcLink}}">{{.|filename|html}}</a>
+ {{end}}
+ </span>
+ </p>
+ {{end}}
{{with .Consts}}
<h2 id="constants">Constants</h2>
@@ -147,30 +146,23 @@
{{/* DirList entries are numbers and strings - no need for FSet */}}
<h2 id="subdirectories">Subdirectories</h2>
<p>
- <table class="layout">
+ <table class="dir">
<tr>
- {{if $.DirFlat}}
- <th align="left">Name</th>
- {{else}}
- <th align="left" colspan="{{html .MaxHeight}}">Name</th>
- {{end}}
- <th width="25"></th>
- <th align="left">Synopsis</th>
+ <th>Name</th>
+ <th>&nbsp;&nbsp;&nbsp;&nbsp;</th>
+ <th style="text-align: left; width: auto">Synopsis</th>
</tr>
<tr>
- <td align="left"><a href="..">..</a></td>
+ <td><a href="..">..</a></td>
</tr>
{{range .List}}
- <tr>
- {{if $.DirFlat}}
- <td align="left"><a href="{{html .Path}}">{{html .Path}}</a></td>
- {{else}}
- {{repeat `<td width="20"></td>` .Depth}}
- <td align="left" colspan="{{html .Height}}"><a href="{{html .Path}}">{{html .Name}}</a></td>
- {{end}}
- <td></td>
- <td align="left">{{html .Synopsis}}</td>
- </tr>
+ <tr>
+ <td>
+ {{repeat `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` .Depth}}<a href="{{html .Path}}">{{html .Name}}</a>
+ </td>
+ <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+ <td style="width: auto">{{html .Synopsis}}</td>
+ </tr>
{{end}}
</table>
</p>