_includes/secondarynav.html in wai-website-theme-1.9.pre vs _includes/secondarynav.html in wai-website-theme-1.9.2

@@ -9,20 +9,89 @@
     {%- endif -%}
   {%- else -%}
     {%- assign searchurl = page.url -%}
   {%- endif -%}
 {%- endif -%}
+{%- if col.navigation -%}
+  {%- assign currentsubnav = col.navigation -%}
+{%- else -%}
 {%- for item in site.data.navigation -%}
-  {% assign seen_current = false %}
-  {% assign is_in_here = false %}
-  {% capture menu %}
-    {% include subpages.html name=false pages=item.pages hide=item.hide %}
-  {% endcapture %}
-  {% if is_in_here == true %}
-    <div class="sidenav">
-      <nav class="sn-contents" aria-label="Secondary">
-        <div class="sidenav--head"><div class="sidenav--head-title"><div class="sidenav--head-subsection">{% include_cached inpl.html lang=page.lang a=item.name %}</div></div></div>
-        {{menu}}
-      </nav>
-    </div>
+  {%- for i in item.pages -%}
+    {%- if i.url == searchurl -%}
+      {%- assign currentsubnav = item -%}
+    {%- else -%}
+      {%- for j in i.pages -%}
+        {%- if j.url == searchurl -%}
+          {%- assign currentsubnav = item -%}
+        {%- else -%}
+          {%- for k in j.pages -%}
+            {%- if k.url == searchurl -%}
+              {%- assign currentsubnav = item -%}
+            {%- endif -%}
+          {%- endfor -%}
+        {%- endif -%}
+      {%- endfor -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- endfor -%}
+{%- endif -%}
+<div class="sidenav">
+{%- for i in currentsubnav.pages -%}
+  {%- if forloop.first -%}
+    <nav class="sn-contents" aria-label="Secondary">
+      <ul class="sidenav--list">
   {% endif %}
-{%- endfor -%}
+  {%- assign insub = false -%}
+  {%- assign insubsub = false -%}
+  {%- capture submenu -%}
+    {%- for j in i.pages -%}
+      {%- capture subsubmenu -%}
+        {%- for k in j.pages -%}
+          {%- if forloop.first %}<ul>{% endif -%}
+            {%- if k.url == searchurl -%}
+              {% assign insub = true %}
+              {% assign insubsub = true %}
+              {% include menuitem.html name=k.name url=k.url hide=k.hide insub=false current=true %}
+            {%- else -%}
+              {% include menuitem.html name=k.name url=k.url hide=k.hide insub=false current=false %}
+            {%- endif -%}
+          {%- if forloop.last %}</ul>{% endif -%}
+        {%- endfor -%}
+      {%- endcapture -%}
+      {%- if forloop.first %}<ul>{% endif -%}
+        {%- if j.url == searchurl -%}
+          {% assign insub = true %}
+          {% include menuitem.html name=j.name url=j.url hide=j.hide insub=insubsub current=true submenu=subsubmenu %}
+        {%- else -%}
+          {% include menuitem.html name=j.name url=j.url hide=j.hide insub=insubsub current=false submenu=subsubmenu %}
+        {%- endif -%}
+      {%- if forloop.last %}</ul>{% endif -%}
+    {%- endfor -%}
+  {%- endcapture -%}
+  {%- if i.url == searchurl -%}
+    {% include menuitem.html name=i.name url=i.url hide=i.hide insub=insub current=true submenu=submenu %}
+  {%- else -%}
+    {% include menuitem.html name=i.name url=i.url hide=i.hide insub=insub current=false submenu=submenu %}
+  {%- endif -%}
+  {%- if forloop.last %}</ul></nav>{% endif -%}
+{%- endfor -%}
+{% if page.ref %}
+  {%- for p in translations %}
+    {%-if forloop.first -%}
+      <nav class="sidenav-languages" aria-labelledby="languagehead">
+        <header id="languagehead">{% include t.html t="Languages/Translations" %}</header>
+        <ul class="langlist">
+          <li style="margin-bottom: 2px;">{% if 'en' == page.lang %}<strong style="text-transform: capitalize;">{{ site.data.lang['en'].nativeName }} (original)</strong>{% else %}<a href="{{ enpage.url | relative_url }}" lang="en" dir="auto" translate="no">{{ site.data.lang['en'].nativeName }} (original)</a>{% endif %}</li>
+    {%- endif -%}
+    <li style="margin-bottom: 2px;">{% if p.lang == page.lang %}<strong style="text-transform: capitalize;">{{ site.data.lang[p.lang].nativeName }}</strong>{% else %}<a style="text-transform: capitalize;" href="{{ p.url | relative_url }}" dir="auto" translate="no" lang="{{ p.lang }}">{{ site.data.lang[p.lang].nativeName }}</a>{% endif %}</li>
+    {%- if forloop.last -%}
+        </ul>
+        {%- unless page.lang == "en" -%}
+        <p><a href="{{"/translations/#" | append: page.lang | relative_url}}">{% include t.html t="Other Resources in" %} {{ site.data.lang[page.lang].nativeName }}</a></p>
+        {% endunless %}
+        <p><a href="{{"/translations/" | relative_url}}">{% include t.html t="All&nbsp;Translations" %}</a></p>
+        <p><a href="{{"/about/translating/" | relative_url}}">{% include t.html t="Translating WAI Resources" %}</a></p>
+      </nav>
+    {%- endif -%}
+  {% endfor -%}
+{% endif %}
+</div>
\ No newline at end of file