[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-35-gca0b192

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ca0b192713a2a4694394fa7b2dfbfaa96cb6f6b1 (commit)
       via  82e5ab9e14b81e0d21ef61f503a2b4c8638776e8 (commit)
      from  6a98f43c2894bbf324ae31311e5e0ef021a2c3b3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca0b192713a2a4694394fa7b2dfbfaa96cb6f6b1
commit ca0b192713a2a4694394fa7b2dfbfaa96cb6f6b1
Merge: 6a98f43 82e5ab9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 8 08:25:27 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 8 08:25:27 2017 -0500

    Merge topic 'doc-cmake.org-version-switch' into next
    
    82e5ab9e Utilities/Sphinx: Add option for cmake.org version switch to html


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82e5ab9e14b81e0d21ef61f503a2b4c8638776e8
commit 82e5ab9e14b81e0d21ef61f503a2b4c8638776e8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 8 08:13:43 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 8 08:19:10 2017 -0500

    Utilities/Sphinx: Add option for cmake.org version switch to html
    
    Leave the option undocumented since it is not for general use.  We can
    simply pass it through `SPHINX_FLAGS` when building for publication on
    `cmake.org`.

diff --git a/Utilities/Sphinx/templates/layout.html b/Utilities/Sphinx/templates/layout.html
index 177e044..be2660c 100644
--- a/Utilities/Sphinx/templates/layout.html
+++ b/Utilities/Sphinx/templates/layout.html
@@ -8,10 +8,22 @@
     <a href="https://cmake.org/">CMake</a>{{ reldelim1 }}
   </li>
   <li>
+    {%- if versionswitch is defined %}
+    <span class="version_switch">{{ release }}</span>
+    <a href="{{ pathto(master_doc) }}">{% trans %}Documentation{% endtrans %}</a>{{ reldelim1 }}
+    {%- else %}
     <a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}
+    {%- endif %}
   </li>
 {% endblock %}
 
+{% block extrahead %}
+  {% if versionswitch is defined %}
+  <script type="text/javascript" src="{{ pathto('../version_switch.js', 1) }}"></script>
+  {% endif %}
+{{ super() }}
+{% endblock %}
+
 {# Put some context in the html title element. Workaround for #}
 {# https://bitbucket.org/birkenfeld/sphinx/issue/1492/qthelp-generate-html-title-element-should #}
 {% block htmltitle %}

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Sphinx/templates/layout.html |   12 ++++++++++++
 1 file changed, 12 insertions(+)


hooks/post-receive
-- 
CMake