commit 174d39e9e5b6825da3ebb0490b3ebffb7d858fff Author: Damian Johnson atagar@torproject.org Date: Sun Apr 7 11:33:49 2013 -0700

Replacing paging nav bar with categories

Sphinx wants the layout of sites to be like a book, with a 'previous' and 'next' page. I'm at a loss for how that could possibly be a good idea. Sites like stem's have categories (tutorial, api, download, etc) which our navbar should provide a quick method to access. --- docs/_static/haiku.css_t | 2 -- docs/_templates/layout.html | 20 +++++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/_static/haiku.css_t b/docs/_static/haiku.css_t index 93007df..28be8f4 100644 --- a/docs/_static/haiku.css_t +++ b/docs/_static/haiku.css_t @@ -160,7 +160,6 @@ div.topnav p { margin-left: 40px; margin-right: 40px; margin-bottom: 0px; - text-align: right; font-size: 0.8em; } div.bottomnav { @@ -168,7 +167,6 @@ div.bottomnav { } div.bottomnav p { margin-right: 40px; - text-align: right; font-size: 0.8em; }

diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index c625808..1b87971 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -19,15 +19,17 @@ <p> {%- block haikurel1 %} {%- endblock %} - {%- if prev %} - «&#160;&#160;<a href="{{ prev.link|e }}">{{ prev.title }}</a> - &#160;&#160;::&#160;&#160; - {%- endif %} - <a class="uplink" href="{{ pathto(master_doc) }}">{{ _('Contents') }}</a> - {%- if next %} - &#160;&#160;::&#160;&#160; - <a href="{{ next.link|e }}">{{ next.title }}</a>&#160;&#160;» - {%- endif %} + <a class="uplink" href="{{ pathto(master_doc) }}">Home</a> + &#160;&#160;|&#160;&#160; + <a class="uplink" href="{{ pathto('tutorials') }}">Tutorials</a> + &#160;&#160;|&#160;&#160; + <a class="uplink" href="{{ pathto('api') }}">API</a> + &#160;&#160;|&#160;&#160; + <a class="uplink" href="https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs">Bug Tracker</a> + &#160;&#160;|&#160;&#160; + <a class="uplink" href="{{ pathto('change_log') }}">Change Log</a> + &#160;&#160;|&#160;&#160; + <a class="uplink" href="{{ pathto('download') }}">Download</a> {%- block haikurel2 %} {%- endblock %} </p>