From: Tom Yu <tlyu@mit.edu>
Date: Fri, 18 Jan 2013 20:45:52 +0000 (-0500)
Subject: Refactor rellinks formatting in layout.html
X-Git-Tag: krb5-1.12-alpha1~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7fc3fe5bf37e29acdcf164238fdb11a79983755;p=thirdparty%2Fkrb5.git

Refactor rellinks formatting in layout.html
---

diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 66396b5d29..6dc41cd1b5 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -4,9 +4,17 @@
                   [('index', 'Full Table of Contents', 'C', 'Contents')] %}
 {% set css_files = css_files + ["_static/kerb.css"] %}
 
-{# Add a "feedback" button to the footer #}
-{% macro feedback_rellinks() %}
-    <div class="footer-wrapper" >
+{# Add a "feedback" button to the rellinks #}
+{%- macro feedback_rellinks() %}
+    {%- for rellink in rellinks|reverse %}
+        <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
+            {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>{{ reldelim2 }}
+    {%- endfor %}
+    <a href="mailto:krb5-bugs@mit.edu?subject=Documentation__{{ title }}">feedback</a>
+{%- endmacro %}
+
+{% block footer %}
+    <div class="footer-wrapper">
         <div class="footer" >
             <div class="right" ><i>Release: {{ release }}</i><br />
             {%- if show_copyright %}
@@ -17,22 +25,12 @@
               {%- endif %}
             {%- endif %}
             </div>
-            <div class="left" >
-                {%- for rellink in rellinks|reverse %}
-                    <a href="{{ pathto(rellink[0]) }}"
-                    title="{{ rellink[1]|striptags }}"
-                    {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
-                    {{ reldelim2 }}
-                {%- endfor %}
-                {%- block rootrellink %}
-                    <a href="mailto:krb5-bugs@mit.edu?subject=Documentation__{{ title }}">feedback</a>
-                {%- endblock %}
+            <div class="left">
+                {{ feedback_rellinks() }}
             </div>
         </div>
     </div>
-{%- endmacro %}
-
-{% block footer %} {{ feedback_rellinks() }}{% endblock %}
+{% endblock %}
 
 {% block header %}
     <div class="header-wrapper">
@@ -48,13 +46,7 @@
             <h1><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a></h1>
             {% endblock %}
             <div class="rel">
-                {%- for rellink in rellinks|reverse %}
-                    <a href="{{ pathto(rellink[0]) }}"
-                    title="{{ rellink[1]|striptags }}"
-                    {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
-                    {{ reldelim2 }}
-                {%- endfor %}
-                <a href="mailto:krb5-bugs@mit.edu?subject=Documentation__{{ title }}">feedback</a>
+                {{ feedback_rellinks() }}
             </div>
         </div>
     </div>