From 747febb1c445fac82d7ea08175ad1e901b335909 Mon Sep 17 00:00:00 2001
From: Sam Kleinman <samk@10gen.com>
Date: Fri, 3 Aug 2012 18:45:59 -0400
Subject: [PATCH 1/4] theme: nav revision

---
 themes/mongodb/localtoc.html             |  9 ---------
 themes/mongodb/pagenav.html              | 10 +++++++---
 themes/mongodb/static/mongodb-docs.css_t |  8 ++++++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/themes/mongodb/localtoc.html b/themes/mongodb/localtoc.html
index ffe4b7786a9..bd560579bce 100644
--- a/themes/mongodb/localtoc.html
+++ b/themes/mongodb/localtoc.html
@@ -8,12 +8,3 @@
     :license: BSD, see LICENSE for details.
 #}
 
-{%- if pagename != "search" %}
-<h3>{{ _('Contents') }}</h3>
-{{ toc }}
-{% endif %}
-
-<ul class="this-page-menu">
-  {%- if prev %}<li><strong>Previous:</strong> <a href="{{ prev.link|e }}" title="{{ _('previous chapter') }}">{{ prev.title }}</a></li>{%- endif %}
-  {%- if next %}<li><strong>Next:</strong> <a href="{{ next.link|e }}" title="{{ _('next chapter') }}">{{ next.title }}</a></li>{%- endif %}
-</ul>
diff --git a/themes/mongodb/pagenav.html b/themes/mongodb/pagenav.html
index 8a26dd14bc0..cf8b32e000e 100644
--- a/themes/mongodb/pagenav.html
+++ b/themes/mongodb/pagenav.html
@@ -9,13 +9,17 @@
     :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-<h3>{{ _('Manual') }}</h3>
-{{ toctree(maxdepth=1) }}
+<h3><a href="{{ pathto(master_doc) }}">{{ _('Contents') }}</a></h3>
+
+{{ toctree(maxdepth=-1) }}
+
 <ul class="this-page-menu">
+  {%- if prev %}<li><strong>Previous:</strong> <a href="{{ prev.link|e }}" title="{{ _('previous chapter') }}">{{ prev.title }}</a></li>{%- endif %}
+  {%- if next %}<li><strong>Next:</strong> <a href="{{ next.link|e }}" title="{{ _('next chapter') }}">{{ next.title }}</a></li>{%- endif %}
   <li><strong>Home:</strong> <a href="{{ pathto('index') }}">{{ project|e }} Manual Home</a></li>
-  <li><strong>Contents:</strong> <a href="{{ pathto(master_doc) }}">{{ project|e }} Manual Contents</a></li>
   <li><strong>Index:</strong> <a href="{{ pathto('genindex') }}">{{ project|e }} Manual Index</a></li>
 </ul>
+
 <div id="searchbox" style="display: none">
   <h3>{{ _('Search') }}</h3>
     <p class="searchtip">{{ _('Search <strong>this</strong> manual.') }}
diff --git a/themes/mongodb/static/mongodb-docs.css_t b/themes/mongodb/static/mongodb-docs.css_t
index efce136a259..60d76c65b25 100644
--- a/themes/mongodb/static/mongodb-docs.css_t
+++ b/themes/mongodb/static/mongodb-docs.css_t
@@ -126,8 +126,8 @@ div.sphinxsidebar p.topless {
 }
 
 div.sphinxsidebar ul ul, div.sphinxsidebar ul.want-points {
-    list-style: square outside none;
-    margin-left: 15px;
+    list-style: none outside none;
+    margin-left: 10px;
 }
 
 div.sphinxsidebar ul {
@@ -298,3 +298,7 @@ p.first {
     margin-bottom: 0px !important;
     margin-top: 10px !important;
 }
+
+div.sphinxsidebar ul.current a.current {
+    font-weight: bold;
+}

From 2f3e6ec7f2780a914431385f9da8af71be4433e5 Mon Sep 17 00:00:00 2001
From: Sam Kleinman <samk@10gen.com>
Date: Fri, 3 Aug 2012 20:30:17 -0400
Subject: [PATCH 2/4] theme: removing redundant links

---
 themes/mongodb/pagenav.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/themes/mongodb/pagenav.html b/themes/mongodb/pagenav.html
index cf8b32e000e..e4186d5e35a 100644
--- a/themes/mongodb/pagenav.html
+++ b/themes/mongodb/pagenav.html
@@ -16,8 +16,6 @@ <h3><a href="{{ pathto(master_doc) }}">{{ _('Contents') }}</a></h3>
 <ul class="this-page-menu">
   {%- if prev %}<li><strong>Previous:</strong> <a href="{{ prev.link|e }}" title="{{ _('previous chapter') }}">{{ prev.title }}</a></li>{%- endif %}
   {%- if next %}<li><strong>Next:</strong> <a href="{{ next.link|e }}" title="{{ _('next chapter') }}">{{ next.title }}</a></li>{%- endif %}
-  <li><strong>Home:</strong> <a href="{{ pathto('index') }}">{{ project|e }} Manual Home</a></li>
-  <li><strong>Index:</strong> <a href="{{ pathto('genindex') }}">{{ project|e }} Manual Index</a></li>
 </ul>
 
 <div id="searchbox" style="display: none">

From 43a1cad5df9f1771193dc8e86515ca8ff09ea70b Mon Sep 17 00:00:00 2001
From: Sam Kleinman <samk@10gen.com>
Date: Fri, 3 Aug 2012 20:45:29 -0400
Subject: [PATCH 3/4] theme: removing broken link to english version

---
 themes/mongodb/pagenav.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/mongodb/pagenav.html b/themes/mongodb/pagenav.html
index e4186d5e35a..4683e47e97b 100644
--- a/themes/mongodb/pagenav.html
+++ b/themes/mongodb/pagenav.html
@@ -51,7 +51,7 @@ <h3>Translations</h3>
 <ul class="translation-menu">
   <li><a href="http://jp.docs.mongodb.org/{{theme_manual_path}}/{%- if pagename == "index" %}{%- else %}{{pagename}}{%- endif %}" rel="nofollow">Japanese</a></li>
   <li><a href="http://cn.docs.mongodb.org/{{theme_manual_path}}/{%- if pagename == "index" %}{%- else %}{{pagename}}{%- endif %}" rel="nofollow">Chinese</a></li>
-  <li><a href="http://docs.mongodb.org/{{theme_manual_path}}/{%- if pagename == "index" %}{%- else %}{{pagename}}{%- endif %}" rel="nofollow">English</a></li>
+  <!-- <li><a href="http://docs.mongodb.org/{{theme_manual_path}}/{%- if pagename == "index" %}{%- else %}{{pagename}}{%- endif %}" rel="nofollow">English</a></li> -->
 </ul>
 
 <h3>Knowledge Base </h3>

From 66f8afbfd5fdc690f068ffb627fb3f92a01d727d Mon Sep 17 00:00:00 2001
From: Sam Kleinman <samk@10gen.com>
Date: Sat, 4 Aug 2012 10:03:26 -0400
Subject: [PATCH 4/4] minor: reducing hierarchical confusion.

---
 source/applications.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/applications.txt b/source/applications.txt
index 9bbd5e20a99..c915036d151 100644
--- a/source/applications.txt
+++ b/source/applications.txt
@@ -42,10 +42,8 @@ Application Development
 
 .. _aggregation-framework:
 
-Aggregation Framework
----------------------
-
-.. versionadded:: 2.1
+Aggregation
+-----------
 
 .. toctree::
    :maxdepth: 3