From eb3af25e573199706ec009a5a93253caeb3477dd Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Wed, 30 Nov 2011 20:16:09 -0800
Subject: [PATCH] Fine-tuning the Sphinx layout to better match www.

Still needs some more tweaking, but it's getting there.
---
 doc/_static/broxygen-extra.css |  12 +++++
 doc/_static/logo-bro.png       | Bin 0 -> 10869 bytes
 doc/_templates/layout.html     |  81 ++++++++++++++++++++++++++++++---
 doc/conf.py.in                 |  30 ++----------
 doc/index.rst                  |   4 +-
 5 files changed, 92 insertions(+), 35 deletions(-)
 create mode 100644 doc/_static/logo-bro.png

diff --git a/doc/_static/broxygen-extra.css b/doc/_static/broxygen-extra.css
index dd56416783..d873e286bc 100644
--- a/doc/_static/broxygen-extra.css
+++ b/doc/_static/broxygen-extra.css
@@ -1,3 +1,15 @@
 .highlight {
     background-color: #ffffff;
 }
+
+h1 {
+    font-weight: bold;
+    font-size: 32px;
+	line-height:32px;
+    text-align: center;
+    padding-top: 3px;
+    margin-bottom: 30px;
+    font-family: Palatino,'Palatino Linotype',Georgia,serif;;
+    color: #000;
+    border-bottom: 0px;
+}
diff --git a/doc/_static/logo-bro.png b/doc/_static/logo-bro.png
new file mode 100644
index 0000000000000000000000000000000000000000..96cc5d443c9efbe03b0905fcd965e37e8c9bf021
GIT binary patch
literal 10869
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
LNkvXXu0mjf*c*iH

literal 0
HcmV?d00001

diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 8edeeb07b6..cb6181361d 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block header %}
-<iframe src="http://www.bro-ids.org/frames/header.html" width="100%" height="100px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0">
+<iframe src="http://www.bro-ids.org/frames/header-no-logo.html" width="100%" height="100px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0">
 </iframe>
 {% endblock %}
 
@@ -17,15 +17,82 @@
 {% block relbar1 %}{% endblock %}
 
 {% block content %}
-<div id="bro-main" class="clearfix">
-    <div class="container_12">
-        {{ super() }}
-    </div>
-</div>
+
+        <div id="bro-main" class="clearfix">
+            <div class="container_12">
+
+                <div class="grid_9">
+
+                    <div>
+                         {{ relbar() }}
+                    </div>
+
+                    <div class="body">
+                        {% block body %}
+                        {% endblock %}
+                    </div>
+                </div>
+
+                <!-- Sidebar -->
+                <div class="grid_3 omega">
+
+                    <div>
+                        <img id="logo" src="{{pathto('_static/logo-bro.png', 1)}}" alt="Logo" />
+                    </div>
+                    <br />
+
+
+                    <div class="widget sidebar-toc">
+                        <h3 class="widgettitle">
+                            Table of Contents
+                        </h3>
+                        <p>
+                            <ul>{{toc}}</ul>
+                        </p>
+                    </div>
+
+                    {% if next %}
+                    <div class="widget">
+                        <h3 class="widgettitle">
+                            Next Page
+                        </h3>
+                        <p>
+                            <a href="{{ next.link|e }}">{{ next.title }}</a>
+                        </p>
+                    </div>
+                    {% endif %}
+
+                    {% if prev %}
+                    <div class="widget">
+                        <h3 class="widgettitle">
+                            Previous Page
+                        </h3>
+                        <p>
+                            <a href="{{ prev.link|e }}">{{ prev.title }}</a>
+                        </p>
+                    </div>
+                    {% endif %}
+
+                </div>
+            </div>
+
+            <div class="container_12">
+                <div class="grid_12 alpha omega">
+                    <div class="center">
+                        <small>
+                            Copyright {{ copyright }}.
+                            Last updated on {{ last_updated }}.
+                            Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.
+                        </small>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
 {% endblock %}
 
 {% block footer %}
-{{ super() }}
 <iframe src="http://www.bro-ids.org/frames/footer.html" width="100%" height="420px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0">
 </iframe>
 {% endblock %}
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 8844370a07..8959c0b2c9 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -90,44 +90,20 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'basic'
 
 html_last_updated_fmt = '%B %d, %Y'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
-"rightsidebar": "true",
-"stickysidebar": "false",
-"externalrefs": "false",
-"footerbgcolor": "#333",
-"footertextcolor": "#ddd",
-"sidebarbgcolor": "#ffffff",
-#"sidebarbtncolor": "",
-"sidebartextcolor": "#333",
-"sidebarlinkcolor": "#2a85a7",
-"relbarbgcolor": "#ffffff",
-"relbartextcolor": "#333",
-"relbarlinkcolor": "#2a85a7",
-"bgcolor": "#ffffff",
-"textcolor": "#333",
-"linkcolor": "#2a85a7",
-"visitedlinkcolor": "#2a85a7",
-"headbgcolor": "#f0f0f0",
-"headtextcolor": "#000",
-"headlinkcolor": "#2a85a7",
-"codebgcolor": "#FFFAE2",
-#"codetextcolor": "",
-"bodyfont": "Arial, Helvetica, sans-serif",
-"headfont": "Palatino,'Palatino Linotype',Georgia,serif",
-}
+html_theme_options = { }
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
+# "<project> v<release> Documentation".
 #html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
diff --git a/doc/index.rst b/doc/index.rst
index ad503af50b..a5af2a4f8d 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,9 +1,11 @@
 .. Bro documentation master file
 
+=================
 Bro Documentation
 =================
 
-Documentation for version: |version|
+Guides
+------
 
 .. toctree::
    :maxdepth: 1