diff options
| -rw-r--r-- | sphinx/themes/agogo/layout.html | 6 | ||||
| -rw-r--r-- | sphinx/themes/basic/domainindex.html | 2 | ||||
| -rw-r--r-- | sphinx/themes/basic/layout.html | 10 | ||||
| -rw-r--r-- | sphinx/themes/basic/opensearch.xml | 2 | ||||
| -rw-r--r-- | sphinx/themes/haiku/layout.html | 4 | ||||
| -rw-r--r-- | sphinx/themes/pyramid/layout.html | 2 | ||||
| -rw-r--r-- | sphinx/themes/scrolls/layout.html | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/sphinx/themes/agogo/layout.html b/sphinx/themes/agogo/layout.html index aca2e1e33..26c37b10e 100644 --- a/sphinx/themes/agogo/layout.html +++ b/sphinx/themes/agogo/layout.html @@ -15,7 +15,7 @@ <div class="header"> {%- if logo %} <p class="logo"><a href="{{ pathto(master_doc)|e }}"> - <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/> + <img class="logo" src="{{ pathto('_static/' + logo, 1)|e }}" alt="Logo"/> </a></p> {%- endif %} {%- block headertitle %} @@ -24,7 +24,7 @@ {%- endblock %} <div class="rel" role="navigation" aria-label="related navigation"> {%- for rellink in rellinks|reverse %} - <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}" + <a href="{{ pathto(rellink[0])|e }}" title="{{ rellink[1]|striptags|e }}" {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a> {%- if not loop.last %}{{ reldelim2 }}{% endif %} {%- endfor %} @@ -78,7 +78,7 @@ <div class="left"> <div role="navigation" aria-label="related navigaton"> {%- for rellink in rellinks|reverse %} - <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}" + <a href="{{ pathto(rellink[0])|e }}" title="{{ rellink[1]|striptags|e }}" {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a> {%- if not loop.last %}{{ reldelim2 }}{% endif %} {%- endfor %} diff --git a/sphinx/themes/basic/domainindex.html b/sphinx/themes/basic/domainindex.html index 931435f49..f4f742338 100644 --- a/sphinx/themes/basic/domainindex.html +++ b/sphinx/themes/basic/domainindex.html @@ -43,7 +43,7 @@ id="toggle-{{ groupid.next() }}" style="display: none" alt="-" /> {%- endif %}</td> <td>{% if grouptype == 2 %}   {% endif %} - {% if page %}<a href="{{ pathto(page) }}#{{ anchor }}">{% endif -%} + {% if page %}<a href="{{ pathto(page)|e }}#{{ anchor }}">{% endif -%} <code class="xref">{{ name|e }}</code> {%- if page %}</a>{% endif %} {%- if extra %} <em>({{ extra|e }})</em>{% endif -%} diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html index 812420eaf..1da2291df 100644 --- a/sphinx/themes/basic/layout.html +++ b/sphinx/themes/basic/layout.html @@ -32,7 +32,7 @@ <ul> {%- for rellink in rellinks %} <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}> - <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}" + <a href="{{ pathto(rellink[0])|e }}" title="{{ rellink[1]|striptags|e }}" {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a> {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li> {%- endfor %} @@ -54,7 +54,7 @@ {%- block sidebarlogo %} {%- if logo %} <p class="logo"><a href="{{ pathto(master_doc)|e }}"> - <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/> + <img class="logo" src="{{ pathto('_static/' + logo, 1)|e }}" alt="Logo"/> </a></p> {%- endif %} {%- endblock %} @@ -94,13 +94,13 @@ {%- endmacro %} {%- macro css() %} - <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> + <link rel="stylesheet" href="{{ pathto('_static/' + style, 1)|e }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" /> {%- for css in css_files %} {%- if css|attr("filename") %} {{ css_tag(css) }} {%- else %} - <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" /> + <link rel="stylesheet" href="{{ pathto(css, 1)|e }}" type="text/css" /> {%- endif %} {%- endfor %} {%- endmacro %} @@ -139,7 +139,7 @@ href="{{ pathto('_static/opensearch.xml', 1) }}"/> {%- endif %} {%- if favicon %} - <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/> + <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1)|e }}"/> {%- endif %} {%- endif %} {%- block linktags %} diff --git a/sphinx/themes/basic/opensearch.xml b/sphinx/themes/basic/opensearch.xml index bac08b4a2..0cad2967c 100644 --- a/sphinx/themes/basic/opensearch.xml +++ b/sphinx/themes/basic/opensearch.xml @@ -7,7 +7,7 @@ template="{{ use_opensearch }}/{{ pathto('search') }}?q={searchTerms}"/> <LongName>{{ docstitle|e }}</LongName> {%- if favicon %} - <Image height="16" width="16" type="image/x-icon">{{ use_opensearch }}/{{ pathto('_static/' + favicon, 1) }}</Image> + <Image height="16" width="16" type="image/x-icon">{{ use_opensearch }}/{{ pathto('_static/' + favicon, 1)|e }}</Image> {%- endif %} {% block extra %} {# Put e.g. an <Image> element here. #} {% endblock %} </OpenSearchDescription> diff --git a/sphinx/themes/haiku/layout.html b/sphinx/themes/haiku/layout.html index f833cf509..c47b8eccc 100644 --- a/sphinx/themes/haiku/layout.html +++ b/sphinx/themes/haiku/layout.html @@ -36,11 +36,11 @@ {%- block haikuheader %} {%- if theme_full_logo != "false" %} <a href="{{ pathto('index') }}"> - <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/> + <img class="logo" src="{{ pathto('_static/' + logo, 1)|e }}" alt="Logo"/> </a> {%- else %} {%- if logo -%} - <img class="rightlogo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/> + <img class="rightlogo" src="{{ pathto('_static/' + logo, 1)|e }}" alt="Logo"/> {%- endif -%} <h1 class="heading"><a href="{{ pathto('index') }}"> <span>{{ shorttitle|e }}</span></a></h1> diff --git a/sphinx/themes/pyramid/layout.html b/sphinx/themes/pyramid/layout.html index f1d3984dc..02eec1cfb 100644 --- a/sphinx/themes/pyramid/layout.html +++ b/sphinx/themes/pyramid/layout.html @@ -13,7 +13,7 @@ <div class="header" role="banner"> <div class="logo"> <a href="{{ pathto(master_doc)|e }}"> - <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/> + <img class="logo" src="{{ pathto('_static/' + logo, 1)|e }}" alt="Logo"/> </a> </div> </div> diff --git a/sphinx/themes/scrolls/layout.html b/sphinx/themes/scrolls/layout.html index 7474f6f31..7866a5162 100644 --- a/sphinx/themes/scrolls/layout.html +++ b/sphinx/themes/scrolls/layout.html @@ -30,7 +30,7 @@ {%- if prev %} <a href="{{ prev.link|e }}">« {{ prev.title }}</a> | {%- endif %} - <a href="{{ pathto(current_page_name) if current_page_name else '#' }}">{{ title }}</a> + <a href="{{ pathto(current_page_name)|e if current_page_name else '#' }}">{{ title }}</a> {%- if next %} | <a href="{{ next.link|e }}">{{ next.title }} »</a> {%- endif %} |
