Skip to content

Commit

Permalink
Revert "Adding one deeper level to navigation"
Browse files Browse the repository at this point in the history 
This reverts commit dadab32.
  • Loading branch information
@iadawn
iadawn committed Feb 11, 2025
1 parent dadab32 commit 2ac3336
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 55 deletions.
20 changes: 0 additions & 20 deletions _includes/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@
{%- assign c_url = "" -%}
{%- assign d_name = "" -%}
{%- assign d_url = "" -%}
{%- assign e_name = "" -%}
{%- assign e_url = "" -%}
{% else %}
{%- if col.parent -%}
{%- assign searchurl = col.parent -%}
Expand Down Expand Up @@ -119,8 +117,6 @@
{%- assign c_url = "" -%}
{%- assign d_name = "" -%}
{%- assign d_url = "" -%}
{%- assign e_name = "" -%}
{%- assign e_url = "" -%}
{%- assign a_name = n.name -%}
{%- assign a_url = n.pages[0].url -%}
{%- if a_url == searchurl %}{% assign search = false %}{% endif -%}
Expand All @@ -131,8 +127,6 @@
{%- assign c_url = "" -%}
{%- assign d_name = "" -%}
{%- assign d_url = "" -%}
{%- assign e_name = "" -%}
{%- assign e_url = "" -%}
{%- assign b_name = n1.name -%}
{%- assign b_url = n1.url -%}
{%- if b_url == searchurl %}{% assign search = false %}{% endif -%}
Expand All @@ -141,28 +135,15 @@
{%- if search == true -%}
{%- assign d_name = "" -%}
{%- assign d_url = "" -%}
{%- assign e_name = "" -%}
{%- assign e_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 e_name = "" -%}
{%- assign e_url = "" -%}
{%- assign d_name = n3.name -%}
{%- assign d_url = n3.url -%}
{%- if d_url == searchurl %}{% assign search = false %}{% endif -%}
{%- if search == true -%}
{%- for n4 in n3.pages -%}
{%- if search == true -%}
{%- assign e_url = n4.url -%}
{%- assign e_name = n4.name -%}
{%- if e_url == searchurl %}{% assign search = false %}{% endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
Expand All @@ -189,7 +170,6 @@
{%- unless b_name == "" -%}<li>{% if b_url == enpage.url%}{% include_cached link.html text=b_name to=b_url aria-current="page" lang=page.lang hidelangnotice=true %}{% else %}{% include_cached link.html text=b_name to=b_url lang=page.lang hidelangnotice=true %}{% endif %}</li>{%- endunless -%}
{%- unless c_name == "" -%}<li>{% if c_url == enpage.url%}{% include_cached link.html text=c_name to=c_url aria-current="page" lang=page.lang hidelangnotice=true %}{% else %}{% include_cached link.html text=c_name to=c_url lang=page.lang hidelangnotice=true %}{% endif %}</li>{%- endunless -%}
{%- unless d_name == "" -%}<li>{% if d_url == enpage.url%}{% include_cached link.html text=d_name to=d_url aria-current="page" lang=page.lang hidelangnotice=true %}{% else %}{% include_cached link.html text=d_name to=d_url lang=page.lang hidelangnotice=true %}{% endif %}</li>{%- endunless -%}
{%- unless e_name == "" -%}<li>{% if e_url == enpage.url%}{% include_cached link.html text=e_name to=e_url aria-current="page" lang=page.lang hidelangnotice=true %}{% else %}{% include_cached link.html text=e_name to=e_url lang=page.lang hidelangnotice=true %}{% endif %}</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 | xml_escape}}</a></li>{%- endif -%}
{%- if col.parent -%}
Expand Down
49 changes: 14 additions & 35 deletions _includes/secondarynav.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,7 @@
{%- else -%}
{%- for k in j.pages -%}
{%- if k.url == searchurl -%}
{%- assign currentsubnav = item -%}
{%- else -%}
{%- for l in k.pages -%}
{%- if l.url == searchurl -%}
{%- assign currentsubnav = item -%}
{%- endif -%}
{%- endfor -%}
{%- assign currentsubnav = item -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
Expand All @@ -49,43 +43,28 @@
{% endif %}
{%- assign insub = false -%}
{%- assign insubsub = false -%}
{%- assign insubsubsub = false -%}
{%- capture submenu -%}
{%- for j in i.pages -%}
{%- capture subsubmenu -%}
{%- for k in j.pages -%}
{%- capture subsubsubmenu -%}
{%- for l in k.pages -%}
{%- if forloop.first %}<ul>{% endif -%}
{%- if l.url == searchurl -%}
{% assign insub = true %}
{% assign insubsub = true %}
{% assign insubsubsub = true %}
{% include menuitem.html name=l.name url=l.url hide=l.hide insub=false current=true %}
{%- else -%}
{% include menuitem.html name=l.name url=l.url hide=l.hide insub=false current=false %}
{%- endif -%}
{%- if forloop.last %}</ul>{% endif -%}
{%- endfor -%}
{%- endcapture -%}
{%- if forloop.first %}<ul>{% endif -%}
{%- if k.url == searchurl -%}
{% assign insub = true %}
{% include menuitem.html name=k.name url=k.url hide=k.hide insub=insubsubsub current=true submenu=subsubsubmenu %}
{%- else -%}
{% include menuitem.html name=k.name url=k.url hide=k.hide insub=insubsubsub current=false submenu=subsubsubmenu %}
{%- 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 -%}
{% assign insubsubsub = false %}
{%- 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 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 -%}
{% assign insubsub = false %}
{%- endfor -%}
Expand Down

0 comments on commit 2ac3336

Please sign in to comment.