1 files changed, 37 insertions, 13 deletions

diff --git a/templates/html/htmllayout.tpl b/templates/html/htmllayout.tpl
index b79f835..0fbe458 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,20 @@
 {% 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' %}
+{% create 'search/nomatches.html' from 'nomatches.tpl' %}
 
 {% if config.SERVER_BASED_SEARCH %}
   {# server side search resources #}
@@ -56,7 +73,9 @@
 {% endif %}
 
 {# interactive SVGs #}
-{% resource 'svgpan.js' %}
+{% if config.INTERACTIVE_SVG %}
+  {% resource 'svgpan.js' %}
+{% endif %}
 
 {# -------------------------------------------------- #}
 
@@ -68,7 +87,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 separateIndex=False %}
+{% else %}
+  {% indexentry nav name=tr.mainPage file='index' anchor='' isReference=False separateIndex=False %}
+{% endif %}
 {% opensubindex nav %}
 
 {# ----------- HTML DOCUMENTATION PAGES ------------ #}
@@ -158,7 +181,7 @@
 
 {# --- namespaces --- #}
 {% if namespaceList %}
-  {% indexentry nav name=tr.namespaces file='' anchor='' isReference=False %}
+  {% indexentry nav name=tr.namespaces file='namespaces' anchor='' isReference=False separateIndex=False %}
   {% opensubindex nav %}
 
   {% if namespaceTree.tree %}
@@ -170,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 %}
@@ -180,7 +203,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 separateIndex=False %}
   {% opensubindex nav %}
 
   {# write the annotated class list #}
@@ -212,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 %}
@@ -222,7 +245,7 @@
 
 {# --- files --- #}
 {% if fileList %}
-  {% indexentry nav name=tr.files file='' anchor='' isReference=False %}
+  {% indexentry nav name=tr.files file='files' anchor='' isReference=False separateIndex=False %}
   {% opensubindex nav %}
 
   {# write the directory/file hierarchy #}
@@ -235,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 %}
@@ -256,9 +279,10 @@
 {# 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 %}
+      {% 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 %}