Add copyright footer to HTML docs

The technique we use for inserting the feedback link in the footer
overrides the Sphinx basic/layout.html and agogo/layout.html footers
in a way that prevents us from getting the copyright link footer.
Copy the relevant part of the Sphinx basic/layout.html for now.

Add a copyright.rst that links to mitK5license.rst.

ticket: 7510 (new)
target_version: 1.11
tags: pullup

diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 7bfdec6909fb164b23553468268192e4188b598b..4ec97c2ff5da18e30a24fc225d19ad8755e2ab15 100644 (file)
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -8,7 +8,14 @@
 {% macro feedback_rellinks() %}
     <div class="footer-wrapper" >
         <div class="footer" >
-            <div class="right" ><i>Release: {{ release }} </i>
+            <div class="right" ><i>Release: {{ release }}</i><br />
+            {%- if show_copyright %}
+              {%- if hasdoc('copyright') %}
+                {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
+              {%- else %}
+                {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
+              {%- endif %}
+            {%- endif %}
             </div>
             <div class="left" >
                 {%- for rellink in rellinks|reverse %}

diff --git a/doc/copyright.rst b/doc/copyright.rst
new file mode 100644 (file)
index 0000000..b98c414
--- /dev/null
+++ b/doc/copyright.rst
@@ -0,0 +1,8 @@
+Copyright
+=========
+
+Copyright |copy| 1985-2012 by the Massachusetts Institute of
+Technology and its contributors.  All rights reserved.
+
+See :ref:`mitK5license` for additional copyright and license
+information.

diff --git a/doc/mitK5license.rst b/doc/mitK5license.rst
index 6b837b90f29d59c096806719194c1eed833acfe4..e23edbfb29f3f7c497105b8a8cc0cd1441425687 100644 (file)
--- a/doc/mitK5license.rst
+++ b/doc/mitK5license.rst
@@ -3,4 +3,9 @@
 MIT Kerberos License information
 ================================
 
+.. toctree::
+    :hidden:
+
+    copyright.rst
+
 .. include::  notice.rst

diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 1986f8f7cbd6563caab38b32acb4a61b29b9e881..4b3ae167f0d87f05551c3b0fdf6c5bc5f1830a26 100644 (file)
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -24,6 +24,7 @@ RST_SOURCES= _static \
        user \
        about.rst \
        build_this.rst \
+       copyright.rst \
        mitK5defaults.rst \
        mitK5features.rst \
        mitK5license.rst \