krb5 commit: Add copyright footer to HTML docs

Tom Yu tlyu at MIT.EDU
Mon Dec 17 18:23:45 EST 2012


https://github.com/krb5/krb5/commit/49d31402d77744a58dcd03808a94361ef011a594
commit 49d31402d77744a58dcd03808a94361ef011a594
Author: Tom Yu <tlyu at mit.edu>
Date:   Mon Dec 17 15:44:27 2012 -0500

    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

 doc/_templates/layout.html |    9 ++++++++-
 doc/copyright.rst          |    8 ++++++++
 doc/mitK5license.rst       |    5 +++++
 src/doc/Makefile.in        |    1 +
 4 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 7bfdec6..4ec97c2 100644
--- 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
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 6b837b9..e23edbf 100644
--- 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 1986f8f..4b3ae16 100644
--- 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 \


More information about the cvs-krb5 mailing list