wai-website-theme 0.1.6 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 502673849b620886ecaaaeefb65353f4dce2e0f0
-  data.tar.gz: 561542091d52be61fcfcb11d2c064fdc18bd5290
+SHA256:
+  metadata.gz: 343aadce3fce603d00b3753e0daa9194fca79530cb5b1342686d0f2844ef6f47
+  data.tar.gz: 9e2ec97fc02dd8dc87a20718af44a006d46469bb1b6acc7212c7f43385261bc3
 SHA512:
-  metadata.gz: 4691676b0b268fc3b8088a99bff9dbe7ff8fde2c40c8530f18c6234a468675f4bacba1621fb1edf7a767abbdf537b5053115c57c9324ff577ea6576b854c1130
-  data.tar.gz: b5d3debaf8dc15207e0cde7d19c209aeb050fc500e0db66ffc40c29a256b30c380984a22935509feea5e4efda1649182f9d41a49901f37c7070e100dda355392
+  metadata.gz: a9378495845f5126c3eeea900864fc1eef02e0d0be8b8af766b6ac56688fde5a04c4deaa180894b9c61740443441a1a763a3c3230667c3b2a235f9009922c10b
+  data.tar.gz: da7a7d2c5326d3e589769bd6b7e7faeebbf1f9317a658c85760f40b2c5e6fad21acce6f2f8132000850d1e2decdf9d7cf134a0df5586eefeb23696afa654ca1a

data/_includes/backtotop.html

@@ -0,0 +1 @@
+<a class="button button-backtotop" href="#top"><span>{% include_cached icon.html name="arrow-up" %} Back to Top</span></a>

data/_includes/body-class.html

@@ -1 +1 @@
-{% if page.collection %}resource-{{page.collection | slugify}}{% endif %} page-{{page.title | slugify}}
+{% if include.collection %}resource-{{include.collection | slugify}}{% endif %}{%if include.doc-note-type %} doc-note doc-{{include.doc-note-type}}{% endif %}

data/_includes/box.html

@@ -1,7 +1,9 @@
 {% if include.type == 'start' %}
 {% assign classes = include.class | split: " " %}
 <aside class="box{% for class in classes %} box-{{ class }}{% endfor %}"{% if include.id %} id="{{include.id}}"{% endif %}>
+  {%- if include.title -%}
   <header class="box-h {% for class in classes %} box-h-{{ class }}{% endfor %}{% if include.icon %} box-h-icon{% endif %}">{% if include.icon %} {% include_cached icon.html name=include.icon %}{% endif %}{% if include.h %} <h{{include.h}}>{% endif %} {{ include.title}}{% if include.h %} </h{{include.h}}>{% endif %}</header>
+  {%- endif -%}
   <div class="box-i">
 {% endif %}
 {% if  include.type == 'end' %}

data/_includes/different.html

@@ -0,0 +1 @@
+{% include_cached icon.html name="different-view" label="Different View" %}

data/_includes/doc-note-msg.html

@@ -0,0 +1,10 @@
+{%- if page.doc-note-message -%}
+<section class="doc-note-box">
+  {{page.doc-note-message}}
+</section>
+{%- endif -%}
+{%- if page.doc-note-message-md -%}
+<section class="doc-note-box">
+  {{page.doc-note-message-md | markdownify }}
+</section>
+{%- endif -%}

data/_includes/excol.html

@@ -1,13 +1,14 @@
-{% if include.type == 'start' %}
-<details{%if include.id%} id="{{include.id}}"{% endif %} {%if include.open%}open{% endif %}><summary markdown="block">
-{% else %}
-{% if include.type == 'middle' %}
-</summary>
-<div markdown="block">
-{% else %}
-{% if  include.type == 'end' %}
-</div>
+{%- if include.type == 'start' -%}
+  <details{%if include.id%} id="{{include.id}}"{% endif %} {%if include.open == "true" %}open{% endif %}><summary markdown="block">
+{%- endif -%}
+{%- if include.type == 'middle' -%}
+  </summary>
+  <div markdown="block">
+{%- endif -%}
+{%- if include.type == 'end' -%}
+  </div>
 </details>
-{% endif %}
-{% endif %}
-{% endif %}
+{%- endif -%}
+{%- if include.type == 'all' -%}
+<div class="excol-all"></div>
+{%- endif -%}

data/_includes/external.html

@@ -0,0 +1 @@
+{% include_cached icon.html name="external-link" label="External Site" %}

data/_includes/feedback-box.html

@@ -0,0 +1,62 @@
+{%- if page.collection -%}{%- assign col = site.collections | where: "label", page.collection | first -%}{%- endif- %}
+{%- assign helptitle = "Help improve this page" -%}
+{%- if page.feedbackmail -%}
+  {%- assign feedbackmail = page.feedbackmail -%}
+{%- else -%}
+  {%- assign feedbackmail = "wai-eo-editors@w3.org" -%}
+{%- endif -%}
+{%- capture helpdesc -%}Please share your ideas, suggestions, or comments via e-mail to the publicly-archived list [{{feedbackmail}}](mailto:{{feedbackmail}}?subject=%s) or via GitHub.{%- endcapture -%}
+
+{%- unless page.github.hide -%}
+{%- if page.github.repository -%}{%- assign repo = page.github.repository -%}{%endif%}
+
+{%- if site.repository -%}
+    {%- assign repo = site.repository -%}
+{%- endif- %}
+{%- if page.collection -%}
+    {%- assign repo = col.repository -%}
+{%- endif- %}
+{%- if page.github.repository -%}
+    {%- assign repo = page.github.repository -%}
+{%- endif- %}
+
+{%- assign branch = "master" -%}
+{%- if site.branch -%}
+    {%- assign branch = site.branch -%}
+{%- endif- %}
+{%- if page.collection -%}
+    {%- if col.branch -%}
+    {%- assign branch = col.branch -%}
+    {%- endif -%}
+{%- endif- %}
+{%- if page.github.branch -%}
+    {%- assign branch = page.github.branch -%}
+{%- endif- %}
+
+{%- assign path = "index.md" -%}
+{%- if page.collection -%}
+    {%- assign path = page.path -%}
+{%- endif- %}
+{%- if page.github.path -%}
+    {%- assign path = page.github.path -%}
+{%- endif- %}
+
+{%- include box.html type="start" title=helptitle h=2 class="icon space-above" icon="comments" id="helpimprove" -%}
+{%- assign url_title = page.title | uri_escape -%}
+{% unless feedbackmail == "wai@w3.org" %}
+{%- capture mailbody -%}[put comment here...]{%- endcapture -%}
+{% else %}
+{%- capture mailbody -%}[put comment here...]
+
+I give permission to share this to a publicly-archived e-mail list.{%- endcapture -%}
+{% endunless %}
+{%- assign mailbody = mailbody | uri_escape -%}
+{{- helpdesc | replace: "%s", url_title | markdownify -}}
+<div class="button-group">
+    <a href="{{ "mailto:" | append: feedbackmail | append: "?subject=%s" | replace: "%s", url_title | append: "&body=" | append: mailbody }}" class="button"><span>E-mail</span></a>
+    <a href="https://github.com/{{repo}}/edit/{{branch}}/{{path}}"  class="button"><span>Fork &amp; Edit on GitHub</span></a>
+    {%- comment -%}<a href="https://github.com/{{repo}}/issues" class="button"><span>List of GitHub Issues</span></a>{%- endcomment -%}
+    <a href="https://github.com/{{repo}}/issues/new" class="button"><span>New GitHub Issue</span></a>
+</div>
+{%- include box.html type="end" -%}
+{%- endunless -%}

data/_includes/footer.html

@@ -1,40 +1,68 @@
-{% assign col = site.collections | where: "label", page.collection | first %}
-{% unless page.nopagefooter %}
-<footer class="page-footer default-grid">
+{%- assign col = site.collections | where: "label", page.collection | first -%}
+{% if col.footer %}
+<footer class="page-footer default-grid" aria-label="Page">
   <div class="inner">
-    <p>
-      <strong>Updated:</strong> {{page.date | date: "%-d %B %Y"}}<br>
-      <strong>{{page.people.editorslabel}}:</strong> {% for p in page.people.editors%}<a href="{{p.url}}">{{p.name}}</a>{% if forloop.last %}.{% else %}, {% endif %}{% endfor %} <strong>Developed by the <a href="https://www.w3.org/WAI/EO/">Education and Outreach Working Group (EOWG)</a></strong>{% if page.support %} with support from {% for s in page.support%}{% unless forloop.first %}{% if forloop.last %}and {% endif %}{% endunless %}the <a href="{{s.url}}">{{s.name}}</a>{% if forloop.last %}.{% else %}, {% endif %}{% endfor %}{% endif %} {% if col.acknowledgements %}{% assign ackurl = page.collection | append: "/acknowledgements/" | prepend: site.github.url %}<a href="/{{ackurl}}">Acknowledgements</a>.{% endif %}
-    </p>
+    {{col.footer}}
   </div>
 </footer>
-{% endunless %}
+{% else %}
+  {% if page.footer %}
+  <footer class="page-footer default-grid" aria-label="Page">
+    <div class="inner">
+      {{page.footer}}
+    </div>
+  </footer>
+  {% endif %}
+{% endif %}
 
-<footer class="site-footer grid-4q">
-  <div class="q1-start q2-end">
-    <p><a class="largelink" href="https://w3.org/WAI/">Web Accessibility Initiative</a></p>
-    <p>Strategies, guidelines, resources to make the web accessible to people with disabilities</p>
-    <p>Copyright © 2017 W3C® (MIT, ERCIM, Keio, Beihang). Usage policies apply.</p>
-  </div>
-  <div class="q3-start q3-end">
-    <div class="footer-list-header">
-      Give Us Feedback
+<footer class="site-footer grid-4q" aria-label="Site">
+  <div class="q1-start q3-end about">
+    <div>
+      <p><a class="largelink" href="https://w3.org/WAI/">W3C Web Accessibility Initiative (WAI)</a></p>
+      <p>Strategies, standards, and supporting resources to make the Web accessible to people with disabilities.</p>
+    </div>
+    <div>
+      <p>Copyright &#xA9; {{ 'now' | date: "%Y" }} W3C <sup>&#xAE;</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.eu/"><abbr title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>) <a href="{{ "/about/using-wai-material/" | relative_url }}">Permission to Use WAI Material</a>.</p>
     </div>
-    <ul>
-      <li><a href="#">Publicly Archived List</a></li>
-      <li><a href="#">WAI Staff-only List</a></li>
-    </ul>
   </div>
   <div class="q4-start q4-end">
     <ul>
-      <li><a href="{{ site.github.url }}/wai/contact/">Contact WAI</a></li>
-      <li><a href="{{ site.github.url }}/sitemap/">Site Index</a></li>
-      <li><a href="{{ site.github.url }}/wai/get-involved/">Help with the WAI Website</a></li>
-      <li><a href="{{ site.github.url }}/privacy/">Privacy Statements</a></li>
+      <li><a href="{{ "/about/contacting/" | relative_url }}">Contact WAI</a></li>
+      <li><a href="{{ "/sitemap/" | relative_url }}">Site Map</a></li>
+      <li><a href="{{ "/news/" | relative_url }}">News</a></li>
+      <li><a href="{{ "/sitemap/#archive" | relative_url }}">Archive</a></li>
+      <li><a href="{{ "/about/accessibility-statement/" | relative_url }}">Accessibility Statement</a></li>
+      <li><a href="{{ "/roles/" | relative_url }}">Resources for Roles</a></li>
     </ul>
   </div>
 </footer>
+{%- unless site.published == true -%}
 <section class="default-grid info" tabindex="0">
-  <p class="inner">{% include_cached icon.html name="info" %} This is an unpublished draft preview. Please refer to our published website at <a href="https://www.w3.org/WAI/">w3.org/WAI/</a>.
+  <p class="inner">{% if site.warning_icon %}{% include_cached icon.html name="info" %} {% endif %}{% if site.warning_message %}{{site.warning_message}}{% else %}This is an unpublished draft preview that might include content that is not yet approved. The published website is at <a href="https://www.w3.org/WAI/">w3.org/WAI/</a>.{% endif %}
   </p>
-</section>
+</section>
+{%- endunless -%}
+<!-- Details4Everybody -->
+<script src="{{ '/assets/scripts/details4everybody.js' | append: timestamp | relative_url }}"></script>
+<!-- SVG4Everybody -->
+<script src="{{ '/assets/scripts/svg4everybody.js' | append: timestamp | relative_url }}"></script>
+<script>
+  svg4everybody();
+</script>
+<!-- Matomo -->
+<script>
+  var _paq = _paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setDoNotTrack", true]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//www.w3.org/analytics/piwik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '328']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="//www.w3.org/analytics/piwik/piwik.php?idsite=328&rec=1" style="border:0;" alt="" /></p></noscript>
+<!-- End Matomo Code -->

data/_includes/head.html

@@ -1,3 +1,4 @@
+{% if include.type == 'start' %}
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
@@ -7,17 +8,15 @@
 
     function downloadJSAtOnload() {
       var element = document.createElement("script");
-      element.src = "{{ "/assets/scripts/main.js" | prepend: site.github.url }}";
+      element.src = "{{ '/assets/scripts/main.js' | append: include.timestamp | relative_url }}";
       document.body.appendChild(element);
-      document.body.dataset.menuExpanded = 'false';
     }
 
     window.addEventListener("load", downloadJSAtOnload, false);
   </script>
-
-  <link rel="stylesheet" href="{{ "/assets/css/style.css" | prepend: site.github.url }}">
-  {% if page.ext_css %}<link rel="stylesheet" href="{{ page.ext_css | prepend: '/css/' | prepend: page.collection | prepend: '/' | prepend: site.github.url }}">{% endif %}
-
-  <title>{{ page.title | escape }} | {{ site.title | escape }} | W3C</title>
-  {% seo title=false %}
-</head>
+  <link rel="stylesheet" href="{{ "/assets/css/style.css" | append: include.timestamp | relative_url }}">
+{% endif %}
+{% if  include.type == 'end' %}
+  <link rel="alternate" type="application/rss+xml" href="{{ "/feed.xml" | relative_url }}">
+</head>
+{% endif %}

data/_includes/header.html

@@ -1,29 +1,46 @@
+{%- comment -%}
+The first section creates an array of page urls that are page urls of this collection. They then are compared to all page urls in the list below. Use group in the frontmatter to group pages.
+{%- endcomment -%}
+{%- assign col = site.collections | where: "label", page.collection | first -%}
+{%- unless site.published == true -%}
+<section class="default-grid info" tabindex="0">
+  <p class="inner">{% if site.warning_icon %}{% include_cached icon.html name="info" %} {% endif %}{% if site.warning_message %}{{site.warning_message}}{% else %}This is an unpublished draft preview that might include content that is not yet approved. The published website is at <a href="https://www.w3.org/WAI/">w3.org/WAI/</a>.{% endif %}
+  </p>
+</section>
+{%- endunless -%}
 <nav aria-label="Skip Link and Accessibility Options" id="controls" class="default-grid">
   <ul>
-    <li><a href="#main">{% include_cached icon.html name="chevron-down" %} Skip to Content</a></li>
-    <li><a href="#">Change Text Size or Colors</a></li>
+    <li><a href="#main">Skip to Content</a></li>
+    <li><a href="{{ "/meta/customize/" | relative_url }}">Change Text Size or Colors</a></li>
   </ul>
 </nav>
 <header id="site-header" class="default-grid with-gap">
-  <a class="logos" href="{{ site.github.url }}/">
-    <img src="{{ "/assets/images/w3c.svg" | prepend: site.github.url }}" alt="W3C">
-    <span class="wai"><span class="wa">Web Accessibility</span> <span class="i">Initiative</span></span>
-  </a>
+  <div class="logos">
+    <a class="home w3c" href="{{ "https://www.w3.org/" | relative_url }}">
+      <svg role="img" aria-label="W3C" viewBox="0 0 68 34" xmlns="http://www.w3.org/2000/svg"><g><path d="m16.117 1.006 5.759 19.58 5.759-19.58h4.17 11.444v1.946l-5.879 10.128c2.065.663 3.627 1.868 4.686 3.615 1.059 1.748 1.589 3.799 1.589 6.155 0 2.914-.775 5.363-2.324 7.348s-3.555 2.978-6.017 2.978c-1.854 0-3.469-.589-4.845-1.767-1.377-1.178-2.396-2.773-3.058-4.786l3.256-1.35c.477 1.218 1.106 2.178 1.887 2.879.781.702 1.701 1.052 2.76 1.052 1.112 0 2.052-.622 2.82-1.866.768-1.245 1.152-2.74 1.152-4.489 0-1.933-.411-3.429-1.231-4.488-.954-1.244-2.45-1.867-4.489-1.867h-1.588v-1.906l5.56-9.612h-6.712l-.382.65-8.163 27.548h-.397l-5.958-19.937-5.957 19.937h-.397l-9.53-32.168h4.17l5.759 19.58 3.892-13.185-1.906-6.395z"/><path d="m64.92 1.006c-.819 0-1.554.295-2.111.861-.591.6-.92 1.376-.92 2.178s.313 1.545.887 2.128c.583.591 1.334.912 2.145.912.793 0 1.562-.321 2.161-.903.574-.557.887-1.3.887-2.136 0-.811-.321-1.57-.878-2.136-.584-.592-1.344-.904-2.171-.904zm2.643 3.065c0 .701-.271 1.351-.768 1.832-.524.507-1.174.777-1.892.777-.675 0-1.342-.278-1.84-.785s-.777-1.157-.777-1.849.287-1.368.802-1.891c.481-.49 1.131-.751 1.84-.751.726 0 1.376.271 1.883.785.49.489.752 1.147.752 1.882zm-2.559-1.807h-1.3v3.445h.65v-1.469h.642l.701 1.469h.726l-.769-1.57c.498-.102.785-.439.785-.929 0-.625-.472-.946-1.435-.946zm-.118.422c.608 0 .886.169.886.591 0 .405-.278.549-.87.549h-.549v-1.14z"/><path d="m59.807.825.676 4.107-2.391 4.575s-.918-1.941-2.443-3.015c-1.285-.905-2.122-1.102-3.431-.832-1.681.347-3.587 2.357-4.419 4.835-.995 2.965-1.005 4.4-1.04 5.718-.056 2.113.277 3.362.277 3.362s-1.452-2.686-1.438-6.62c.009-2.808.451-5.354 1.75-7.867 1.143-2.209 2.842-3.535 4.35-3.691 1.559-.161 2.791.59 3.743 1.403 1 .854 2.01 2.721 2.01 2.721z"/><path d="m60.102 24.063s-1.057 1.889-1.715 2.617c-.659.728-1.837 2.01-3.292 2.651s-2.218.762-3.656.624c-1.437-.138-2.772-.97-3.24-1.317s-1.664-1.369-2.34-2.322-1.733-2.859-1.733-2.859.589 1.91.958 2.721c.212.467.864 1.894 1.789 3.136.863 1.159 2.539 3.154 5.086 3.604 2.547.451 4.297-.693 4.73-.97s1.346-1.042 1.924-1.66c.603-.645 1.174-1.468 1.49-1.962.231-.36.607-1.092.607-1.092z"/></g></svg>
+    </a>
+    <a class="home" href="{{ "/" | relative_url }}">
+      <span class="wai"><span class="wa">Web&nbsp;Accessibility</span> <span class="i"><span class="initieative">Initiative</span> <span>WAI</span></span></span>
+    </a>
+    <div class="claim">
+      <span>Strategies, standards, resources to make the Web accessible to people with disabilities</span>
+    </div>
+    <button class="button button-menu" aria-haspopup="true" aria-expanded="false" id="openmenu"><span>{% include_cached icon.html name="menu" %} Menu</span></button>
+  </div>
 
   <div class="navigations">
   <nav class="metanav" aria-label="Meta &amp; Search">
     <ul>
-      <li><a href="{{ site.github.url }}/news/">News</a></li>
-      <li><a href="{{ site.github.url }}/wai/get-involved/">Get Involved</a></li>
-      <li><a href="{{ site.github.url }}/wai/about/">About W3C WAI</a></li>
+      <li><a href="{{ "/about/participating/" | relative_url }}">Get Involved</a></li>
+      <li><a href="{{ "/about/" | relative_url }}">About W3C WAI</a></li>
       <li>
-        <form action="https://duckduckgo.com/" role="search" onsubmit="document.querySelector('#header-search').value = document.querySelector('#header-search').value + ' site:w3c.github.io/wai-website/'">
+        <form action="{{ "/search/" | relative_url }}" role="search">
           <div>
             <label for="header-search">
-              <span class="l">Search:</span>
-              <input id="header-search" type="search" name="q" placeholder="e.g. Tutorials">
+              <span class="visuallyhidden">Search:</span>
+              <input id="header-search" type="search" name="q" placeholder="Search" aria-label="search">
             </label>
-            <button class="button button-icon button-nobg button-noborder"><span>{% include_cached icon.html name="search" %}</span></button>
+            <button class="button button-icon button-nobg button-noborder"><span>{% include_cached icon.html name="search" label="Submit Search" %}</span></button>
           </div>
         </form>
       </li>
@@ -31,29 +48,109 @@
   </nav>
 </div>
 </header>
+{%- if page.parent == '/' -%}{%- assign parent_is_home = true -%}{% endif %}
+{%- if col.parent == '/' -%}{%- assign parent_is_home = true -%}{% endif %}
+{%- if col.parent == '/news/' -%}{%- assign parent_is_home = true -%}{% endif %}
+{%- if parent_is_home -%}
+{%- assign a_name = "" -%}
+{%- assign a_url  = "" -%}
+{%- assign b_name = "" -%}
+{%- assign b_url  = "" -%}
+{%- assign c_name = "" -%}
+{%- assign c_url  = "" -%}
+{%- assign d_name = "" -%}
+{%- assign d_url  = "" -%}
+{% else %}
+{%- if col.parent -%}
+  {%- assign searchurl = col.parent -%}
+{%- else -%}
+  {%- if page.parent -%}
+    {%- assign searchurl = page.parent -%}
+  {%- else -%}
+    {%- assign searchurl = page.url -%}
+  {%- endif -%}
+{%- endif -%}
+{%- assign search = true -%}
+{%- for n in site.data.navigation -%}
+  {%- if search == true -%}
+    {%- assign b_name = "" -%}
+    {%- assign b_url  = "" -%}
+    {%- assign c_name = "" -%}
+    {%- assign c_url  = "" -%}
+    {%- assign d_name = "" -%}
+    {%- assign d_url  = "" -%}
+    {%- assign a_name = n.name -%}
+    {%- assign a_url  = n.pages[0].url -%}
+    {%- if a_url == searchurl %}{% assign search = false %}{% endif -%}
+    {%- if search == true -%}
+      {%- for n1 in n.pages -%}
+        {%- if search == true -%}
+          {%- assign c_name = "" -%}
+          {%- assign c_url  = "" -%}
+          {%- assign d_name = "" -%}
+          {%- assign d_url  = "" -%}
+          {%- assign b_name = n1.name -%}
+          {%- assign b_url  = n1.url -%}
+          {%- if b_url == searchurl %}{% assign search = false %}{% endif -%}
+          {%- if search == true -%}
+            {%- for n2 in n1.pages -%}
+              {%- if search == true -%}
+                {%- assign d_name = "" -%}
+                {%- assign d_url  = "" -%}
+                {%- assign c_name = n2.name -%}
+                {%- assign c_url  = n2.url -%}
+                {%- if c_url == searchurl %}{% assign search = false %}{% endif -%}
+                {%- if search == true -%}
+                  {%- for n3 in n2.pages -%}
+                    {%- if search == true -%}
+                      {%- assign d_name = n3.name -%}
+                      {%- assign d_url  = n3.url -%}
+                      {%- if d_url == searchurl %}{% assign search = false %}{% endif -%}
+                    {%- endif -%}
+                  {%- endfor -%}
+                {%- endif -%}
+              {%- endif -%}
+            {%- endfor -%}
+          {%- endif -%}
+        {%- endif -%}
+      {%- endfor -%}
+    {%- endif -%}
+  {%- endif -%}
+{%- endfor -%}
+{%- endif -%}
+
 <nav class="mainnav" aria-label="Main">
-  {% include navlist.html data=site.data.navigation depth=1 %}
+  {%- if page.url == "/" %}{% assign a_url = "" %}{% endif -%}
+  {%- include navlist.html data=site.data.navigation current=a_url -%}
 </nav>
 
-{% unless page.url == "/" %}
+{%- unless page.url == "/" -%}
 <nav class="breadcrumb default-grid" aria-label="Breadcrumb">
   <ul class="default-container">
-    <li><a href="{{ site.github.url }}/">Home</a></li>
-    {% capture page_url_without_index_html %}{{ page.url | remove: "/index.html" }}{% endcapture %}
-    {% assign splitted_url_parts = page_url_without_index_html | split: '/' %}
-    {% capture forLoopMaxInt %}{{ splitted_url_parts.size | minus:1 }}{% endcapture %}
-    {% for i in (1..forLoopMaxInt) %}
-        {% capture current_breadcrumb_url %}{{next_prepender}}/{{ splitted_url_parts[i] }}/{% endcapture %}
-        {% capture current_breadcrumb_md_url %}{{next_prepender}}/{{ splitted_url_parts[i] }}/{% endcapture %}
-        {% capture next_prepender %}{{next_prepender}}/{{ splitted_url_parts[i] }}{% endcapture %}
-        {% for breadcrumb_page in site.documents %}
-            {% if current_breadcrumb_url == breadcrumb_page.url %}
+    <li><a href="{{ "/" | relative_url }}">Home</a></li>
+    {%- unless a_name == "" -%}<li><a href="{{ a_url | relative_url }}"{% if a_url == page.url%} aria-current="page"{%endif%}>{{a_name}}</a></li>{%- endunless -%}
+    {%- unless b_name == "" -%}<li><a href="{{ b_url | relative_url }}"{% if b_url == page.url%} aria-current="page"{%endif%}>{{b_name}}</a></li>{%- endunless -%}
+    {%- unless c_name == "" -%}<li><a href="{{ c_url | relative_url }}"{% if c_url == page.url%} aria-current="page"{%endif%}>{{c_name}}</a></li>{%- endunless -%}
+    {%- unless d_name == "" -%}<li><a href="{{ d_url | relative_url }}"{% if d_url == page.url%} aria-current="page"{%endif%}>{{d_name}}</a></li>{%- endunless -%}
+    {%- if col.parent == '/news/' -%}<li><a href="{{ '/news/' | relative_url }}">News</a></li>{%- endif -%}
+    {%- if page.parent == "/"-%}<li><a href="{{ page.url | relative_url }}" aria-current="page">{{page.title}}</a></li>{%- endif -%}
+    {%- if col.parent -%}
+    {%- capture page_url_without_index_html %}{{ page.url | remove: "/index.html" }}{% endcapture -%}
+    {%- assign splitted_url_parts = page_url_without_index_html | split: '/' -%}
+    {%- capture forLoopMaxInt %}{{ splitted_url_parts.size | minus:1 }}{% endcapture -%}
+    {%- for i in (1..forLoopMaxInt) -%}
+        {%- capture current_breadcrumb_url %}{{next_prepender}}/{{ splitted_url_parts[i] }}/{% endcapture -%}
+        {%- capture current_breadcrumb_md_url %}{{next_prepender}}/{{ splitted_url_parts[i] }}/{% endcapture -%}
+        {%- capture next_prepender %}{{next_prepender}}/{{ splitted_url_parts[i] }}{% endcapture -%}
+        {%- for breadcrumb_page in site.documents -%}
+            {%- if current_breadcrumb_url == breadcrumb_page.url -%}
                 <li>
-                    <a{% if current_breadcrumb_url == page.url%} aria-current="page"{%endif%} href="{{ site.github.url }}{{current_breadcrumb_url}}">{% if breadcrumb_page.breadcrumb_title%}{{breadcrumb_page.breadcrumb_title}}{% else %}{{breadcrumb_page.title}}{% endif %}</a>
+                    <a{% if current_breadcrumb_url == page.url%} aria-current="page"{%endif%} href="{{current_breadcrumb_url | relative_url}}">{% if breadcrumb_page.breadcrumb_title%}{{breadcrumb_page.breadcrumb_title}}{% else %}{% if breadcrumb_page.nav_title %}{% if breadcumb_page.nav_title == "Overview"%}{{breadcrumb_page.title}}{% else%}{{breadcrumb_page.nav_title}}{% endif %}{%-else-%}{{breadcrumb_page.title}}{% endif %}{% endif %}</a>
                 </li>
-            {% endif %}
-        {% endfor %}
-    {% endfor %}
+            {%- endif -%}
+        {%- endfor -%}
+    {%- endfor -%}
+    {%- endif -%}
   </ul>
 </nav>
-{% endunless %}
+{%- endunless -%}