Merge branch '1485-rtd-theme'

dev-requirements.txt

@@ -10,3 +10,4 @@ polib==1.0.3
 mock==1.0.1
 factory-boy==2.1.1
 coveralls==0.3
+sphinx_rtd_theme==0.1.5

doc/_templates/footer.html

@@ -1,29 +1,51 @@
-<p>An <a href="http://okfn.org">Open Knowledge Foundation</a> project.</p>
+<footer>
+  {% if next or prev %}
+    <div class="rst-footer-buttons" role="navigation"
+         aria-label="footer navigation">
+      {% if next %}
+        <a href="{{ next.link|e }}" class="btn btn-neutral float-right"
+           title="{{ next.title|striptags|e }}"/>
+           Next <span class="icon icon-circle-arrow-right"></span></a>
+      {% endif %}
+      {% if prev %}
+        <a href="{{ prev.link|e }}" class="btn btn-neutral"
+           title="{{ prev.title|striptags|e }}">
+           <span class="icon icon-circle-arrow-left"></span> Previous</a>
+      {% endif %}
+    </div>
+  {% endif %}
 
-<p class="copyright">
-{%- if show_copyright %}
-  {% trans copyright=copyright|safe|e %}{{ copyright }}{% endtrans %}<br/>
-{%- endif %}
-</p>
+  <hr></hr>
 
-<p>
-<a href="https://github.com/ckan/ckan">Source</a>
-&mdash;
-<a href="https://github.com/ckan/ckan/issues">Issues</a>
-&mdash;
-<a href="http://lists.okfn.org/mailman/listinfo/ckan-dev">Mailing List</a>
-&mdash;
-<a href="http://twitter.com/CKANProject">Twitter @CKANProject</a>
-</p>
+  <p>An <a href="http://okfn.org">Open Knowledge Foundation</a> project.</p>
 
-<p>
-Related Projects:
-<a href="http://thedatahub.org/">The DataHub</a>
-&mdash;
-<a href="http://datacatalogs.org">DataCatalogs.org</a>
-&mdash;
-<a href="http://openspending.org">OpenSpending.org</a>
-&mdash;
-<a href="http://opendatahandbook.org">Open Data Handbook</a>
-</p>
+  <p class="copyright">
+    {%- if show_copyright %}
+      {% trans copyright=copyright|safe|e %}{{ copyright }}{% endtrans %}
+    {%- endif %}
+  </p>
 
+  <p>
+    <a href="https://github.com/ckan/ckan">Source</a>
+    &mdash;
+    <a href="https://github.com/ckan/ckan/issues">Issues</a>
+    &mdash;
+    <a href="http://lists.okfn.org/mailman/listinfo/ckan-dev">Mailing List</a>
+    &mdash;
+    <a href="http://twitter.com/CKANProject">Twitter @CKANProject</a>
+  </p>
+
+  <p>
+    Related Projects:
+    <a href="http://thedatahub.org/">The DataHub</a>
+    &mdash;
+    <a href="http://datacatalogs.org">DataCatalogs.org</a>
+    &mdash;
+    <a href="http://openspending.org">OpenSpending.org</a>
+    &mdash;
+    <a href="http://opendatahandbook.org">Open Data Handbook</a>
+  </p>
+
+
+  {% trans %}<a href="https://github.com/snide/sphinx_rtd_theme">Sphinx theme</a>  provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}
+</footer>

doc/conf.py

@@ -236,22 +236,11 @@ def write_latest_release_file():
 
 # Options for HTML output
 # -----------------------
-
-#html_theme = 'default'
-#html_theme_options = {
-#"relbarbgcolor": "#777",
-#'sidebarbgcolor': '#F2F2F2',
-#'sidebartextcolor': 'black',
-#'sidebarlinkcolor': '#355F7C',
-#'headfont': 'Trebuchet MS'
-#}
-sys.path.append(os.path.abspath('_themes'))
-html_theme_path = ['_themes']
-html_theme = 'sphinx-theme-okfn'
-html_theme_options = {
-        'logo_icon': 'ckanlogo.png',
-        'show_version': True
-    }
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+if not on_rtd:
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 html_sidebars = {
     '**':  ['globaltoc.html'],