update permalinks

CalConnect · Dec 5, 2024 · 3392dee · 3392dee
1 parent fffc1ed
commit 3392dee
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/_about_pages/copyright-and-licensing.adoc b/_about_pages/copyright-and-licensing.adoc
@@ -2,6 +2,7 @@
 layout: page
 title: Copyright and Licensing for Published Material
 type: about
+permalink: /about/policies/copyright-and-licensing
 ---
 
 == Copyright and Licensing for Published Material

diff --git a/_about_pages/intellectual-property-rights-policy.adoc b/_about_pages/intellectual-property-rights-policy.adoc
@@ -2,6 +2,7 @@
 layout: page
 title: Intellectual Property Rights Policy
 type: about
+permalink: /about/policies/intellectual-property-rights-policy
 ---
 
 == Intellectual Property Rights Policy

diff --git a/_about_pages/policies-and-procedures.adoc b/_about_pages/policies-and-procedures.adoc
@@ -2,6 +2,7 @@
 layout: page
 title: Policies and Procedures
 type: about
+permalink: /about/policies/policies-and-procedures
 ---
 
 == Policies and Procedures

diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -17,11 +17,11 @@ about:
         url: /about/policies
         subsubfolderitems:
           - page: Policies and Procedures
-            url: /about/policies-and-procedures
+            url: /about/policies/policies-and-procedures
           - page: Copyright and Licensing
-            url: /about/copyright-and-licensing
+            url: /about/policies/copyright-and-licensing
           - page: Intellectual Property Rights Policy
-            url: /about/intellectual-property-rights-policy
+            url: /about/policies/intellectual-property-rights-policy
       - page: Board of Directors
         url: /about/board-directors
       - page: Liaisons and Relationships

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -64,20 +64,28 @@ <h3>{{ item.title }}</h3>
 
                                                 <!-- Nested Subfolder Items -->
                                                 {% if entry.subsubfolderitems and entry.subsubfolderitems[0] %}
-                                                <ul class="menu nav {% if entry.url != page.url %}hide{% endif %}">
+                                                    {% assign is_current_subitem = false %}
                                                     {% for subentry in entry.subsubfolderitems %}
-                                                        <li class="leaf">
-                                                            <a href="{{ subentry.url }}">{{ subentry.page }}</a>
-                                                        </li>
+                                                        {% if subentry.url == page.url %}
+                                                            {% assign is_current_subitem = true %}
+                                                        {% endif %}
                                                     {% endfor %}
-                                                </ul>
+
+                                                    <ul class="menu nav {% if entry.url != page.url and is_current_subitem == false %}hide{% endif %}">
+                                                        {% for subentry in entry.subsubfolderitems %}
+                                                            <li class="leaf">
+                                                                <a href="{{ subentry.url }}">{{ subentry.page }}</a>
+                                                            </li>
+                                                        {% endfor %}
+                                                    </ul>
                                                 {% endif %}
                                             </li>
                                         {% endfor %}
                                     </ul>
                                 {% endif %}
                             {% endfor %}
                         {% endif %}
+
                     </div>
                 </section>
             </div>