doxygen: make it possible to override top navbar links.

diff --git a/doc/doxygen.rst b/doc/doxygen.rst
index 5aaf32615de360893e2f9db63344cd5f46123945..d7e352881c59924708114d6df78066896f411c3c 100644 (file)
--- a/doc/doxygen.rst
+++ b/doc/doxygen.rst
@@ -240,7 +240,11 @@ Variable                            Description
 :ini:`M_THEME_COLOR`                Color for :html:`<meta name="theme-color"/>`,
                                     corresponding to the CSS style. If empty,
                                     no :html:`<meta>` tag is rendered. See
-                                    below for more information.
+                                    `Theme selection`_ for more information.
+:ini:`M_LINKS_NAVBAR1`              Left navbar column links. See
+                                    `Navbar links`_ for more information.
+:ini:`M_LINKS_NAVBAR2`              Right navbar column links. See
+                                    `Navbar links`_ for more information.
 :ini:`M_PAGE_HEADER`                HTML code to put at the top of every page.
                                     Useful for example to link to different
                                     versions of the same documentation. The
@@ -267,6 +271,9 @@ Variable                            Description
 Note that namespace, directory and page lists are always fully expanded as
 these are not expected to be excessively large.
 
+`Theme selection`_
+------------------
+
 By default, the `dark m.css theme <{filename}/css/themes.rst#dark>`_ together
 with Doxygen-theme-specific additions is used, which corresponds to the
 following configuration:
@@ -306,6 +313,42 @@ place of ``m-light+doxygen.compiled.css``:
 See the `CSS files`_ section below for more information about customizing the
 CSS files.
 
+`Navbar links`_
+---------------
+
+The :ini:`M_LINKS_NAVBAR1` and :ini:`M_LINKS_NAVBAR2` options define which
+links are shown on the top navbar, split into left and right column on small
+screen sizes. These options take a whitespace-separated list of compound IDs
+and additionally the special ``pages``, ``namespaces``,  ``annotated``,
+``files`` IDs. By default the variables are defined like following:
+
+.. code:: ini
+
+    M_LINKS_NAVBAR1 = pages namespaces
+    M_LINKS_NAVBAR2 = annotated files
+
+Titles for the links are taken implicitly. Empty :ini:`M_LINKS_NAVBAR2` will
+cause the navigation appear in a single column, setting both empty will cause
+the navbar links to not be rendered at all.
+
+A menu item is higlighted if a compound with the same ID is the current page
+(and similarly for the special ``pages``, ... IDs).
+
+It's possible to specify sub-menu items by enclosing more than one ID in
+quotes. The top-level items then have to be specified each on a single line.
+Example (note the mangled names, corresponding to filenames of given compounds
+generated by Doxygen):
+
+.. code:: ini
+
+    M_LINKS_NAVBAR1 = \
+        "namespaces namespaceFoo namespaceBar namespaceUtils" \
+        "files dir_d3b07384d113edec49eaa6238ad5ff00 dir_cbd8f7984c654c25512e3d9241ae569f"
+
+This will put links to namespaces Foo, Bar and Utils as a sub-items of a
+top-level *Namespaces* item and links to two subdirectories as sub-items of the
+*Files* item.
+
 `Command-line options`_
 =======================
 
@@ -708,7 +751,17 @@ Filename                Use
 ======================= =======================================================
 
 Each template is passed a subset of the ``Doxyfile`` configuration values from
-the above table and in addition the following variables:
+the `Configuration`_ table. Most values are provided as-is depending on their
+type, so either strings, booleans, or lists of strings. The exceptions are:
+
+-   The :py:`M_LINKS_NAVBAR1` and :py:`M_LINKS_NAVBAR2` are processed to tuples
+    in a form :py:`(title, url, id, sub)` where :py:`title` is link title,
+    :py:`url` is link URL, :py:`id` is compound ID (to use for highlighting
+    active menu item) and :py:`sub` is a list optionally containing sub-menu
+    items. The sub-menu items are in a similarly formed tuple,
+    :py:`(title, url, id)`.
+
+ and in addition the following variables:
 
 .. class:: m-table m-fullwidth
 
@@ -719,9 +772,9 @@ Variable                    Description
 :py:`DOXYGEN_VERSION`       Version of Doxygen that generated given XML file
 =========================== ===================================================
 
-In addition to builtin Jinja2 filters, the the ``basename_or_url`` filter
-returns either a basename of file path, if the path is relative; or a full URL,
-if the argument is an absolute URL. It's useful in cases like this:
+In addition to builtin Jinja2 filters, the ``basename_or_url`` filter returns
+either a basename of file path, if the path is relative; or a full URL, if the
+argument is an absolute URL. It's useful in cases like this:
 
 .. code:: html+jinja
 

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index ba9fec2c121424eb51d7fd2dfd71516ed86ed232..08728a9ba977cea54da1d897b323d09a5fd54a54 100755 (executable)
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -1204,6 +1204,38 @@ def build_tree(state: State):
         # Other compounds are not in any index pages or breadcrumb, so leaf
         # name not needed
 
+    # Assign names and URLs to menu items
+    predefined = {
+        'pages': ("Pages", 'pages.html'),
+        'namespaces': ("Namespaces", 'namespaces.html'),
+        'annotated': ("Classes", 'annotated.html'),
+        'files': ("Files", 'files.html')
+    }
+
+    def find(id):
+        # If predefined, return those
+        if id in predefined:
+            return predefined[id]
+
+        # Otherwise search in symbols
+        found = state.compounds[id]
+        return found.name, found.url
+
+    i: str
+    for var in 'M_LINKS_NAVBAR1', 'M_LINKS_NAVBAR2':
+        navbar_links = []
+        for i in state.doxyfile[var]:
+            links = i.split()
+            assert len(links)
+            sublinks = []
+            for sublink in links[1:]:
+                title, url = find(sublink)
+                sublinks += [(title, url, sublink)]
+            title, url = find(links[0])
+            navbar_links += [(title, url, links[0], sublinks)]
+
+        state.doxyfile[var] = navbar_links
+
 def parse_xml(state: State, xml: str):
     # Reset counter for unique math formulas
     m.math.counter = 0
@@ -1774,6 +1806,8 @@ def parse_doxyfile(state: State, doxyfile, config = None):
         'M_FILE_TREE_EXPAND_LEVELS': ['1'],
         'M_EXPAND_INNER_TYPES': ['NO'],
         'M_THEME_COLOR': ['#22272e'],
+        'M_LINKS_NAVBAR1': ['pages', 'namespaces'],
+        'M_LINKS_NAVBAR2': ['annotated', 'files'],
         'M_PAGE_FINE_PRINT': ['[default]']
     }
 
@@ -1865,7 +1899,9 @@ def parse_doxyfile(state: State, doxyfile, config = None):
     # List values that we want. Drop empty lines.
     for i in ['TAGFILES',
               'HTML_EXTRA_STYLESHEET',
-              'HTML_EXTRA_FILES']:
+              'HTML_EXTRA_FILES',
+              'M_LINKS_NAVBAR1',
+              'M_LINKS_NAVBAR2']:
         if i in config:
             state.doxyfile[i] = [line for line in config[i] if line]
 

diff --git a/doxygen/templates/base-class-reference.html b/doxygen/templates/base-class-reference.html
index 7931e53868cb99f1c0d3ed61224c52d697a40a7d..48d592478d86ea7cc6c39da769582d27071ca475 100644 (file)
--- a/doxygen/templates/base-class-reference.html
+++ b/doxygen/templates/base-class-reference.html
@@ -1,4 +1,3 @@
-{% set navbar_current = 'annotated' %}
 {% extends 'base.html' %}
 
 {% macro entry_class(class) %}{% include 'entry-class.html' %}{% endmacro %}

diff --git a/doxygen/templates/base.html b/doxygen/templates/base.html
index 6715bccd5a34ece44ce891861642652c9895949e..deb57d09fc4fad4c5138a66a72c252e0710a1ed5 100644 (file)
--- a/doxygen/templates/base.html
+++ b/doxygen/templates/base.html
@@ -18,20 +18,49 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">{{ PROJECT_NAME }}{% if PROJECT_BRIEF %} <span class="m-thin">{{ PROJECT_BRIEF }}</span>{% endif %}</a>
+      {% if M_LINKS_NAVBAR1 or M_LINKS_NAVBAR2 %}
       <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
       <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
       <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
         <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html"{% if navbar_current == 'pages' %} id="m-navbar-current"{% endif %}>Pages</a></li>
-            <li><a href="namespaces.html"{% if navbar_current == 'namespaces' %} id="m-navbar-current"{% endif %}>Namespaces</a></li>
+          <ol class="{% if M_LINKS_NAVBAR2 %}m-col-t-6{% else %}m-col-t-12{% endif %} m-col-m-none">
+            {% for title, link, id, sub in M_LINKS_NAVBAR1 %}
+            {% if not sub %}
+            <li><a href="{{ link }}"{% if (compound and compound.id == id) or navbar_current == id %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
+            {% else %}
+            <li>
+              <a href="{{ link }}"{% if (compound and compound.id == id) or navbar_current == id %} id="m-navbar-current"{% endif %}>{{ title }}</a>
+              <ol>
+                {% for title, link, id in sub %}
+                <li><a href="{{ link }}"{% if (compound and compound.id == id) or navbar_current == id %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
+                {% endfor %}
+              </ol>
+            </li>
+            {% endif %}
+            {% endfor %}
           </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html"{% if navbar_current == 'annotated' %} id="m-navbar-current"{% endif %}>Classes</a></li>
-            <li><a href="files.html"{% if navbar_current == 'files' %} id="m-navbar-current"{% endif %}>Files</a></li>
+          {% if M_LINKS_NAVBAR2 %}
+          {% set start = M_LINKS_NAVBAR1|length + 1 %}
+          <ol class="m-col-t-6 m-col-m-none" start="{{ start }}">
+            {% for title, link, id, sub in M_LINKS_NAVBAR2 %}
+            {% if not sub %}
+            <li><a href="{{ link }}"{% if (compound and compound.id == id) or navbar_current == id %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
+            {% else %}
+            <li>
+              <a href="{{ link }}"{% if (compound and compound.id == id) or navbar_current == id %} id="m-navbar-current"{% endif %}>{{ title }}</a>
+              <ol>
+                {% for title, link, id in sub %}
+                <li><a href="{{ link }}"{% if (compound and compound.id == id) or navbar_current == id %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
+                {% endfor %}
+              </ol>
+            </li>
+            {% endif %}
+            {% endfor %}
           </ol>
+          {% endif %}
         </div>
       </div>
+      {% endif %}
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/templates/dir.html b/doxygen/templates/dir.html
index 1d54c5e59c80b0d9158ae71fcd5290e82c330f8f..666f07d03ca01f5e0ba727f53a4162a7b647d956 100644 (file)
--- a/doxygen/templates/dir.html
+++ b/doxygen/templates/dir.html
@@ -1,4 +1,3 @@
-{% set navbar_current = 'files' %}
 {% extends 'base-reference.html' %}
 
 {% block title %}{% for name, _ in compound.breadcrumb %}{{ name }}/{% endfor %} directory | {{ super() }}{% endblock %}

diff --git a/doxygen/templates/file.html b/doxygen/templates/file.html
index 8ded452a1038b2a84ca7d4eefeca3bf4d62f06b7..126ccaa5f0f18d30c0db57c747719a0b9880a40c 100644 (file)
--- a/doxygen/templates/file.html
+++ b/doxygen/templates/file.html
@@ -1,4 +1,3 @@
-{% set navbar_current = 'files' %}
 {% extends 'base-reference.html' %}
 
 {% block title %}{% set j = joiner('/') %}{% for name, _ in compound.breadcrumb %}{{ j() }}{{ name }}{% endfor %} file | {{ super() }}{% endblock %}

diff --git a/doxygen/templates/namespace.html b/doxygen/templates/namespace.html
index e829c15e554b0fdc2620f745934dc0ab25bbe755..a90756af83e9ffd779fe8358ac9d92dbbb66ad58 100644 (file)
--- a/doxygen/templates/namespace.html
+++ b/doxygen/templates/namespace.html
@@ -1,4 +1,3 @@
-{% set navbar_current = 'namespaces' %}
 {% extends 'base-reference.html' %}
 
 {% block title %}{% set j = joiner('::') %}{% for name, _ in compound.breadcrumb %}{{ j() }}{{ name }}{% endfor %} namespace | {{ super() }}{% endblock %}

diff --git a/doxygen/templates/page.html b/doxygen/templates/page.html
index a4c7ebc08cc5dedd77c8996015ab8e000f4933ce..fb5f89268425aa2283b5b37f4503ed3fade8be40 100644 (file)
--- a/doxygen/templates/page.html
+++ b/doxygen/templates/page.html
@@ -1,4 +1,3 @@
-{% set navbar_current = 'pages' %}
 {% extends 'base.html' %}
 
 {% block title %}{% if 1 in compound.breadcrumb or compound.breadcrumb[-1][0] != PROJECT_NAME %}{% set j = joiner(' » ') %}{% for name, _ in compound.breadcrumb %}{{ j() }}{{ name }}{% endfor %} | {{ super() }}{% else %}{{ super() }}{% endif %}{% endblock %}

diff --git a/doxygen/test/compound_detailed/Doxyfile b/doxygen/test/compound_detailed/Doxyfile
index c25c56973bd7b4ff03de4d5e49ad4d4bd7e68fa7..262c15500b433e3aa16cc363d02a026a4c26a104 100644 (file)
--- a/doxygen/test/compound_detailed/Doxyfile
+++ b/doxygen/test/compound_detailed/Doxyfile
@@ -7,3 +7,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/compound_detailed/File_8h.html b/doxygen/test/compound_detailed/File_8h.html
index 7cb7671b92ae41faf29d709b02360c49ebbf2d79..4eff1f6f0cb97695374166f8c6fc7f02b2e341b2 100644 (file)
--- a/doxygen/test/compound_detailed/File_8h.html
+++ b/doxygen/test/compound_detailed/File_8h.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html" id="m-navbar-current">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/namespaceEno.html b/doxygen/test/compound_detailed/namespaceEno.html
index 9c2f9caa0177a4c4f861b7956ef537ea4957320d..d79a35ad5a5e660f7bdcc3e4013f623f2b16446b 100644 (file)
--- a/doxygen/test/compound_detailed/namespaceEno.html
+++ b/doxygen/test/compound_detailed/namespaceEno.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html" id="m-navbar-current">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/namespaceFoo.html b/doxygen/test/compound_detailed/namespaceFoo.html
index 191d57956613476c1725ff03f99b771d0e8f2367..29f2ba6e22cafc9fc91bdc4ab8fb658478619bd5 100644 (file)
--- a/doxygen/test/compound_detailed/namespaceFoo.html
+++ b/doxygen/test/compound_detailed/namespaceFoo.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html" id="m-navbar-current">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/namespaceNamee.html b/doxygen/test/compound_detailed/namespaceNamee.html
index ede9b314b88eda8eed801a1184dd6ef3c3455bc7..88397c94dc7a684ff3d27475bd8cfd6adf262035 100644 (file)
--- a/doxygen/test/compound_detailed/namespaceNamee.html
+++ b/doxygen/test/compound_detailed/namespaceNamee.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html" id="m-navbar-current">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/namespaceType.html b/doxygen/test/compound_detailed/namespaceType.html
index 0264db6f7544fe776f0a1f4190b23cccda5c4073..81fbd143b4852738eb739698b454e02539ef8388 100644 (file)
--- a/doxygen/test/compound_detailed/namespaceType.html
+++ b/doxygen/test/compound_detailed/namespaceType.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html" id="m-navbar-current">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/namespaceVar.html b/doxygen/test/compound_detailed/namespaceVar.html
index c5e7acf1bac22c4b48ea715a894eeb94e02add1c..7e831743487b79f88c8206c7a4c233b6e11633fb 100644 (file)
--- a/doxygen/test/compound_detailed/namespaceVar.html
+++ b/doxygen/test/compound_detailed/namespaceVar.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html" id="m-navbar-current">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/namespaceWarning.html b/doxygen/test/compound_detailed/namespaceWarning.html
index 02778f03e383eef61d47e0dfda29a906deb91d39..ab9d2ecdccf00841d45e4afa4d680585b984a600 100644 (file)
--- a/doxygen/test/compound_detailed/namespaceWarning.html
+++ b/doxygen/test/compound_detailed/namespaceWarning.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html" id="m-navbar-current">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/structTemplate.html b/doxygen/test/compound_detailed/structTemplate.html
index d3824c22b27f9e36b58869c3e3cc494115d604d5..a043b74926081d20a054346d15b24d4334556b42 100644 (file)
--- a/doxygen/test/compound_detailed/structTemplate.html
+++ b/doxygen/test/compound_detailed/structTemplate.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html" id="m-navbar-current">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/structTemplateWarning.html b/doxygen/test/compound_detailed/structTemplateWarning.html
index 2d838cb60872356dde3a575a901bca5fcccd74fb..feb96dbd1fec9176d3d53b3243579aaa15a066d2 100644 (file)
--- a/doxygen/test/compound_detailed/structTemplateWarning.html
+++ b/doxygen/test/compound_detailed/structTemplateWarning.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html" id="m-navbar-current">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_detailed/structTemplate_3_01void_01_4.html b/doxygen/test/compound_detailed/structTemplate_3_01void_01_4.html
index 8954624cb08bd74b4cb8823adfd2d150dba4efa4..0ca497442adc5bb6875f781ecff741fd7186dedb 100644 (file)
--- a/doxygen/test/compound_detailed/structTemplate_3_01void_01_4.html
+++ b/doxygen/test/compound_detailed/structTemplate_3_01void_01_4.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html" id="m-navbar-current">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/compound_listing/Class_8h.html b/doxygen/test/compound_listing/Class_8h.html
index 86bd812640f754c7960c5816f7f56157fa89d95d..a392234786f3ca529c51d2d7681e6a76e35a664c 100644 (file)
--- a/doxygen/test/compound_listing/Class_8h.html
+++ b/doxygen/test/compound_listing/Class_8h.html
@@ -22,7 +22,7 @@
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">
             <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html" id="m-navbar-current">Files</a></li>
+            <li><a href="files.html">Files</a></li>
           </ol>
         </div>
       </div>

diff --git a/doxygen/test/compound_listing/Doxyfile b/doxygen/test/compound_listing/Doxyfile
index 82f23188584826386ca75687ad77f841375bf098..d1821c2749fe8006993826fe80192a620efc17b0 100644 (file)
--- a/doxygen/test/compound_listing/Doxyfile
+++ b/doxygen/test/compound_listing/Doxyfile
@@ -12,3 +12,4 @@ M_CLASS_TREE_EXPAND_LEVELS = 5
 M_EXPAND_INNER_TYPES    = YES
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+# Keeping navbar enabled so we can test for highlighted items

diff --git a/doxygen/test/compound_listing/File_8h.html b/doxygen/test/compound_listing/File_8h.html
index 5c5856e5699027dc47bac19e57494ee7e35849a2..a304ca1956965842af8c869fb30e1563a62eaf18 100644 (file)
--- a/doxygen/test/compound_listing/File_8h.html
+++ b/doxygen/test/compound_listing/File_8h.html
@@ -22,7 +22,7 @@
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">
             <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html" id="m-navbar-current">Files</a></li>
+            <li><a href="files.html">Files</a></li>
           </ol>
         </div>
       </div>

diff --git a/doxygen/test/compound_listing/classRoot_1_1Directory_1_1Sub_1_1Class.html b/doxygen/test/compound_listing/classRoot_1_1Directory_1_1Sub_1_1Class.html
index 9443cc2d6efa7b24292b6f21261b11d789c8479f..1c3a70e5449280f2733287d064045911e2c1debb 100644 (file)
--- a/doxygen/test/compound_listing/classRoot_1_1Directory_1_1Sub_1_1Class.html
+++ b/doxygen/test/compound_listing/classRoot_1_1Directory_1_1Sub_1_1Class.html
@@ -21,7 +21,7 @@
             <li><a href="namespaces.html">Namespaces</a></li>
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html" id="m-navbar-current">Classes</a></li>
+            <li><a href="annotated.html">Classes</a></li>
             <li><a href="files.html">Files</a></li>
           </ol>
         </div>

diff --git a/doxygen/test/compound_listing/dir_4b0d5f8864bf89936129251a2d32609b.html b/doxygen/test/compound_listing/dir_4b0d5f8864bf89936129251a2d32609b.html
index 2a50f7525adeb036bb9fe0e1183cc799fdc1b7c9..a3cde8ff6910811712196091173449cf6186fa28 100644 (file)
--- a/doxygen/test/compound_listing/dir_4b0d5f8864bf89936129251a2d32609b.html
+++ b/doxygen/test/compound_listing/dir_4b0d5f8864bf89936129251a2d32609b.html
@@ -22,7 +22,7 @@
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">
             <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html" id="m-navbar-current">Files</a></li>
+            <li><a href="files.html">Files</a></li>
           </ol>
         </div>
       </div>

diff --git a/doxygen/test/compound_listing/dir_bbe5918fe090eee9db2d9952314b6754.html b/doxygen/test/compound_listing/dir_bbe5918fe090eee9db2d9952314b6754.html
index a63821a9d442545342c5f0f1e80d6d04f409f973..aca3ac2bbc5d22065fd4cd56aa4c81b5836b9f5f 100644 (file)
--- a/doxygen/test/compound_listing/dir_bbe5918fe090eee9db2d9952314b6754.html
+++ b/doxygen/test/compound_listing/dir_bbe5918fe090eee9db2d9952314b6754.html
@@ -22,7 +22,7 @@
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">
             <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html" id="m-navbar-current">Files</a></li>
+            <li><a href="files.html">Files</a></li>
           </ol>
         </div>
       </div>

diff --git a/doxygen/test/compound_listing/namespaceAnother.html b/doxygen/test/compound_listing/namespaceAnother.html
index a3e9099a035ae305ebfd8af39aa09efb1e549ebc..2093dfba93d3f2764b53fae3b970f5e71c6cdca7 100644 (file)
--- a/doxygen/test/compound_listing/namespaceAnother.html
+++ b/doxygen/test/compound_listing/namespaceAnother.html
@@ -18,7 +18,7 @@
         <div class="m-row">
           <ol class="m-col-t-6 m-col-m-none">
             <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html" id="m-navbar-current">Namespaces</a></li>
+            <li><a href="namespaces.html">Namespaces</a></li>
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">
             <li><a href="annotated.html">Classes</a></li>

diff --git a/doxygen/test/compound_listing/namespaceRoot_1_1Directory.html b/doxygen/test/compound_listing/namespaceRoot_1_1Directory.html
index e7460f5ef1976b3ce31babf4e8d45c4c84bc049b..f11c2c5f3de1e6671ccc7a4ef79743fa2285ff09 100644 (file)
--- a/doxygen/test/compound_listing/namespaceRoot_1_1Directory.html
+++ b/doxygen/test/compound_listing/namespaceRoot_1_1Directory.html
@@ -18,7 +18,7 @@
         <div class="m-row">
           <ol class="m-col-t-6 m-col-m-none">
             <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html" id="m-navbar-current">Namespaces</a></li>
+            <li><a href="namespaces.html">Namespaces</a></li>
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">
             <li><a href="annotated.html">Classes</a></li>

diff --git a/doxygen/test/compound_listing/page-no-toc.html b/doxygen/test/compound_listing/page-no-toc.html
index becccef0a561f62e0aa785512196124a085f6065..72ca76788ed6121499c599cb1aaf1c26fd0aa3a7 100644 (file)
--- a/doxygen/test/compound_listing/page-no-toc.html
+++ b/doxygen/test/compound_listing/page-no-toc.html
@@ -17,7 +17,7 @@
       <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
         <div class="m-row">
           <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
+            <li><a href="pages.html">Pages</a></li>
             <li><a href="namespaces.html">Namespaces</a></li>
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">

diff --git a/doxygen/test/compound_listing/pages.html b/doxygen/test/compound_listing/pages.html
new file mode 100644 (file)
index 0000000..3d34c5d
--- /dev/null
+++ b/doxygen/test/compound_listing/pages.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>My Project</title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
+  <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+</head>
+<body>
+<header><nav id="navigation">
+  <div class="m-container">
+    <div class="m-row">
+      <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
+      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
+      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
+      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
+        <div class="m-row">
+          <ol class="m-col-t-6 m-col-m-none">
+            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
+            <li><a href="namespaces.html">Namespaces</a></li>
+          </ol>
+          <ol class="m-col-t-6 m-col-m-none" start="3">
+            <li><a href="annotated.html">Classes</a></li>
+            <li><a href="files.html">Files</a></li>
+          </ol>
+        </div>
+      </div>
+    </div>
+  </div>
+</nav></header>
+<main><article>
+  <div class="m-container m-container-inflatable">
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        <h1>Pages</h2>
+        <ul class="m-dox">
+          <li><a href="page-no-toc.html" class="m-dox">Page without TOC</a> <span class="m-dox"></span></li>
+        </ul>
+        <script>
+        function toggle(e) {
+            e.parentElement.className = e.parentElement.className == 'm-dox-collapsible' ?
+                'm-dox-expansible' : 'm-dox-collapsible';
+            return false;
+        }
+        /* Collapse all nodes marked as such. Doing it via JS instead of directly in
+           markup so disabling it doesn't harm usability. The list is somehow
+           regenerated on every iteration and shrinks as I change the classes. It's not
+           documented anywhere and I'm not sure if this is the same across browsers, so
+           I am going backwards in that list to be sure.  */
+        var collapsed = document.getElementsByClassName("collapsed");
+        for(var i = collapsed.length - 1; i >= 0; --i)
+            collapsed[i].className = 'm-dox-expansible';
+        </script>
+      </div>
+    </div>
+  </div>
+</article></main>
+</body>
+</html>
\ No newline at end of file

diff --git a/doxygen/test/contents_blocks/Doxyfile b/doxygen/test/contents_blocks/Doxyfile
index 4e15e062787df8842f43f127c34bfb9cc59d3586..8ad35e1d4ad1ceb91313200eebe8b03d9de29093 100644 (file)
--- a/doxygen/test/contents_blocks/Doxyfile
+++ b/doxygen/test/contents_blocks/Doxyfile
@@ -6,3 +6,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/contents_blocks/File_8h.html b/doxygen/test/contents_blocks/File_8h.html
index 39a37e85f61bf1140b563d3747d0f94fb4e81ddc..017f3b201e8a05f0f15110e0e340a99e5200c809 100644 (file)
--- a/doxygen/test/contents_blocks/File_8h.html
+++ b/doxygen/test/contents_blocks/File_8h.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html" id="m-navbar-current">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_blocks/index.html b/doxygen/test/contents_blocks/index.html
index 8a6da8a140364e47dd715d87295fbb3e6071219b..965c0416506ce563859df26bdba11a379ced3409 100644 (file)
--- a/doxygen/test/contents_blocks/index.html
+++ b/doxygen/test/contents_blocks/index.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_blocks/old.html b/doxygen/test/contents_blocks/old.html
index 862f3d47ccb35becc3cdb88d32c70b279b817628..dc763997a9730588af5815975a83d8217ce78d04 100644 (file)
--- a/doxygen/test/contents_blocks/old.html
+++ b/doxygen/test/contents_blocks/old.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_blocks/todo.html b/doxygen/test/contents_blocks/todo.html
index f85a76d94ffbe9b4850961c13195c37906746868..bf23628d9f3f6ed04ca43ede73ca75ae8ffd504a 100644 (file)
--- a/doxygen/test/contents_blocks/todo.html
+++ b/doxygen/test/contents_blocks/todo.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_code/Doxyfile b/doxygen/test/contents_code/Doxyfile
index c350a33caeba16170258f390cb06d54b54d6e4f0..e30874b3619d30f3c49ad41feee6f7c1a83a7fcb 100644 (file)
--- a/doxygen/test/contents_code/Doxyfile
+++ b/doxygen/test/contents_code/Doxyfile
@@ -7,3 +7,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/contents_code/index.html b/doxygen/test/contents_code/index.html
index 4011882634c6906d6550cc7902791d97f1bd7708..769e89f4ad5c2a937d142f5b0d938972d6ba016b 100644 (file)
--- a/doxygen/test/contents_code/index.html
+++ b/doxygen/test/contents_code/index.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_code/warnings.html b/doxygen/test/contents_code/warnings.html
index 6f2f2e068ea491a55cdc2939613041201f262c7c..cdd8386990a0a188adb655dd502252842b1d3205 100644 (file)
--- a/doxygen/test/contents_code/warnings.html
+++ b/doxygen/test/contents_code/warnings.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_code_language/Doxyfile b/doxygen/test/contents_code_language/Doxyfile
index c350a33caeba16170258f390cb06d54b54d6e4f0..e30874b3619d30f3c49ad41feee6f7c1a83a7fcb 100644 (file)
--- a/doxygen/test/contents_code_language/Doxyfile
+++ b/doxygen/test/contents_code_language/Doxyfile
@@ -7,3 +7,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/contents_code_language/ansi.html b/doxygen/test/contents_code_language/ansi.html
index 0ffa1129ba818346eb655d36c5cba1ab6e987d43..b80e6d3973bb94231767803b5c1b621292c541cd 100644 (file)
--- a/doxygen/test/contents_code_language/ansi.html
+++ b/doxygen/test/contents_code_language/ansi.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_code_language/index.html b/doxygen/test/contents_code_language/index.html
index 205f78c6980a94eb0c55113cd52b7634eecb18ce..fa4c5c4f1bc16b3fb1dbfbb122d0466ac9b9cffd 100644 (file)
--- a/doxygen/test/contents_code_language/index.html
+++ b/doxygen/test/contents_code_language/index.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_code_language/warnings.html b/doxygen/test/contents_code_language/warnings.html
index 299229a120fb91cde74761f35bdc11c1243e523c..f1a4a823e9a01ec227a05656cd312188103cd3e5 100644 (file)
--- a/doxygen/test/contents_code_language/warnings.html
+++ b/doxygen/test/contents_code_language/warnings.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_custom/Doxyfile b/doxygen/test/contents_custom/Doxyfile
index 53a07a692b54b3500c5750398e5b28d8dbb485bc..dc08fb456fff3cbcf40d36820be22bff0c70f896 100644 (file)
--- a/doxygen/test/contents_custom/Doxyfile
+++ b/doxygen/test/contents_custom/Doxyfile
@@ -7,6 +7,8 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =
 
 ALIASES = \
     "m_div{1}=@xmlonly<mcss:div xmlns:mcss=\"http://mcss.mosra.cz/doxygen/\" mcss:class=\"\1\">@endxmlonly" \

diff --git a/doxygen/test/contents_custom/index.html b/doxygen/test/contents_custom/index.html
index 2a99cb22b4ccf61dd74e69a74956b558686cce08..522871023593ee83fd1e8851eccce2ef0a8a0e0f 100644 (file)
--- a/doxygen/test/contents_custom/index.html
+++ b/doxygen/test/contents_custom/index.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_custom/math.html b/doxygen/test/contents_custom/math.html
index e563e2ffc59a2ddd62acf2349e9f0ce2c87cf175..a874ad736af4cbf48821225fc54f96c45a4a61c0 100644 (file)
--- a/doxygen/test/contents_custom/math.html
+++ b/doxygen/test/contents_custom/math.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_custom/subpage1.html b/doxygen/test/contents_custom/subpage1.html
index 7c2f5c4fb15d528454a84f1072ef15cb4677e908..8769ef806592164f0dbdffa1b0bef5484add8ebc 100644 (file)
--- a/doxygen/test/contents_custom/subpage1.html
+++ b/doxygen/test/contents_custom/subpage1.html
@@ -13,20 +13,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_custom/subpage2.html b/doxygen/test/contents_custom/subpage2.html
index a0f1f5547e174b88408cf185d170616929d59cbf..4e40a924e331dddc4b6c80d4c81646e26cff8ab2 100644 (file)
--- a/doxygen/test/contents_custom/subpage2.html
+++ b/doxygen/test/contents_custom/subpage2.html
@@ -13,20 +13,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_image/Doxyfile b/doxygen/test/contents_image/Doxyfile
index 697773bf9741412a34bdefa41e514c3fb90d33f5..8e208b5cae06538058715b25bf063834f8bb3a11 100644 (file)
--- a/doxygen/test/contents_image/Doxyfile
+++ b/doxygen/test/contents_image/Doxyfile
@@ -7,3 +7,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/contents_image/index.html b/doxygen/test/contents_image/index.html
index 2b88025e46018cc0e604051d8b51b42405374237..3f966fb7c033619f4a157e8a4c8a6370566dc7ae 100644 (file)
--- a/doxygen/test/contents_image/index.html
+++ b/doxygen/test/contents_image/index.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_image/warnings.html b/doxygen/test/contents_image/warnings.html
index 613811638895dd611921c7d2ed24d28cb857e9f8..4545e2f54f89af8111c55321c031ead5cdf05c6f 100644 (file)
--- a/doxygen/test/contents_image/warnings.html
+++ b/doxygen/test/contents_image/warnings.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_math/Doxyfile b/doxygen/test/contents_math/Doxyfile
index 8f715fd457491c90998bb7c49e4cfece9bf9d1fd..645853848d7cb944cff3a2d22162aaf1f747376f 100644 (file)
--- a/doxygen/test/contents_math/Doxyfile
+++ b/doxygen/test/contents_math/Doxyfile
@@ -6,3 +6,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/contents_math/index.html b/doxygen/test/contents_math/index.html
index ee8a71c79ac24115be1fd6fb0b05cf9dd7b9162a..b6795619ef3cacf7beae3343590ae3fbede5368e 100644 (file)
--- a/doxygen/test/contents_math/index.html
+++ b/doxygen/test/contents_math/index.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_tagfile/Doxyfile b/doxygen/test/contents_tagfile/Doxyfile
index ac5923f6acc99157b506c67a130158b074aa7f2f..eff13271863331611e5e5d894e5b62ed613d9bd6 100644 (file)
--- a/doxygen/test/contents_tagfile/Doxyfile
+++ b/doxygen/test/contents_tagfile/Doxyfile
@@ -7,3 +7,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/contents_tagfile/index.html b/doxygen/test/contents_tagfile/index.html
index 2802371df9312271820977a15de1286e57227af1..c94f728d7cacb1401aea57d752ea72c2664badb2 100644 (file)
--- a/doxygen/test/contents_tagfile/index.html
+++ b/doxygen/test/contents_tagfile/index.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_typography/Doxyfile b/doxygen/test/contents_typography/Doxyfile
index 8f715fd457491c90998bb7c49e4cfece9bf9d1fd..645853848d7cb944cff3a2d22162aaf1f747376f 100644 (file)
--- a/doxygen/test/contents_typography/Doxyfile
+++ b/doxygen/test/contents_typography/Doxyfile
@@ -6,3 +6,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/contents_typography/index.html b/doxygen/test/contents_typography/index.html
index fd42c6cc84e0eab90f929a43cb5ac0632b6605c7..6341068b2b427212c8c667625429711b18409413 100644 (file)
--- a/doxygen/test/contents_typography/index.html
+++ b/doxygen/test/contents_typography/index.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/contents_typography/warnings.html b/doxygen/test/contents_typography/warnings.html
index 10f9c0e6ba4285906feb14cec2bee55dd24076d0..23f6e5b1f34b9cdb70bfc39e52140144990c82c7 100644 (file)
--- a/doxygen/test/contents_typography/warnings.html
+++ b/doxygen/test/contents_typography/warnings.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/cpp_enum_class/Doxyfile b/doxygen/test/cpp_enum_class/Doxyfile
index c25c56973bd7b4ff03de4d5e49ad4d4bd7e68fa7..262c15500b433e3aa16cc363d02a026a4c26a104 100644 (file)
--- a/doxygen/test/cpp_enum_class/Doxyfile
+++ b/doxygen/test/cpp_enum_class/Doxyfile
@@ -7,3 +7,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/cpp_enum_class/File_8h.html b/doxygen/test/cpp_enum_class/File_8h.html
index 698d169865f3966fabff3d2d0ea4e4bac15ea032..b729c46b0849c50a4a7068217314368411849aee 100644 (file)
--- a/doxygen/test/cpp_enum_class/File_8h.html
+++ b/doxygen/test/cpp_enum_class/File_8h.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html" id="m-navbar-current">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/cpp_template_alias/Doxyfile b/doxygen/test/cpp_template_alias/Doxyfile
index c25c56973bd7b4ff03de4d5e49ad4d4bd7e68fa7..262c15500b433e3aa16cc363d02a026a4c26a104 100644 (file)
--- a/doxygen/test/cpp_template_alias/Doxyfile
+++ b/doxygen/test/cpp_template_alias/Doxyfile
@@ -7,3 +7,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/cpp_template_alias/File_8h.html b/doxygen/test/cpp_template_alias/File_8h.html
index 9d3da5ee111761db836fe3ccbe309243870fcc8b..a48c0ba6cbeeab61c12c694d3ea4d59d3805f8d8 100644 (file)
--- a/doxygen/test/cpp_template_alias/File_8h.html
+++ b/doxygen/test/cpp_template_alias/File_8h.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html" id="m-navbar-current">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/cpp_template_alias/structTemplate.html b/doxygen/test/cpp_template_alias/structTemplate.html
index 50ddbaffedf50f058f01dc23bdd41a3c980f82b0..6e25e13a8b5aab363248dcb843f06104ea8fa494 100644 (file)
--- a/doxygen/test/cpp_template_alias/structTemplate.html
+++ b/doxygen/test/cpp_template_alias/structTemplate.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html" id="m-navbar-current">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/layout/Doxyfile b/doxygen/test/layout/Doxyfile
index 922ee25fe2e17f86535aa04801b939a336659cef..cbe5515256a1fe9a78be53865200fcd099f90163 100644 (file)
--- a/doxygen/test/layout/Doxyfile
+++ b/doxygen/test/layout/Doxyfile
@@ -6,3 +6,6 @@ PROJECT_BRIEF = "is cool"
 M_THEME_COLOR = 00ffff
 M_PAGE_HEADER = "<p><a href=\"{filename}\">A self link</a>.</p>"
 M_PAGE_FINE_PRINT = "<p><a href=\"http://doxygen.org\">Doxygen</a> version {doxygen_version}.</p>"
+M_LINKS_NAVBAR1 = "files pages namespaces" \
+                  "annotated namespaces pages"
+M_LINKS_NAVBAR2 = "pages pages annotated"

diff --git a/doxygen/test/layout/index.xml b/doxygen/test/layout/index.xml
new file mode 100644 (file)
index 0000000..8aee34f
--- /dev/null
+++ b/doxygen/test/layout/index.xml
@@ -0,0 +1,3 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<doxygenindex xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="index.xsd" version="1.0.666">
+</doxygenindex>

diff --git a/doxygen/test/layout/pages.html b/doxygen/test/layout/pages.html
new file mode 100644 (file)
index 0000000..860be68
--- /dev/null
+++ b/doxygen/test/layout/pages.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>A project is cool</title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
+  <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="theme-color" content="00ffff" />
+</head>
+<body>
+<header><nav id="navigation">
+  <div class="m-container">
+    <div class="m-row">
+      <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A project <span class="m-thin">is cool</span></a>
+      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
+      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
+      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
+        <div class="m-row">
+          <ol class="m-col-t-6 m-col-m-none">
+            <li>
+              <a href="files.html">Files</a>
+              <ol>
+                <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
+                <li><a href="namespaces.html">Namespaces</a></li>
+              </ol>
+            </li>
+            <li>
+              <a href="annotated.html">Classes</a>
+              <ol>
+                <li><a href="namespaces.html">Namespaces</a></li>
+                <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
+              </ol>
+            </li>
+          </ol>
+          <ol class="m-col-t-6 m-col-m-none" start="3">
+            <li>
+              <a href="pages.html" id="m-navbar-current">Pages</a>
+              <ol>
+                <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
+                <li><a href="annotated.html">Classes</a></li>
+              </ol>
+            </li>
+          </ol>
+        </div>
+      </div>
+    </div>
+  </div>
+</nav></header>
+<main><article>
+  <div class="m-container m-container-inflatable">
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        <p><a href="pages.html">A self link</a>.</p>
+        <h1>Pages</h2>
+        <ul class="m-dox">
+        </ul>
+        <script>
+        function toggle(e) {
+            e.parentElement.className = e.parentElement.className == 'm-dox-collapsible' ?
+                'm-dox-expansible' : 'm-dox-collapsible';
+            return false;
+        }
+        /* Collapse all nodes marked as such. Doing it via JS instead of directly in
+           markup so disabling it doesn't harm usability. The list is somehow
+           regenerated on every iteration and shrinks as I change the classes. It's not
+           documented anywhere and I'm not sure if this is the same across browsers, so
+           I am going backwards in that list to be sure.  */
+        var collapsed = document.getElementsByClassName("collapsed");
+        for(var i = collapsed.length - 1; i >= 0; --i)
+            collapsed[i].className = 'm-dox-expansible';
+        </script>
+      </div>
+    </div>
+  </div>
+</article></main>
+<footer><nav>
+  <div class="m-container">
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        <p><a href="http://doxygen.org">Doxygen</a> version 1.0.666.</p>
+      </div>
+    </div>
+  </div>
+</nav></footer>
+</body>
+</html>

diff --git a/doxygen/test/layout_minimal/index.html b/doxygen/test/layout_minimal/index.html
index 3042c426dcd35058c46a6226899c40e044af5358..a7f9046914bc4cdacc77135040b6e0d91ce2387a 100644 (file)
--- a/doxygen/test/layout_minimal/index.html
+++ b/doxygen/test/layout_minimal/index.html
@@ -18,7 +18,7 @@
       <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
         <div class="m-row">
           <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
+            <li><a href="pages.html">Pages</a></li>
             <li><a href="namespaces.html">Namespaces</a></li>
           </ol>
           <ol class="m-col-t-6 m-col-m-none" start="3">

diff --git a/doxygen/test/layout_navbar_single_column/Doxyfile b/doxygen/test/layout_navbar_single_column/Doxyfile
new file mode 100644 (file)
index 0000000..03cfccf
--- /dev/null
+++ b/doxygen/test/layout_navbar_single_column/Doxyfile
@@ -0,0 +1,9 @@
+XML_OUTPUT              =
+
+M_LINKS_NAVBAR1 = pages \
+                  namespaces \
+                  annotated \
+                  files
+M_LINKS_NAVBAR2 =
+M_PAGE_FINE_PRINT =
+M_THEME_COLOR =

diff --git a/doxygen/test/layout/index.html b/doxygen/test/layout_navbar_single_column/index.html
similarity index 67%
rename from doxygen/test/layout/index.html
rename to doxygen/test/layout_navbar_single_column/index.html
index 88f325d3213b1bfd41b1b731be6aeb39eb5febb4..bec4abc34d13818eca4f7c902b65ba1e5df85204 100644 (file)
--- a/doxygen/test/layout/index.html
+++ b/doxygen/test/layout_navbar_single_column/index.html
@@ -2,26 +2,23 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8" />
-  <title>A project is cool</title>
+  <title>My Project</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
   <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="theme-color" content="00ffff" />
 </head>
 <body>
 <header><nav id="navigation">
   <div class="m-container">
     <div class="m-row">
-      <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A project <span class="m-thin">is cool</span></a>
+      <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
       <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
       <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
       <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
         <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
+          <ol class="m-col-t-12 m-col-m-none">
+            <li><a href="pages.html">Pages</a></li>
             <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
             <li><a href="annotated.html">Classes</a></li>
             <li><a href="files.html">Files</a></li>
           </ol>
@@ -34,22 +31,12 @@
   <div class="m-container m-container-inflatable">
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        <p><a href="index.html">A self link</a>.</p>
         <h1>
-          A project
+          My Project
         </h1>
       </div>
     </div>
   </div>
 </article></main>
-<footer><nav>
-  <div class="m-container">
-    <div class="m-row">
-      <div class="m-col-l-10 m-push-l-1">
-        <p><a href="http://doxygen.org">Doxygen</a> version 1.0.666.</p>
-      </div>
-    </div>
-  </div>
-</nav></footer>
 </body>
 </html>

diff --git a/doxygen/test/layout/indexpage.xml b/doxygen/test/layout_navbar_single_column/indexpage.xml
similarity index 78%
rename from doxygen/test/layout/indexpage.xml
rename to doxygen/test/layout_navbar_single_column/indexpage.xml
index 6873eb232fab325bbc5c334aaf507fabc376ef5b..fa7a2a878e6f1a9ba645e890fd34c90ec404a5a1 100644 (file)
--- a/doxygen/test/layout/indexpage.xml
+++ b/doxygen/test/layout_navbar_single_column/indexpage.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.0.666">
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.8.14">
   <compounddef id="indexpage" kind="page">
     <compoundname>index</compoundname>
-    <title>A project</title>
+    <title>My Project</title>
     <briefdescription>
     </briefdescription>
     <detaileddescription>

diff --git a/doxygen/test/page_brief/Doxyfile b/doxygen/test/page_brief/Doxyfile
index 8f715fd457491c90998bb7c49e4cfece9bf9d1fd..645853848d7cb944cff3a2d22162aaf1f747376f 100644 (file)
--- a/doxygen/test/page_brief/Doxyfile
+++ b/doxygen/test/page_brief/Doxyfile
@@ -6,3 +6,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/page_brief/page-a.html b/doxygen/test/page_brief/page-a.html
index 07c4226a547ad08328f745a5e34baadd498b2b39..ef2a7bed5295c9374d9fd732783bbbaa3a4e77ab 100644 (file)
--- a/doxygen/test/page_brief/page-a.html
+++ b/doxygen/test/page_brief/page-a.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/page_brief/page-b.html b/doxygen/test/page_brief/page-b.html
index f48c790854f79d79dc5eeefb6191df5fa2285a2e..a7f32e391b8fbbc042469a0b7ea2aa5fd633e15f 100644 (file)
--- a/doxygen/test/page_brief/page-b.html
+++ b/doxygen/test/page_brief/page-b.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/page_brief/pages.html b/doxygen/test/page_brief/pages.html
index 9ca90995e497e7503189ccc87e54bd534b1a7fdd..7da78e341abdd742fafaf54d439c92a2d2b039e7 100644 (file)
--- a/doxygen/test/page_brief/pages.html
+++ b/doxygen/test/page_brief/pages.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/page_in_navbar/Doxyfile b/doxygen/test/page_in_navbar/Doxyfile
new file mode 100644 (file)
index 0000000..63d3633
--- /dev/null
+++ b/doxygen/test/page_in_navbar/Doxyfile
@@ -0,0 +1,12 @@
+INPUT                   = input.dox
+QUIET                   = YES
+GENERATE_HTML           = NO
+GENERATE_LATEX          = NO
+GENERATE_XML            = YES
+
+M_PAGE_FINE_PRINT       =
+M_THEME_COLOR           =
+M_LINKS_NAVBAR1         = "page-in-navbar pages page-b" \
+                          "page-b"
+M_LINKS_NAVBAR2         = "page-b" \
+                          "page-in-navbar page-b files"

diff --git a/doxygen/test/page_in_navbar/input.dox b/doxygen/test/page_in_navbar/input.dox
new file mode 100644 (file)
index 0000000..7f8dbd9
--- /dev/null
+++ b/doxygen/test/page_in_navbar/input.dox
@@ -0,0 +1,9 @@
+/** @page page-in-navbar A page in navbar
+
+Detailed docs for a page.
+*/
+
+/** @page page-b B page in navbar
+
+Detailed docs for a page.
+*/

diff --git a/doxygen/test/page_in_navbar/page-b.html b/doxygen/test/page_in_navbar/page-b.html
new file mode 100644 (file)
index 0000000..42e59b3
--- /dev/null
+++ b/doxygen/test/page_in_navbar/page-b.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>B page in navbar | My Project</title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
+  <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+</head>
+<body>
+<header><nav id="navigation">
+  <div class="m-container">
+    <div class="m-row">
+      <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
+      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
+      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
+      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
+        <div class="m-row">
+          <ol class="m-col-t-6 m-col-m-none">
+            <li>
+              <a href="page-in-navbar.html">A page in navbar</a>
+              <ol>
+                <li><a href="pages.html">Pages</a></li>
+                <li><a href="page-b.html" id="m-navbar-current">B page in navbar</a></li>
+              </ol>
+            </li>
+            <li><a href="page-b.html" id="m-navbar-current">B page in navbar</a></li>
+          </ol>
+          <ol class="m-col-t-6 m-col-m-none" start="3">
+            <li><a href="page-b.html" id="m-navbar-current">B page in navbar</a></li>
+            <li>
+              <a href="page-in-navbar.html">A page in navbar</a>
+              <ol>
+                <li><a href="page-b.html" id="m-navbar-current">B page in navbar</a></li>
+                <li><a href="files.html">Files</a></li>
+              </ol>
+            </li>
+          </ol>
+        </div>
+      </div>
+    </div>
+  </div>
+</nav></header>
+<main><article>
+  <div class="m-container m-container-inflatable">
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        <h1>
+          B page in navbar
+        </h1>
+<p>Detailed docs for a page.</p>
+      </div>
+    </div>
+  </div>
+</article></main>
+</body>
+</html>
\ No newline at end of file

diff --git a/doxygen/test/page_in_navbar/page-in-navbar.html b/doxygen/test/page_in_navbar/page-in-navbar.html
new file mode 100644 (file)
index 0000000..e67b081
--- /dev/null
+++ b/doxygen/test/page_in_navbar/page-in-navbar.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>A page in navbar | My Project</title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
+  <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+</head>
+<body>
+<header><nav id="navigation">
+  <div class="m-container">
+    <div class="m-row">
+      <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
+      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
+      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
+      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
+        <div class="m-row">
+          <ol class="m-col-t-6 m-col-m-none">
+            <li>
+              <a href="page-in-navbar.html" id="m-navbar-current">A page in navbar</a>
+              <ol>
+                <li><a href="pages.html">Pages</a></li>
+                <li><a href="page-b.html">B page in navbar</a></li>
+              </ol>
+            </li>
+            <li><a href="page-b.html">B page in navbar</a></li>
+          </ol>
+          <ol class="m-col-t-6 m-col-m-none" start="3">
+            <li><a href="page-b.html">B page in navbar</a></li>
+            <li>
+              <a href="page-in-navbar.html" id="m-navbar-current">A page in navbar</a>
+              <ol>
+                <li><a href="page-b.html">B page in navbar</a></li>
+                <li><a href="files.html">Files</a></li>
+              </ol>
+            </li>
+          </ol>
+        </div>
+      </div>
+    </div>
+  </div>
+</nav></header>
+<main><article>
+  <div class="m-container m-container-inflatable">
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        <h1>
+          A page in navbar
+        </h1>
+<p>Detailed docs for a page.</p>
+      </div>
+    </div>
+  </div>
+</article></main>
+</body>
+</html>

diff --git a/doxygen/test/page_order/Doxyfile b/doxygen/test/page_order/Doxyfile
index 480058ddee831f67186e1580b4168f094fd513b3..0b25b865878a1827b2d1e4b7084ed8ee4c930ea5 100644 (file)
--- a/doxygen/test/page_order/Doxyfile
+++ b/doxygen/test/page_order/Doxyfile
@@ -7,3 +7,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/page_order/pages.html b/doxygen/test/page_order/pages.html
index de6811a743af56f2f2a07de559727ecc42ac5790..c8f21eda82c9250422bcd7c2ff75a09c96133c0b 100644 (file)
--- a/doxygen/test/page_order/pages.html
+++ b/doxygen/test/page_order/pages.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/page_toc/Doxyfile b/doxygen/test/page_toc/Doxyfile
index 8f715fd457491c90998bb7c49e4cfece9bf9d1fd..645853848d7cb944cff3a2d22162aaf1f747376f 100644 (file)
--- a/doxygen/test/page_toc/Doxyfile
+++ b/doxygen/test/page_toc/Doxyfile
@@ -6,3 +6,5 @@ GENERATE_XML            = YES
 
 M_PAGE_FINE_PRINT       =
 M_THEME_COLOR           =
+M_LINKS_NAVBAR1         =
+M_LINKS_NAVBAR2         =

diff --git a/doxygen/test/page_toc/page-toc.html b/doxygen/test/page_toc/page-toc.html
index f376375498bb56e2b8083e9e8b5e5eb1bd5e23bf..e9899dbfcebc83d1820d659e9d25ba44dcac186d 100644 (file)
--- a/doxygen/test/page_toc/page-toc.html
+++ b/doxygen/test/page_toc/page-toc.html
@@ -12,20 +12,6 @@
   <div class="m-container">
     <div class="m-row">
       <a href="index.html" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">My Project</a>
-      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right"></a>
-      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-        <div class="m-row">
-          <ol class="m-col-t-6 m-col-m-none">
-            <li><a href="pages.html" id="m-navbar-current">Pages</a></li>
-            <li><a href="namespaces.html">Namespaces</a></li>
-          </ol>
-          <ol class="m-col-t-6 m-col-m-none" start="3">
-            <li><a href="annotated.html">Classes</a></li>
-            <li><a href="files.html">Files</a></li>
-          </ol>
-        </div>
-      </div>
     </div>
   </div>
 </nav></header>

diff --git a/doxygen/test/test_compound.py b/doxygen/test/test_compound.py
index 1ea5767659b63689c7c7077e883e3c461e6f060d..9102b0b10fc98b0341cb6a2aa062fd6f64950a9a 100644 (file)
--- a/doxygen/test/test_compound.py
+++ b/doxygen/test/test_compound.py
@@ -32,9 +32,10 @@ class Listing(IntegrationTestCase):
         super().__init__(__file__, 'listing', *args, **kwargs)
 
     def test_index_pages(self):
-        self.run_dox2html5(wildcard='index.xml', index_pages=['annotated', 'namespaces'])
+        self.run_dox2html5(wildcard='index.xml', index_pages=['annotated', 'namespaces', 'pages'])
         self.assertEqual(*self.actual_expected_contents('annotated.html'))
         self.assertEqual(*self.actual_expected_contents('namespaces.html'))
+        self.assertEqual(*self.actual_expected_contents('pages.html'))
 
     def test_index_pages_custom_expand_level(self):
         self.run_dox2html5(wildcard='index.xml', index_pages=['files'])

diff --git a/doxygen/test/test_doxyfile.py b/doxygen/test/test_doxyfile.py
index 343309cbd7734b96f591d8eb8945547edbf59f66..c236b3684701d0e76324b080e45af780962bca9f 100644 (file)
--- a/doxygen/test/test_doxyfile.py
+++ b/doxygen/test/test_doxyfile.py
@@ -37,6 +37,8 @@ class Doxyfile(unittest.TestCase):
             'M_CLASS_TREE_EXPAND_LEVELS': 1,
             'M_EXPAND_INNER_TYPES': False,
             'M_FILE_TREE_EXPAND_LEVELS': 1,
+            'M_LINKS_NAVBAR1': ['pages', 'namespaces'],
+            'M_LINKS_NAVBAR2': ['annotated', 'files'],
             'M_PAGE_FINE_PRINT': 'this is "quotes"',
             'M_PAGE_HEADER': 'this is "quotes" \'apostrophes\'',
             'M_THEME_COLOR': '#22272e',

diff --git a/doxygen/test/test_layout.py b/doxygen/test/test_layout.py
index 8d9cf9a364bab42f01c163c81ceca25f654100ed..4e7c8d262c1bd8895dbcd0a6494e305c412b64f4 100644 (file)
--- a/doxygen/test/test_layout.py
+++ b/doxygen/test/test_layout.py
@@ -29,8 +29,8 @@ class Layout(BaseTestCase):
         super().__init__(__file__, '', *args, **kwargs)
 
     def test(self):
-        self.run_dox2html5(wildcard='indexpage.xml')
-        self.assertEqual(*self.actual_expected_contents('index.html'))
+        self.run_dox2html5(wildcard='index.xml')
+        self.assertEqual(*self.actual_expected_contents('pages.html'))
 
 class LayoutMinimal(BaseTestCase):
     def __init__(self, *args, **kwargs):
@@ -39,3 +39,11 @@ class LayoutMinimal(BaseTestCase):
     def test(self):
         self.run_dox2html5(wildcard='indexpage.xml')
         self.assertEqual(*self.actual_expected_contents('index.html'))
+
+class LayoutNavbarSingleColumn(BaseTestCase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(__file__, 'navbar_single_column', *args, **kwargs)
+
+    def test(self):
+        self.run_dox2html5(wildcard='indexpage.xml')
+        self.assertEqual(*self.actual_expected_contents('index.html'))

diff --git a/doxygen/test/test_page.py b/doxygen/test/test_page.py
index d1f0a1e18c4d2a89ca03a4227c7966d4c8ffac80..dd5130da37682a5f71e0a97023f5a3c4863a16b4 100644 (file)
--- a/doxygen/test/test_page.py
+++ b/doxygen/test/test_page.py
@@ -57,3 +57,12 @@ class Toc(IntegrationTestCase):
     def test(self):
         self.run_dox2html5(wildcard='page-toc.xml')
         self.assertEqual(*self.actual_expected_contents('page-toc.html'))
+
+class InNavbar(IntegrationTestCase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(__file__, 'in_navbar', *args, **kwargs)
+
+    def test(self):
+        self.run_dox2html5(wildcard='page*.xml')
+        self.assertEqual(*self.actual_expected_contents('page-in-navbar.html'))
+        self.assertEqual(*self.actual_expected_contents('page-b.html'))