Merge of branch python_2.1.0_vincent branch to fix sphinx warnings and issue with new version of sphinx

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3545 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 1bae865ddef6b92c5c3426bbbb8172e876b6d8d2

1 files changed, 6 insertions, 7 deletions

diff --git a/src/cython/doc/_templates/layout.html b/src/cython/doc/_templates/layout.html
index 613d7d06..081d2dda 100644
--- a/src/cython/doc/_templates/layout.html
+++ b/src/cython/doc/_templates/layout.html
@@ -56,6 +56,12 @@
             </a></p>
           {%- endif %}
           {%- endblock %}
+            <h2><a href="index.html">GUDHI</a></h2>
+            <h2><a href="fileformats.html">File formats</a></h2>
+            <h2><a href="installation.html">GUDHI installation</a></h2>
+            <h2><a href="citation.html">Acknowledging the GUDHI library</a></h2>
+            <h2><a href="genindex.html">Index</a></h2>
+            <h2><a href="examples.html">Examples</a></h2>
           {%- if sidebars != None %}
             {#- new style sidebar: explicitly include/exclude templates #}
             {%- for sidebartemplate in sidebars %}
@@ -64,13 +70,6 @@
           {%- else %}
             {#- old style sidebars: using blocks -- should be deprecated #}
             {%- block sidebartoc %}
-<h2><a href="index.html">GUDHI</a></h2>
-<h2><a href="fileformats.html">File formats</a></h2>
-<h2><a href="installation.html">GUDHI installation</a></h2>
-<h2><a href="citation.html">Acknowledging the GUDHI library</a></h2>
-<h2><a href="genindex.html">Index</a></h2>
-<h2><a href="examples.html">Examples</a></h2>
-
             {%- include "localtoc.html" %}
             {%- endblock %}
             {%- block sidebarrel %}