Some fixes for template.cpp and improve the template output

author: Dimitri van Heesch <doxygen@gmail.com> 2021-05-12 18:30:38 (GMT)
committer: Dimitri van Heesch <doxygen@gmail.com> 2021-05-14 17:46:17 (GMT)
commit: 3112d709e3decbb6931f9484725a35e0630af9b8 (patch)
tree: 97feeb265b8a4812b7d1e1885b080e26b3631419 /templates
parent: cd998a7164e30cee896cccd190846b79ebb4355f (diff)
download: Doxygen-3112d709e3decbb6931f9484725a35e0630af9b8.zip
Doxygen-3112d709e3decbb6931f9484725a35e0630af9b8.tar.gz
Doxygen-3112d709e3decbb6931f9484725a35e0630af9b8.tar.bz2
16 files changed, 204 insertions, 152 deletions
diff --git a/templates/html/dynsections_tooltips.js b/templates/html/dynsections_tooltips.js
new file mode 100644
index 0000000..ddc333a
--- /dev/null
+++ b/templates/html/dynsections_tooltips.js
@@ -0,0 +1,6 @@
+$(document).ready(function() {
+  $('.code,.codeRef').each(function() {
+    $(this).data('powertip',$('#a'+$(this).attr('href').replace(/.*\//,'').replace(/[^a-z_A-Z0-9]/g,'_')).html());
+    $(this).powerTip({ placement: 's', smartPlacement: true, mouseOnToPopup: true });
+  });
+});
diff --git a/templates/html/header.html b/templates/html/header.html
index c3bcc04..628b61e 100644
--- a/templates/html/header.html
+++ b/templates/html/header.html
@@ -22,9 +22,11 @@ $mathjax
 $extrastylesheet
 </head>
 <body>
-<!--BEGIN FULL_SIDEBAR-->
+<!--BEGIN DISABLE_INDEX-->
+  <!--BEGIN FULL_SIDEBAR-->
 <div id="side-nav" class="ui-resizable side-nav-resizable"><!-- do not remove this div, it is closed by doxygen! -->
-<!--END FULL_SIDEBAR-->
+  <!--END FULL_SIDEBAR-->
+<!--END DISABLE_INDEX-->
 
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
diff --git a/templates/html/htmlannotated.tpl b/templates/html/htmlannotated.tpl
index c5faa14..2e4d40d 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.classes file=page.fileName anchor='' isReference=False %}
+{% indexentry nav name=tr.classList file=page.fileName anchor='' isReference=False %}
 {% opensubindex nav %}
 {% with tree=classTree %}
   {% include 'htmldirtree.tpl' %}
diff --git a/templates/html/htmlbase.tpl b/templates/html/htmlbase.tpl
index f021ddd..11cb054 100644
--- a/templates/html/htmlbase.tpl
+++ b/templates/html/htmlbase.tpl
@@ -6,8 +6,11 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen {{ doxygen.version }}"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>{{ config.PROJECT_NAME }}: {{ page.title }}</title>
+<title>{% if config.PROJECT_NAME %}{{ config.PROJECT_NAME }}: {% endif %}{{ page.title }}</title>
 <link href="{{ page.relPath }}tabs.css" rel="stylesheet" type="text/css"/>
+{% if config.DISABLE_INDEX and config.FULL_SIDEBAR %}
+<script type="text/javascript">var page_layout=1;</script>
+{% endif %}
 <script type="text/javascript" src="{{ page.relPath }}jquery.js"></script>
 <script type="text/javascript" src="{{ page.relPath }}dynsections.js"></script>
 {% if config.GENERATE_TREEVIEW %}
@@ -15,22 +18,6 @@
 <script type="text/javascript" src="{{ page.relPath }}resize.js"></script>
 <script type="text/javascript" src="{{ page.relPath }}navtreedata.js"></script>
 <script type="text/javascript" src="{{ page.relPath }}navtree.js"></script>
-<script type="text/javascript">
-  /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(initResizable);
-	/* @license-end */
-</script>
-{% endif %}
-{% if not config.DISABLE_INDEX %}
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
-$(function() {
-  initMenu('',{% if config.SEARCHENGINE %}true{% else %}false{% endif %},'{{ tr.search }}');
-});
-/* @license-end */
-</script>
 {% endif %}
 {% if config.SEARCHENGINE %}
 <link href="{{ page.relPath }}search/search.css" rel="stylesheet" type="text/css"/>
@@ -40,18 +27,18 @@ $(function() {
 <script type="text/javascript" src="{{ page.relPath }}search/search.js"></script>
   {% if config.SERVER_BASED_SEARCH %}
 <script type="text/javascript">
-  /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
+  /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
   $(document).ready(function() {
     if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); }
   });
-	/* @license-end */
+  /* @license-end */
 </script>
 <link rel="search" href="{{ page.relPath }}search-opensearch.php?v=opensearch.xml" type="application/opensearchdescription+xml" title="{{ config.PROJECT_NAME }}"/>
-  {% else %}
+  {% elif config.DISABLE_INDEX or not config.HTML_DYNAMIC_MENUS %}
 <script type="text/javascript">
-  /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
+  /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
   $(document).ready(function() { init_search(); });
-	/* @license-end */
+  /* @license-end */
 </script>
   {% endif %}
 {% endif %}
@@ -72,6 +59,9 @@ $(function() {
 </head>
 <body>
 {% endblock %}
+{% if config.DISABLE_INDEX and config.FULL_SIDEBAR %}
+<div id="side-nav" class="ui-resizable side-nav-resizable"><!-- do not remove this div, it is closed by doxygen! -->
+{% endif %}
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 {% block titlearea %}
 {% if config.PROJECT_NAME or config.PROJECT_BRIEF or config.PROJECT_LOGO or config.DISABLE_INDEX and config.SEARCHENGINE %}
@@ -82,7 +72,7 @@ $(function() {
  {% if config.PROJECT_LOGO %}
   <td id="projectlogo"><img alt="Logo" src="{{ page.relPath }}{{ config.PROJECT_LOGO|stripPath }}"/></td>
  {% endif %}
-  <td style="padding-left: 0.5em;">
+  <td id="projectalign" style="padding-left: 0.5em;">
  {% if config.PROJECT_NAME %}
    <div id="projectname">{{ config.PROJECT_NAME }}
   {% if config.PROJECT_NUMBER %}
@@ -95,7 +85,13 @@ $(function() {
  {% endif %}
   </td>
  {% if config.DISABLE_INDEX and config.SEARCHENGINE %}{# search box is part of title area #}
+  {% if config.GENERATE_TREEVIEW and config.FULL_SIDEBAR %}{# search box separate row #}
+ </tr>
+ <tr>
+  <td colspan="2">
+  {% else %}
   <td>
+  {% endif %}
   {% if config.SERVER_BASED_SEARCH %}
    <div id="MSearchBox" class="MSearchBoxInactive">
     <div class="left">
@@ -139,27 +135,45 @@ $(function() {
 {% block search %}
 {% if config.SEARCHENGINE %}
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "{{ page.relPath }}search",false,'{{ tr.search }}');
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+	var searchBox = new SearchBox("searchBox", "{{ page.relPath }}search",false,'{{ tr.search }}','{{ config.HTML_FILE_EXTENSION }}');
 /* @license-end */
 </script>
 {% endif %}
 {% endblock %}
 
 {% block tabs %}
-{% if not config.DISABLE_INDEX %}
+{% if config.HTML_DYNAMIC_MENUS %}
+<script type="text/javascript" src="menudata.js"></script>
+<script type="text/javascript" src="menu.js"></script>
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+$(function() {
+ initMenu('{{ page.relPath }}',{% if config.SEARCHENGINE %}true{% else %}false{% endif %},{% if config.SERVER_BASED_SEARCH %}true{% else %}false{% endif %},{% if config.EXTERNAL_SEARCH %}'search{{ config.HTML_FILE_EXTENSION }}'{% else %}'search.php'{% endif %},'{{ tr.search }}');
+ {% if config.SEARCHENGINE %}
+ $(document).ready(function() { {% if not config.SERVER_BASED_SEARCH %}init_search();{% else %}if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); } {% endif %}});
+ {% endif %}
+});
+/* @license-end */
+</script>
 <div id="main-nav"></div>
 {% endif %}
+
+{% if not config.DISABLE_INDEX and not config.HTML_DYNAMIC_MENUS %}
+{% include 'htmltabs.tpl' %}
+{% endif %}
+</div><!-- top -->
+
 {% endblock %}
 
 {% block navpath %}
 {% endblock %}
 
-
-</div><!-- top -->
 {% block splitbar %}
 {% if config.GENERATE_TREEVIEW %}
+{% if not config.DISABLE_INDEX or not config.FULL_SIDEBAR %}
 <div id="side-nav" class="ui-resizable side-nav-resizable">
+{% endif %}
   <div id="nav-tree">
     <div id="nav-tree-contents">
       <div id="nav-sync" class="sync"></div>
@@ -170,8 +184,8 @@ var searchBox = new SearchBox("searchBox", "{{ page.relPath }}search",false,'{{
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('{{ page.fileName }}{% if page_postfix %}{{ page_postfix }}{% endif %}{{ config.HTML_FILE_EXTENSION }}','{{ page.relPath }}');});
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+$(document).ready(function(){initNavTree('{{ page.fileName }}{% if page_postfix %}{{ page_postfix }}{% endif %}{{ config.HTML_FILE_EXTENSION }}','{{ page.relPath }}'); initResizable(); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -181,13 +195,15 @@ $(document).ready(function(){initNavTree('{{ page.fileName }}{% if page_postfix
 {% block searchInfo %}
 {% if config.SEARCHENGINE and not config.SERVER_BASED_SEARCH %}
 <!-- window showing the filter options -->
-<div id="MSearchSelectWindow" onmouseover="return searchBox.OnSearchSelectShow()"
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
      onmouseout="return searchBox.OnSearchSelectHide()"
      onkeydown="return searchBox.OnSearchSelectKey(event)">
 </div>
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" name="MSearchResults" id="MSearchResults">
+<iframe src="javascript:void(0)" frameborder="0"
+	name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
 {% endif %}
@@ -195,20 +211,22 @@ $(document).ready(function(){initNavTree('{{ page.fileName }}{% if page_postfix
 
 <div class="header">
 {% block title %}
-  <div class="headertitle"><div class="title">{{ page.title }}</div></div>
+<div class="headertitle">
+<div class="title">{{ page.title }}</div></div>
 {% endblock %}
-</div>
+</div><!-- header -->
 
 {% block content %}
 {% endblock %}
 
 {% block endsplitbar %}
 {% if config.GENERATE_TREEVIEW %}
-</div><!-- content -->
+</div><!-- doc-content -->
 {% endif %}
 {% endblock %}
 
 {% block footer %}
+<!-- start footer part -->
 {% if config.GENERATE_TREEVIEW %}
 <div id="nav-path" class="navpath">{# id is needed for treeview function! #}
   <ul>
@@ -233,14 +251,8 @@ $(document).ready(function(){initNavTree('{{ page.fileName }}{% if page_postfix
 </div>
 {% else %}
   <hr class="footer"/><address class="footer"><small>
-{% if config.HTML_TIMESTAMP %}
-{{ tr.generatedAt:doxygen.date,config.PROJECT_NAME }}
-{% else %}
-{{ tr.generatedBy }}
-{% endif %}
-&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="{{ page.relPath }}doxygen.svg" width="104" height="31" alt="doxygen"/></a>
-  {{ doxygen.version }}
-  </small></address>
+{% if config.HTML_TIMESTAMP %}{{ tr.generatedAt:doxygen.date,config.PROJECT_NAME }}{% else %}{{ tr.generatedBy }}{% endif %}&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="{{ page.relPath }}doxygen.svg" width="104" height="31" alt="doxygen"/></a> {{ doxygen.version }}
+</small></address>
 {% endif %}
 </body>
 </html>
diff --git a/templates/html/htmlclass.tpl b/templates/html/htmlclass.tpl
index 9a2b494..d5175af 100644
--- a/templates/html/htmlclass.tpl
+++ b/templates/html/htmlclass.tpl
@@ -429,7 +429,7 @@
     {{ compound.generatedFromFiles }}
     <ul>
     {% for file in compound.usedFiles %}
-      <li>{% if file.sourceFileName %}
+      <li>{% if file.sourceFileName and file.isLinkable %}
             <a class="el" href="{{ file.sourceFileName }}{{ config.HTML_FILE_EXTENSION }}">
           {% endif %}
           {% if not file.sourceFileName and file.isLinkable %}
@@ -440,7 +440,7 @@
           {% else %}
             {{ file.name|stripPath }}
           {% endif %}
-          {% if file.sourceFileName or file.isLinkable %}
+          {% if file.isLinkable %}
             </a>
           {% endif %}
           {% if file.versionInfo %} {{ file.versionInfo }}{% endif %}
@@ -448,6 +448,6 @@
     {% endfor %}
     </ul>
   {% endif %}
-</div>
+</div><!-- contents -->
 {% endblock %}
 
diff --git a/templates/html/htmlclasses.tpl b/templates/html/htmlclasses.tpl
index c00ce32..372d72d 100644
--- a/templates/html/htmlclasses.tpl
+++ b/templates/html/htmlclasses.tpl
@@ -1,9 +1,6 @@
 {% extend 'htmlbase.tpl' %}
 {% block content %}
 <div class="contents">
-<div class="textblock">
-{% indexentry nav name=tr.classIndex file=page.fileName anchor='' isReference=False %}
-</div>
 {% with index=classIndex.list|alphaIndex:'name' %}
   {# quick index at top #}
   <div class="qindex">
@@ -15,32 +12,20 @@
   {% endfor %}
   </div>
   {# multi column index #}
-  <div class="classindex" style="column-count:{{ config.COLS_IN_ALPHA_INDEX }};-moz-column-count:{{ config.COLS_IN_ALPHA_INDEX }};-webkit-column-count:{{ config.COLS_IN_ALPHA_INDEX}}">
+  <div class="classindex">
   {% for section in index %}
-    <ul>
+    <dl class="classindex {% cycle 'even' 'odd' %}">
     {% for cls in section.items %}
-      <li>
-        <span class="ai">
-        {% if forloop.first %}
-        <a name="letter_{{ section.label }}"></a>
-        <span class="ah">&#160;&#160;{{ section.letter }}&#160;&#160;</span><br/>
-        {% endif %}
-        {% with obj=cls text=cls.name %}
-          {% include 'htmlobjlink.tpl' %}
-        {% endwith %}
-        </span>
-      </li>
+      {% if forloop.first %}
+      <dt class="alphachar"><a id="letter_{{ section.label }}" name="letter_{{ section.label }}">{{ section.letter }}</a></dt>
+      {% endif %}
+      <dd>
+      {% with obj=cls text=cls.name %}
+        {% include 'htmlobjlink.tpl' %}
+      {% endwith %}
+      </dd>
     {% endfor %}
-    </ul>
-  {% endfor %}
-  </div><!-- classindex -->
-  {# quick index at bottom #}
-  <div class="qindex">
-  {% for section in index %}
-    <a class="qindex" href="#letter_{{ section.label }}">{{ section.letter }}</a>
-    {% if not forloop.last %}
-    &#160;|&#160;
-    {% endif %}
+    </dl>
   {% endfor %}
   </div>
 {% endwith %}
diff --git a/templates/html/htmljsmenudata.tpl b/templates/html/htmljsmenudata.tpl
index 3db8bd4..e795918 100644
--- a/templates/html/htmljsmenudata.tpl
+++ b/templates/html/htmljsmenudata.tpl
@@ -1,39 +1,40 @@
 /*
- @licstart  The following is the entire license notice for the
- JavaScript code in this file.
+ @licstart  The following is the entire license notice for the JavaScript code in this file.
 
- Copyright (C) 1997-2017 by Dimitri van Heesch
+ The MIT License (MIT)
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ Copyright (C) 1997-2020 by Dimitri van Heesch
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ and associated documentation files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
 
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ The above copyright notice and this permission notice shall be included in all copies or
+ substantial portions of the Software.
 
- @licend  The above is the entire license notice
- for the JavaScript code in this file
- */
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ @licend  The above is the entire license notice for the JavaScript code in this file
+*/
 var menudata={children:[
-{text:'{{ tr.mainPage }}',url:'index{{ config.HTML_FILE_EXTENSION }}'}
+{text:"{{ tr.mainPage }}",url:"index{{ config.HTML_FILE_EXTENSION }}"}
 {% if pageTree.tree %}
-,{text:'{{ tr.pages }}',url:'pages{{ config.HTML_FILE_EXTENSION }}'}
+,{text:"{{ tr.pages }}",url:"pages{{ config.HTML_FILE_EXTENSION }}"}
 {% endif %}
 {% if moduleTree.tree %}
-,{text:'{{ tr.modules }}',url:'modules{{ config.HTML_FILE_EXTENSION }}'}
+,{text:"{{ tr.modules }}",url:"modules{{ config.HTML_FILE_EXTENSION }}"}
 {% endif %}
 {% if namespaceList %}
-,{text:'{{ tr.namespaces }}',url:'namespaces{{ config.HTML_FILE_EXTENSION }}',children:[
- {text:'{{ tr.namespaceList }}',url:'namespaces{{ config.HTML_FILE_EXTENSION }}'}
+,{text:"{{ tr.namespaces }}",url:'namespaces{{ config.HTML_FILE_EXTENSION }}",children:[
+ {text:"{{ tr.namespaceList }}",url:'namespaces{{ config.HTML_FILE_EXTENSION }}"}
 {% if namespaceMembersIndex.all %}
-,{text:'{{ tr.namespaceMembers }}',url:'namespacemembers{{ config.HTML_FILE_EXTENSION }}',children:[
+,{text:"{{ tr.namespaceMembers }}",url:'namespacemembers{{ config.HTML_FILE_EXTENSION }}",children:[
   {% with page=namespaceMembersIndex %}
     {% include 'htmljsmenumembersdata.tpl' %}
   {% endwith %}
@@ -42,13 +43,14 @@ var menudata={children:[
 ]}
 {% endif %}
 {% if classList %}
-,{text:'{{ tr.classes }}',url:'annotated{{ config.HTML_FILE_EXTENSION }}',children:[
- {text:'{{ tr.classList }}',url:'annotated{{ config.HTML_FILE_EXTENSION }}'}
+,{text:"{{ tr.classes }}",url:"annotated{{ config.HTML_FILE_EXTENSION }}",children:[
+ {text:"{{ tr.classList }}",url:"annotated{{ config.HTML_FILE_EXTENSION }}"}
+,{text:"{{ tr.classIndex }}",url:"classes{{ config.HTML_FILE_EXTENSION }}"}
 {% if classHierarchy.tree %}
-,{text:'{{ tr.classHierarchy }}',url:'hierarchy{{ config.HTML_FILE_EXTENSION }}'}
+,{text:"{{ tr.classHierarchy }}",url:"hierarchy{{ config.HTML_FILE_EXTENSION }}"}
 {% endif %}
 {% if classMembersIndex.all %}
-,{text:'{{ tr.classMembers }}',url:'functions{{ config.HTML_FILE_EXTENSION }}',children:[
+,{text:"{{ tr.classMembers }}",url:"functions{{ config.HTML_FILE_EXTENSION }}",children:[
   {% with page=classMembersIndex %}
     {% include 'htmljsmenumembersdata.tpl' %}
   {% endwith %}
@@ -57,10 +59,10 @@ var menudata={children:[
 ]}
 {% endif %}
 {% if fileList %}
-,{text:'{{ tr.files }}',url:'files{{ config.HTML_FILE_EXTENSION }}',children[
- {text:'{{ tr.fileList }}',url:'files{{ config.HTML_FILE_EXTENSION }}'}
+,{text:"{{ tr.files }}",url:"files{{ config.HTML_FILE_EXTENSION }}",children:[
+ {text:"{{ tr.fileList }}",url:"files{{ config.HTML_FILE_EXTENSION }}"}
 {% if globalsIndex.all %}
-,{text:'{{ tr.fileMembers }}',url'globals{{ config.HTML_FILE_EXTENSION }}',children:[
+,{text:"{{ tr.fileMembers }}",url:"globals{{ config.HTML_FILE_EXTENSION }}",children:[
   {% with page=globalsIndex %}
     {% include 'htmljsmenumembersdata.tpl' %}
   {% endwith %}
@@ -69,6 +71,6 @@ var menudata={children:[
 ]}
 {% endif %}
 {% if exampleTree.tree %}
-,{text:'{{ tr.examples }}',url:'examples{{ config.HTML_FILE_EXTENSION }}'}
+,{text:"{{ tr.examples }}",url:"examples{{ config.HTML_FILE_EXTENSION }}"}
 {% endif %}
 ]}
diff --git a/templates/html/htmljsmenuletterdata.tpl b/templates/html/htmljsmenuletterdata.tpl
index ded3402..e1c5679 100644
--- a/templates/html/htmljsmenuletterdata.tpl
+++ b/templates/html/htmljsmenuletterdata.tpl
@@ -1,10 +1,19 @@
 {# inputs: page, list, section, text #}
-{text:'{{ text }}',url:'{{ page.fileName }}{{ section }}{{ config.HTML_FILE_EXTENSION }}'
-{% if list|length>maxItemsForMultiPageList %}
+{text:"{{ text }}",url:"{{ page.fileName }}{{ section }}{{ config.HTML_FILE_EXTENSION }}"
+{% if list|length>maxItemsForFlatList %}
 ,children:[
   {% with index=list|alphaIndex:'name' %}
     {% for sect in index %}
-      {text:'{{ sect.letter }}',url:'{{ page.fileName }}{{ section }}_{{ sect.label }}{{ config.HTML_FILE_EXTENSION }}'}{% if not forloop.last %},{% endif %}
+      {% spaceless %}
+      {text:"{{ sect.letter }}",url:"
+      {% if list|length<=maxItemsForMultiPageList %}
+      {{ page.fileName }}{{ section }}{{ config.HTML_FILE_EXTENSION }}#index_{{ sect.label }}"
+      {% else %}
+      {{ page.fileName }}{{ section }}_{{ sect.label }}{{ config.HTML_FILE_EXTENSION }}"
+      {% endif %}
+      }
+      {% endspaceless %}
+      {% if not forloop.last %},{% endif %}
     {% endfor %}
   {% endwith %}
 ]
diff --git a/templates/html/htmljsnavtree.tpl b/templates/html/htmljsnavtree.tpl
index 947b980..3d11175 100644
--- a/templates/html/htmljsnavtree.tpl
+++ b/templates/html/htmljsnavtree.tpl
@@ -1,3 +1,27 @@
+/*
+ @licstart  The following is the entire license notice for the JavaScript code in this file.
+
+ The MIT License (MIT)
+
+ Copyright (C) 1997-2020 by Dimitri van Heesch
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ and associated documentation files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or
+ substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ @licend  The above is the entire license notice for the JavaScript code in this file
+*/
 var NAVTREE =
 [
 {% recursetree index.nav %}
diff --git a/templates/html/htmljssearchdata.tpl b/templates/html/htmljssearchdata.tpl
index 802795e..5146bae 100644
--- a/templates/html/htmljssearchdata.tpl
+++ b/templates/html/htmljssearchdata.tpl
@@ -2,30 +2,21 @@
 var indexSectionsWithContent =
 {
 {% set count=0 %}
-{% for idx in searchIndices %}
-  {% if idx.symbolIndices %}
-    {{ count }}:"{% for si in idx.symbolIndices %}{{ si.letter }}{% endfor %}"{%if not forloop.last %},{% endif %}
-    {% set count=count+1 %}
-  {% endif %}
-{% endfor %}
+{% for idx in searchIndices %}{% if idx.symbolIndices %}{% if count>0 %},
+{% endif %}  {{ count }}:"{% for si in idx.symbolIndices %}{{ si.letter }}{% endfor %}"{% set count=count+1 %}{% endif %}{% endfor %}
 };
+
 var indexSectionNames =
 {
 {% set count=0 %}
-{% for idx in searchIndices %}
-  {% if idx.symbolIndices %}
-    {{ count }}:"{{ idx.name }}"{% if not forloop.last %},{% endif %}
-    {% set count=count+1 %}
-  {% endif %}
-{% endfor %}
+{% for idx in searchIndices %}{% if idx.symbolIndices %}{% if count>0 %},
+{% endif %}  {{ count }}:"{{ idx.name }}"{% set count=count+1 %}{% endif %}{% endfor %}
 };
+
 var indexSectionLabels =
 {
 {% set count=0 %}
-{% for idx in searchIndices %}
-  {% if idx.symbolIndices %}
-    {{ count }}:"{{ idx.text }}"{% if not forloop.last %},{% endif %}
-    {% set count=count+1 %}
-  {% endif %}
-{% endfor %}
+{% for idx in searchIndices %}{% if idx.symbolIndices %}{% if count>0 %},
+{% endif %}  {{ count }}:"{{ idx.text }}"{% set count=count+1 %}{% endif %}{% endfor %}
 };
+
diff --git a/templates/html/htmljssearchindex.tpl b/templates/html/htmljssearchindex.tpl
index a16fa4f..b23e19e 100644
--- a/templates/html/htmljssearchindex.tpl
+++ b/templates/html/htmljssearchindex.tpl
@@ -1,15 +1,13 @@
 {# input: si symbolIndex #}
 var searchData =
 [
-{% for group in si.symbolGroups %}['{{ group.id }}',['{{ group.name }}',
-{% for sym in group.symbols %}
-{% spaceless %}
-['{{ sym.relPath }}{{ sym.fileName }}{{ config.HTML_FILE_EXTENSION }}{% if sym.anchor %}#{{ sym.anchor }}{% endif %}',
+{% for group in si.symbolGroups %}  ['{{ group.id }}_{{ symbolCount }}',['{{ group.name }}',{% spaceless %}{% for sym in group.symbols %}['{{ sym.relPath }}{{ sym.fileName }}{{ config.HTML_FILE_EXTENSION }}{% if sym.anchor %}#{{ sym.anchor }}{% endif %}',
 {% if not config.EXT_LINKS_IN_WINDOW %}1{% else %}0{% endif %},
-'{{ sym.scope|nowrap }}']
-{% endspaceless %}
+'{{ sym.scope|nowrap|e }}']
 {% if not forloop.last %},{% endif %}
 {% endfor %}
+{% update symbolCount=symbolCount+1 %}
+{% endspaceless %}
 ]]{% if not forloop.last %},{% endif %}
 {% endfor %}
 ];
diff --git a/templates/html/htmllayout.tpl b/templates/html/htmllayout.tpl
index b79f835..736a624 100644
--- a/templates/html/htmllayout.tpl
+++ b/templates/html/htmllayout.tpl
@@ -3,9 +3,16 @@
 {# ---- copy fixed resources to the output ----- #}
 
 {% resource 'doxygen.css' %}
-{% resource 'tabs.css' %}
+{% if config.HTML_DYNAMIC_MENUS %}
+  {% resource 'tabs.css' %}
+{% else %}
+  {% resource 'fixed_tabs.css' as 'tabs.css' %}
+{% endif %}
 {% resource 'jquery.js' %}
-{% resource 'dynsections.js %}
+{% resource 'dynsections.js' %}
+{% if config.SOURCE_BROWSER and config.SOURCE_TOOLTIPS %}
+{% resource 'dynsections_tooltips.js' append 'dynsections.js' %}
+{% endif %}
 {% resource 'tab_a.lum' %}
 {% resource 'tab_b.lum' %}
 {% resource 'tab_h.lum' %}
@@ -37,10 +44,19 @@
 {% resource 'search_m.png' as 'search/search_m.png' %}
 {% resource 'search_r.png' as 'search/search_r.png' %}
 {% if config.DISABLE_INDEX %}
-  {% resource 'search_noidx.css' as 'search/search.css'   %}
+  {% if config.GENERATE_TREEVIEW and config.FULL_SIDEBAR %}
+  {% resource 'search_sidebar.css'   as 'search/search.css'   %}
+  {% else %}
+  {% resource 'search_nomenu.css'    as 'search/search.css'   %}
+  {% endif %}
 {% else %}
-  {% resource 'search.css'       as 'search/search.css'   %}
+  {% if not config.HTML_DYNAMIC_MENUS %}
+  {% resource 'search_fixedtabs.css' as 'search/search.css'   %}
+  {% else %}
+  {% resource 'search.css'           as 'search/search.css'   %}
+  {% endif %}
 {% endif %}
+{% resource 'search_common.css'      append 'search/search.css' %}
 
 {% if config.SERVER_BASED_SEARCH %}
   {# server side search resources #}
@@ -56,7 +72,9 @@
 {% endif %}
 
 {# interactive SVGs #}
-{% resource 'svgpan.js' %}
+{% if config.INTERACTIVE_SVG %}
+  {% resource 'svgpan.js' %}
+{% endif %}
 
 {# -------------------------------------------------- #}
 
@@ -68,7 +86,11 @@
 {% set page_postfix='' %}
 
 {# open the global navigation index #}
-{% indexentry nav name=tr.mainPage file='index' anchor='' isReference=False %}
+{% if config.PROJECT_NAME %}
+  {% indexentry nav name=config.PROJECT_NAME file='index' anchor='' isReference=False %}
+{% else %}
+  {% indexentry nav name=tr.mainPage file='index' anchor='' isReference=False %}
+{% endif %}
 {% opensubindex nav %}
 
 {# ----------- HTML DOCUMENTATION PAGES ------------ #}
@@ -180,7 +202,7 @@
 
 {# --- classes --- #}
 {% if classList %}
-  {% indexentry nav name=tr.classes file='' anchor='' isReference=False %}
+  {% indexentry nav name=tr.classes file='annotated'|append:config.HTML_FILE_EXTENSION anchor='' isReference=False %}
   {% opensubindex nav %}
 
   {# write the annotated class list #}
@@ -256,6 +278,7 @@
 {# write search data #}
 {% if config.SEARCHENGINE and not config.SERVER_BASED_SEARCH %}
   {% create 'search/searchdata.js' from 'htmljssearchdata.tpl' %}
+  {% set symbolCount=0 %}
   {% for idx in searchIndices %}
     {% for si in idx.symbolIndices %}
       {% with baseName=si.name|append:'_'|append:forloop.counter0 %}
diff --git a/templates/html/htmlmemberindex.tpl b/templates/html/htmlmemberindex.tpl
index 216dd31..7de92b9 100644
--- a/templates/html/htmlmemberindex.tpl
+++ b/templates/html/htmlmemberindex.tpl
@@ -7,24 +7,23 @@
   {% for section in index %}
     {% if not singleList or letter=='' or section.letter==letter %}
       {% if not singleList %}
-      <a class="anchor" id="{{ section.label }}"></a><h3>- {{ section.letter }} -</h3>
+      <a class="anchor" id="index_{{ section.label }}"></a><h3>- {{ section.letter }} -</h3>
       <ul>
       {% endif %}
       {% for nameList in section.items|groupBy:'name' %}
-        {% spaceless %}
           {% for item in nameList|listsort:'{{item.file.name}}' %}
             {% if forloop.first %}
-              <li>{{ item.name }}{% if (item.isFunction or item.isSignal or item.isSlot) and not item.isObjCMethod %}(){% endif %}&#160;:&#160;
+              <li>{{ item.name }}{% if (item.isFunction or item.isSignal or item.isSlot) and not item.isObjCMethod %}(){% endif %} :
             {% endif %}
+        {% spaceless %}
             {% with obj=item scope=item|get:scope text=scope.name %}
                {% include 'htmlobjlink.tpl' %}
             {% endwith %}
-            {% if not forloop.last %},&#160;
-            {% else %}
-              </li>
+        {% endspaceless %}
+            {% if not forloop.last %},
+            {% else %}</li>
             {% endif %}
           {% endfor %}
-        {% endspaceless %}
       {% endfor %}
       {% if not singleList %}
       </ul>
diff --git a/templates/html/htmlmemdecl.tpl b/templates/html/htmlmemdecl.tpl
index c7894d8..4f859f7 100644
--- a/templates/html/htmlmemdecl.tpl
+++ b/templates/html/htmlmemdecl.tpl
@@ -64,7 +64,7 @@
         {% spaceless %}
           template&lt;
           {% for targ in member.templateArgs %}
-            {{ targ.type }} {{ targ.name }}{% if targ.defVal %} = {{ targ.defval }}{% endif %}{% if not forloop.last %}, {% endif %}
+            {{ targ.type }} {{ targ.name }}{% if targ.defVal %} = {{ targ.defVal }}{% endif %}{% if not forloop.last %}, {% endif %}
           {% endfor %}
         {% endspaceless %} &gt;
         </td></tr><tr class="memitem:{{ member.anchor }}{% if inheritId %} inherit {{ inheritId }}{% endif %}"><td class="memTemplItemLeft" align="right" valign="top">
diff --git a/templates/html/htmlpage.tpl b/templates/html/htmlpage.tpl
index 7547ed5..449f601 100644
--- a/templates/html/htmlpage.tpl
+++ b/templates/html/htmlpage.tpl
@@ -50,7 +50,7 @@
   </ul>
   </li>
 {% endif %}
-{% if exampleList.items %}
+{% if exampleList %}
   <li><a href="{{ page.relPath }}examples{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.examples }}</span></a>
 {% endif %}
 </ul>
diff --git a/templates/html/htmlsearchresult.tpl b/templates/html/htmlsearchresult.tpl
index 139faf2..9174196 100644
--- a/templates/html/htmlsearchresult.tpl
+++ b/templates/html/htmlsearchresult.tpl
@@ -1,6 +1,7 @@
 {# input: baseName #}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html><head><title></title>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen {{ doxygen.version }}"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
@@ -12,14 +13,14 @@
 <div class="SRStatus" id="Loading">{{ tr.loading }}</div>
 <div id="SRResults"></div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 </script>
 <div class="SRStatus" id="Searching">{{ tr.searching }}</div>
 <div class="SRStatus" id="NoMatches">{{ tr.noMatches }}</div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
author	Dimitri van Heesch <doxygen@gmail.com>	2021-05-12 18:30:38 (GMT)
committer	Dimitri van Heesch <doxygen@gmail.com>	2021-05-14 17:46:17 (GMT)
commit	3112d709e3decbb6931f9484725a35e0630af9b8 (patch)
tree	97feeb265b8a4812b7d1e1885b080e26b3631419 /templates
parent	cd998a7164e30cee896cccd190846b79ebb4355f (diff)
download	Doxygen-3112d709e3decbb6931f9484725a35e0630af9b8.zip Doxygen-3112d709e3decbb6931f9484725a35e0630af9b8.tar.gz Doxygen-3112d709e3decbb6931f9484725a35e0630af9b8.tar.bz2