summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2021-05-20 18:23:39 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2021-05-20 18:24:26 (GMT)
commit32dc0630c43c081c9af15b02b2366516ad78a868 (patch)
tree2a83d9b37f74ca3930fcb015fa61253d333c2e08 /templates
parente6f54449c5b688cdc6647f80558d67dcaa03b30d (diff)
downloadDoxygen-32dc0630c43c081c9af15b02b2366516ad78a868.zip
Doxygen-32dc0630c43c081c9af15b02b2366516ad78a868.tar.gz
Doxygen-32dc0630c43c081c9af15b02b2366516ad78a868.tar.bz2
Make templated HTML output more similar to hardcoded output.
Diffstat (limited to 'templates')
-rw-r--r--templates/html/htmlallmembers.tpl3
-rw-r--r--templates/html/htmlannotated.tpl2
-rw-r--r--templates/html/htmlbase.tpl5
-rw-r--r--templates/html/htmlclasses.tpl1
-rw-r--r--templates/html/htmldeclcomp.tpl3
-rw-r--r--templates/html/htmldirtree.tpl17
-rw-r--r--templates/html/htmlexamples.tpl2
-rw-r--r--templates/html/htmlfiles.tpl2
-rw-r--r--templates/html/htmlhierarchy.tpl2
-rw-r--r--templates/html/htmlindexpages.tpl2
-rw-r--r--templates/html/htmljsnavpage.tpl20
-rw-r--r--templates/html/htmljsnavtree.tpl16
-rw-r--r--templates/html/htmllayout.tpl19
-rw-r--r--templates/html/htmlmemberindex.tpl13
-rw-r--r--templates/html/htmlmembersindex.tpl20
-rw-r--r--templates/html/htmlmodules.tpl2
-rw-r--r--templates/html/htmlnamespaces.tpl2
-rw-r--r--templates/html/htmlpages.tpl2
-rw-r--r--templates/html/nomatches.tpl13
19 files changed, 102 insertions, 44 deletions
diff --git a/templates/html/htmlallmembers.tpl b/templates/html/htmlallmembers.tpl
index b44110d..ed34131 100644
--- a/templates/html/htmlallmembers.tpl
+++ b/templates/html/htmlallmembers.tpl
@@ -9,8 +9,7 @@
<p>{{ tr.theListOfAllMembers }} <a class="el" href="{{ compound.fileName }}{{ config.HTML_FILE_EXTENSION }}">{{ compound.name }}</a>{{ tr.incInheritedMembers }}</p>
<table class="directory">
{% for mi in compound.allMembersList %}
- <tr class="{% cycle 'even' 'odd' %}">
- {% spaceless %}
+ <tr class="{% cycle 'even' 'odd' %}">{% spaceless %}
{% with member=mi.member %}
{% if member.language=='objc' %}
<td class="entry">
diff --git a/templates/html/htmlannotated.tpl b/templates/html/htmlannotated.tpl
index 2e4d40d..e3b8442 100644
--- a/templates/html/htmlannotated.tpl
+++ b/templates/html/htmlannotated.tpl
@@ -4,7 +4,7 @@
<div class="textblock">
{{ tr.classListDescription }}
</div>
-{% indexentry nav name=tr.classList file=page.fileName anchor='' isReference=False %}
+{% indexentry nav name=tr.classList file=page.fileName anchor='' isReference=False separateIndex=True %}
{% opensubindex nav %}
{% with tree=classTree %}
{% include 'htmldirtree.tpl' %}
diff --git a/templates/html/htmlbase.tpl b/templates/html/htmlbase.tpl
index 11cb054..6727da0 100644
--- a/templates/html/htmlbase.tpl
+++ b/templates/html/htmlbase.tpl
@@ -74,10 +74,7 @@
{% endif %}
<td id="projectalign" style="padding-left: 0.5em;">
{% if config.PROJECT_NAME %}
- <div id="projectname">{{ config.PROJECT_NAME }}
- {% if config.PROJECT_NUMBER %}
- <span id="projectnumber">{{ config.PROJECT_NUMBER }}</span>
- {% endif %}
+ <div id="projectname">{{ config.PROJECT_NAME }}{% if config.PROJECT_NUMBER %}<span id="projectnumber">&#160;{{ config.PROJECT_NUMBER }}</span>{% endif %}
</div>
{% endif %}
{% if config.PROJECT_BRIEF %}
diff --git a/templates/html/htmlclasses.tpl b/templates/html/htmlclasses.tpl
index 372d72d..3e556a2 100644
--- a/templates/html/htmlclasses.tpl
+++ b/templates/html/htmlclasses.tpl
@@ -11,6 +11,7 @@
{% endif %}
{% endfor %}
</div>
+ {% indexentry nav name=tr.classIndex file=page.fileName anchor='' isReference=False separateIndex=False %}
{# multi column index #}
<div class="classindex">
{% for section in index %}
diff --git a/templates/html/htmldeclcomp.tpl b/templates/html/htmldeclcomp.tpl
index 3ae90b8..5f6fe60 100644
--- a/templates/html/htmldeclcomp.tpl
+++ b/templates/html/htmldeclcomp.tpl
@@ -15,6 +15,7 @@
{% include 'htmlobjlink.tpl' %}
{% endwith %}
{% endif %}
+ {% if nc.sourceFileName and nc.isLinkable %}<a class="el" href="{{ nc.sourceFileName }}{{ config.HTML_FILE_EXTENSION }}">[{{ tr.code }}]</a>{% endif %}
</td></tr>
{# brief description #}
{% if nc.brief %}
@@ -25,7 +26,7 @@
{% endif %}
<br/></td></tr>
{% endif %}
- <tr class="separator:{{ nc.anchor}}"><td class="memSeparator" colspan="2">&#160;</td></tr>
+ <tr class="separator:{{ nc.anchor }}"><td class="memSeparator" colspan="2">&#160;</td></tr>
{% endfor %}
</table>
{% endif %}
diff --git a/templates/html/htmldirtree.tpl b/templates/html/htmldirtree.tpl
index a6b9b21..f1b4fcf 100644
--- a/templates/html/htmldirtree.tpl
+++ b/templates/html/htmldirtree.tpl
@@ -11,7 +11,12 @@
{# the table with entries #}
<table class="directory">
{% recursetree tree.tree %}
- {% indexentry nav name=node.name file=node.fileName anchor=node.anchor isReference=node.isReference externalReference=node.externalReference %}
+ {% if node.isLinkable %}
+ {% indexentry nav name=node.name file=node.fileName anchor=node.anchor isReference=node.isReference externalReference=node.externalReference separateIndex=True %}
+ {% else %}
+ {% indexentry nav name=node.name file='' anchor=node.anchor isReference=False separateIndex=False %}
+ {% endif %}
+ {% if not node.member %}
{% spaceless %}
<tr id="row_{{ node.id }}" class="{% cycle 'even' 'odd' %}"{%if node.level>tree.preferredDepth %} style="display:none;"{% endif %}>
<td class="entry">
@@ -47,6 +52,16 @@
{% opensubindex nav %}
{{ children }}
{% closesubindex nav %}
+ {% spaceless %}
+ {% if node.members %}
+ {% opensubindex nav %}
+ {% for member in node.members %}
+ {% indexentry nav name=member.name file=member.fileName anchor=member.anchor isReference=member.isReference externalReference=member.externalReference separateIndex=False %}
+ {% endfor %}
+ {% closesubindex nav %}
+ {% endif %}
+ {% endspaceless %}
+ {% endif %}
{% endrecursetree %}
</table>
</div><!-- directory -->
diff --git a/templates/html/htmlexamples.tpl b/templates/html/htmlexamples.tpl
index 58392df..18384e2 100644
--- a/templates/html/htmlexamples.tpl
+++ b/templates/html/htmlexamples.tpl
@@ -4,7 +4,7 @@
<div class="textblock">
{{ tr.examplesDescription }}
</div>
-{% indexentry nav name=tr.examples file=page.fileName anchor='' isReference=False %}
+{% indexentry nav name=tr.examples file=page.fileName anchor='' isReference=False separateIndex=False %}
{% opensubindex nav %}
{% with tree=exampleTree %}
{% include 'htmldirtree.tpl' %}
diff --git a/templates/html/htmlfiles.tpl b/templates/html/htmlfiles.tpl
index 55799ca..1c784dc 100644
--- a/templates/html/htmlfiles.tpl
+++ b/templates/html/htmlfiles.tpl
@@ -4,7 +4,7 @@
<div class="textblock">
{{ tr.fileListDescription }}
</div>
-{% indexentry nav name=tr.fileList file=page.fileName anchor='' isReference=False %}
+{% indexentry nav name=tr.fileList file=page.fileName anchor='' isReference=False separateIndex=True %}
{% opensubindex nav %}
{% with tree=fileTree %}
{% include 'htmldirtree.tpl' %}
diff --git a/templates/html/htmlhierarchy.tpl b/templates/html/htmlhierarchy.tpl
index ff10172..df01709 100644
--- a/templates/html/htmlhierarchy.tpl
+++ b/templates/html/htmlhierarchy.tpl
@@ -7,7 +7,7 @@
<p><a href="inherits{{ config.HTML_FILE_EXTENSION }}">{{ tr.gotoGraphicalHierarchy }}</a></p>
{% endif %}
</div>
-{% indexentry nav name=tr.classHierarchy file=page.fileName anchor='' isReference=False %}
+{% indexentry nav name=tr.classHierarchy file=page.fileName anchor='' isReference=False separateIndex=True %}
{% opensubindex nav %}
{% with tree=classHierarchy %}
{% include 'htmldirtree.tpl' %}
diff --git a/templates/html/htmlindexpages.tpl b/templates/html/htmlindexpages.tpl
index 2886a69..eacf122 100644
--- a/templates/html/htmlindexpages.tpl
+++ b/templates/html/htmlindexpages.tpl
@@ -9,7 +9,7 @@
{% for sect in index %}
{% with letter=sect.letter %}
{% set page_postfix=section|append:'_'|append:sect.label %}
- {% indexentry nav name=letter file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=letter file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{# create index pages for all globals starting with a specific letter #}
{% create page.fileName|append:page_postfix|append:config.HTML_FILE_EXTENSION from template %}
{% endwith %}
diff --git a/templates/html/htmljsnavpage.tpl b/templates/html/htmljsnavpage.tpl
new file mode 100644
index 0000000..9d9881d
--- /dev/null
+++ b/templates/html/htmljsnavpage.tpl
@@ -0,0 +1,20 @@
+var {{ varName }} =
+[
+{% recursetree node.children %}
+ {% set varName=node.file %}
+ {% if node.anchor %}
+ {% update varName=varName|append:'_'|append:node.anchor %}
+ {% endif %}
+ {% if node.parent %}
+ {% if node.parent.file==node.file %}
+ {% update varName=varName|append:'_dup' %}
+ {% endif %}
+ {% endif %}
+[ "{{ node.name }}",{% if node.file %}"{% if node.isReference %}{{ node.externalReference }}{% endif %}{{ node.file|decodeURL }}{{ config.HTML_FILE_EXTENSION }}{% if node.anchor %}#{{ node.anchor }}{% endif %}"{% else %}null{% endif %},{% if not node.is_leaf_node %}{% if node.separateIndex %}"{{ varName }}"{% else %} [
+ {{ children }}
+ ]{% endif %}{% else %} null{% endif %} ]{% if not node.last %},{% endif %}
+ {% if node.separateIndex %}
+ {% create varName|append:'.js' from 'htmljsnavpage.tpl' %}
+ {% endif %}
+{% endrecursetree %}
+];
diff --git a/templates/html/htmljsnavtree.tpl b/templates/html/htmljsnavtree.tpl
index 3d11175..fef1819 100644
--- a/templates/html/htmljsnavtree.tpl
+++ b/templates/html/htmljsnavtree.tpl
@@ -25,9 +25,21 @@
var NAVTREE =
[
{% recursetree index.nav %}
- [ "{{ node.name }}", {% if node.file %}"{% if node.isReference %}{{ node.externalReference }}{% endif %}{{ node.file|decodeURL }}{{ config.HTML_FILE_EXTENSION }}{% if node.anchor %}#{{ node.anchor }}{% endif %}"{% else %}null{% endif %},{% if not node.is_leaf_node %} [
+ {% set varName=node.file %}
+ {% if node.anchor %}
+ {% update varName=varName|append:'_'|append:node.anchor %}
+ {% endif %}
+ {% if node.parent %}
+ {% if node.parent.file==node.file %}
+ {% update varName=varName|append:'_dup' %}
+ {% endif %}
+ {% endif %}
+[ "{{ node.name }}",{% if node.file %}"{% if node.isReference %}{{ node.externalReference }}{% endif %}{{ node.file|decodeURL }}{{ config.HTML_FILE_EXTENSION }}{% if node.anchor %}#{{ node.anchor }}{% endif %}"{% else %}null{% endif %},{% if not node.is_leaf_node %}{% if node.separateIndex %}"{{ varName }}"{% else %} [
{{ children }}
- ]{% else %} null{% endif %} ]{% if not node.last %},{% endif %}
+ ]{% endif %}{% else %} null{% endif %} ]{% if not node.last %},{% endif %}
+ {% if node.separateIndex %}
+ {% create varName|append:'.js' from 'htmljsnavpage.tpl' %}
+ {% endif %}
{% endrecursetree %}
];
diff --git a/templates/html/htmllayout.tpl b/templates/html/htmllayout.tpl
index a0bb6f0..0fbe458 100644
--- a/templates/html/htmllayout.tpl
+++ b/templates/html/htmllayout.tpl
@@ -57,6 +57,7 @@
{% endif %}
{% endif %}
{% resource 'search_common.css' append 'search/search.css' %}
+{% create 'search/nomatches.html' from 'nomatches.tpl' %}
{% if config.SERVER_BASED_SEARCH %}
{# server side search resources #}
@@ -87,9 +88,9 @@
{# open the global navigation index #}
{% if config.PROJECT_NAME %}
- {% indexentry nav name=config.PROJECT_NAME file='index' anchor='' isReference=False %}
+ {% indexentry nav name=config.PROJECT_NAME file='index' anchor='' isReference=False separateIndex=False %}
{% else %}
- {% indexentry nav name=tr.mainPage file='index' anchor='' isReference=False %}
+ {% indexentry nav name=tr.mainPage file='index' anchor='' isReference=False separateIndex=False %}
{% endif %}
{% opensubindex nav %}
@@ -180,7 +181,7 @@
{# --- namespaces --- #}
{% if namespaceList %}
- {% indexentry nav name=tr.namespaces file='namespaces' anchor='' isReference=False %}
+ {% indexentry nav name=tr.namespaces file='namespaces' anchor='' isReference=False separateIndex=False %}
{% opensubindex nav %}
{% if namespaceTree.tree %}
@@ -192,7 +193,7 @@
{# write symbol indices for namespace members #}
{% if namespaceMembersIndex.all %}
{% with page=namespaceMembersIndex scope='namespace' template='htmlnsmembers.tpl' %}
- {% indexentry nav name=tr.namespaceMembers file=page.fileName anchor='' isReference=False %}
+ {% indexentry nav name=tr.namespaceMembers file=page.fileName anchor='' isReference=False separateIndex=False %}
{% include 'htmlmembersindex.tpl' %}
{% endwith %}
{% endif %}
@@ -202,7 +203,7 @@
{# --- classes --- #}
{% if classList %}
- {% indexentry nav name=tr.classes file='annotated'|append:config.HTML_FILE_EXTENSION anchor='' isReference=False %}
+ {% indexentry nav name=tr.classes file='annotated'|append:config.HTML_FILE_EXTENSION anchor='' isReference=False separateIndex=False %}
{% opensubindex nav %}
{# write the annotated class list #}
@@ -234,7 +235,7 @@
{# write symbol indices for class members #}
{% if classMembersIndex.all %}
{% with page=classMembersIndex scope='class' template='htmlclmembers.tpl' %}
- {% indexentry nav name=tr.classMembers file=page.fileName anchor='' isReference=False %}
+ {% indexentry nav name=tr.classMembers file=page.fileName anchor='' isReference=False separateIndex=False %}
{% include 'htmlmembersindex.tpl' %}
{% endwith %}
{% endif %}
@@ -244,7 +245,7 @@
{# --- files --- #}
{% if fileList %}
- {% indexentry nav name=tr.files file='files' anchor='' isReference=False %}
+ {% indexentry nav name=tr.files file='files' anchor='' isReference=False separateIndex=False %}
{% opensubindex nav %}
{# write the directory/file hierarchy #}
@@ -257,7 +258,7 @@
{# write symbol indices for global namespace #}
{% if globalsIndex.all %}
{% with page=globalsIndex scope='file' template='htmlflmembers.tpl' %}
- {% indexentry nav name=tr.fileMembers file=page.fileName anchor='' isReference=False %}
+ {% indexentry nav name=tr.fileMembers file=page.fileName anchor='' isReference=False separateIndex=False %}
{% include 'htmlmembersindex.tpl' %}
{% endwith %}
{% endif %}
@@ -281,7 +282,7 @@
{% set symbolCount=0 %}
{% for idx in searchIndices %}
{% for si in idx.symbolIndices %}
- {% with baseName=si.name|append:'_'|append:forloop.counter0 %}
+ {% with hexCount=forloop.counter0|hex baseName=si.name|append:'_'|append:hexCount %}
{% create baseName|prepend:'search/'|append:config.HTML_FILE_EXTENSION from 'htmlsearchresult.tpl' %}
{% create baseName|prepend:'search/'|append:'.js' from 'htmljssearchindex.tpl' %}
{% endwith %}
diff --git a/templates/html/htmlmemberindex.tpl b/templates/html/htmlmemberindex.tpl
index 7de92b9..504219c 100644
--- a/templates/html/htmlmemberindex.tpl
+++ b/templates/html/htmlmemberindex.tpl
@@ -7,22 +7,21 @@
{% for section in index %}
{% if not singleList or letter=='' or section.letter==letter %}
{% if not singleList %}
- <a class="anchor" id="index_{{ section.label }}"></a><h3>- {{ section.letter }} -</h3>
+ <a class="anchor" id="index_{{ section.label|lower }}"></a><h3>- {{ section.letter|lower }} -</h3>
<ul>
{% endif %}
{% for nameList in section.items|groupBy:'name' %}
{% for item in nameList|listsort:'{{item.file.name}}' %}
+ {% spaceless %}
{% if forloop.first %}
- <li>{{ item.name }}{% if (item.isFunction or item.isSignal or item.isSlot) and not item.isObjCMethod %}(){% endif %} :
- {% endif %}
- {% spaceless %}
+ <li>{{ item.name }}{% if (item.isFunction or item.isSignal or item.isSlot) and not item.isObjCMethod %}(){% endif %}&#160;:&#160;{% endif %}
{% with obj=item scope=item|get:scope text=scope.name %}
{% include 'htmlobjlink.tpl' %}
{% endwith %}
- {% endspaceless %}
{% if not forloop.last %},
- {% else %}</li>
- {% endif %}
+ {% else %}</li>{% endif %}
+ {% endspaceless %}
+
{% endfor %}
{% endfor %}
{% if not singleList %}
diff --git a/templates/html/htmlmembersindex.tpl b/templates/html/htmlmembersindex.tpl
index 700bce2..46a3cfd 100644
--- a/templates/html/htmlmembersindex.tpl
+++ b/templates/html/htmlmembersindex.tpl
@@ -2,13 +2,13 @@
{% opensubindex nav %}
{# all members #}
{% with list=page.all section='' %}
- {% indexentry nav name=tr.all file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.all file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
{# functions #}
{% if page.functions %}
{% set page_postfix='_func' %}
- {% indexentry nav name=tr.functions file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.functions file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.functions section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
@@ -16,7 +16,7 @@
{# variables #}
{% if page.variables %}
{% set page_postfix='_vars' %}
- {% indexentry nav name=tr.variables file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.variables file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.variables section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
@@ -24,7 +24,7 @@
{# typedefs #}
{% if page.typedefs %}
{% set page_postfix='_type' %}
- {% indexentry nav name=tr.typedefs file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.typedefs file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.typedefs section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
@@ -32,7 +32,7 @@
{# enums #}
{% if page.enums %}
{% set page_postfix='_enum' %}
- {% indexentry nav name=tr.enums file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.enums file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.enums section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
@@ -40,7 +40,7 @@
{# enumValues #}
{% if page.enumValues %}
{% set page_postfix='_eval' %}
- {% indexentry nav name=tr.enumValues file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.enumValues file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.enumValues section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
@@ -48,7 +48,7 @@
{# macros #}
{% if page.macros %}
{% set page_postfix='_defs' %}
- {% indexentry nav name=tr.macros file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.macros file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.macros section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
@@ -56,7 +56,7 @@
{# properties #}
{% if page.properties %}
{% set page_postfix='_prop' %}
- {% indexentry nav name=tr.properties file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.properties file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.properties section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
@@ -64,7 +64,7 @@
{# events #}
{% if page.events %}
{% set page_postfix='_evnt' %}
- {% indexentry nav name=tr.events file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.events file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.events section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
@@ -72,7 +72,7 @@
{# related #}
{% if page.related %}
{% set page_postfix='_rela' %}
- {% indexentry nav name=tr.related file=page.fileName|append:page_postfix anchor='' isReference=False %}
+ {% indexentry nav name=tr.related file=page.fileName|append:page_postfix anchor='' isReference=False separateIndex=False %}
{% with list=page.related section=page_postfix %}
{% include 'htmlindexpages.tpl' %}
{% endwith %}
diff --git a/templates/html/htmlmodules.tpl b/templates/html/htmlmodules.tpl
index 5431032..c4e84fd 100644
--- a/templates/html/htmlmodules.tpl
+++ b/templates/html/htmlmodules.tpl
@@ -4,7 +4,7 @@
<div class="textblock">
{{ tr.modulesDescription }}
</div>
-{% indexentry nav name=tr.modules file=page.fileName anchor='' isReference=False %}
+{% indexentry nav name=tr.modules file=page.fileName anchor='' isReference=False separateIndex=False %}
{% opensubindex nav %}
{% with tree=moduleTree %}
{% include 'htmldirtree.tpl' %}
diff --git a/templates/html/htmlnamespaces.tpl b/templates/html/htmlnamespaces.tpl
index b7e7b9d..c3b8b3b 100644
--- a/templates/html/htmlnamespaces.tpl
+++ b/templates/html/htmlnamespaces.tpl
@@ -4,7 +4,7 @@
<div class="textblock">
{{ tr.namespaceListDescription }}
</div>
-{% indexentry nav name=tr.namespaceList file=page.fileName anchor='' isReference=False %}
+{% indexentry nav name=tr.namespaceList file=page.fileName anchor='' isReference=False separateIndex=False %}
{% opensubindex nav %}
{% with tree=namespaceTree %}
{% include 'htmldirtree.tpl' %}
diff --git a/templates/html/htmlpages.tpl b/templates/html/htmlpages.tpl
index 5e3778d..0f12603 100644
--- a/templates/html/htmlpages.tpl
+++ b/templates/html/htmlpages.tpl
@@ -4,7 +4,7 @@
<div class="textblock">
{{ tr.relatedPagesDesc }}
</div>
-{% indexentry nav name=tr.pages file=page.fileName anchor='' isReference=False %}
+{% indexentry nav name=tr.pages file=page.fileName anchor='' isReference=False separateIndex=False %}
{% opensubindex nav %}
{% with tree=pageTree %}
{% include 'htmldirtree.tpl' %}
diff --git a/templates/html/nomatches.tpl b/templates/html/nomatches.tpl
new file mode 100644
index 0000000..94af265
--- /dev/null
+++ b/templates/html/nomatches.tpl
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><title></title>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<link rel="stylesheet" type="text/css" href="search.css"/>
+<script type="text/javascript" src="search.js"></script>
+</head>
+<body class="SRPage">
+<div id="SRIndex">
+<div class="SRStatus" id="NoMatches">{{ tr.noMatches }}</div>
+</div>
+</body>
+</html>