From 2162f02e5410d7a184b1634d5ca83a108bc31c9e Mon Sep 17 00:00:00 2001
From: Bartek Szopka <bartek.szopka@canonical.com>
Date: Thu, 8 Aug 2024 12:32:12 +0200
Subject: [PATCH] Clean up macro naming

---
 .../navigation/_full-width-dropdown.jinja     | 20 +++++++++----------
 .../navigation/dropdown-full-width.html       | 12 +++++------
 .../examples/patterns/navigation/reduced.html | 16 +++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/templates/docs/examples/patterns/navigation/_full-width-dropdown.jinja b/templates/docs/examples/patterns/navigation/_full-width-dropdown.jinja
index 38979779d..e084c7568 100644
--- a/templates/docs/examples/patterns/navigation/_full-width-dropdown.jinja
+++ b/templates/docs/examples/patterns/navigation/_full-width-dropdown.jinja
@@ -1,4 +1,4 @@
-{% macro build_link_list(n, group_name) %}
+{% macro _build_fake_link_list(n, group_name) %}
 {% for i in range(n) %}
 <li>
   <a href="#" class="p-navigation__dropdown-item">
@@ -10,7 +10,7 @@
 {% endfor %}
 {% endmacro %}
 
-{% macro build_quick_links(n, group_name) %}
+{% macro _build_fake_quick_links(n, group_name) %}
 <li class="p-navigation__dropdown-item no-hover">
   <ul class="p-list p-navigation__secondary-links">
     <li class="p-list__item">
@@ -25,7 +25,7 @@
 </li>
 {% endmacro %}
 
-{% macro build_button_link(group_name) %}
+{% macro _build_fake_button_link(group_name) %}
 <li class="p-navigation__dropdown-item">
   <a href="#" class="p-link--inverted">
     <span>{{ group_name }}</span>
@@ -37,7 +37,7 @@
 </li>
 {% endmacro %}
 
-{% macro build_dropdown_items(group_name, links_count, has_button=False, sub_links_count=15, quick_links_count=0) %}
+{% macro _build_fake_dropdown_items(group_name, links_count, has_cta_button=False, sub_links_count=15, quick_links_count=0) %}
 {% for i in range(1, links_count + 1) %}
 {% set subgroup_id = group_name ~ '-group-' ~ i %}
 {% set subgroup_name = group_name ~ ' ' ~ i %}
@@ -51,19 +51,19 @@
         Back
       </button>
     </li>
-    {% if has_button %}
-      {{ build_button_link(subgroup_name) }}
+    {% if has_cta_button %}
+      {{ _build_fake_button_link(subgroup_name) }}
     {% endif %}
-    {{ build_link_list(sub_links_count, subgroup_name) }}
+    {{ _build_fake_link_list(sub_links_count, subgroup_name) }}
     {% if quick_links_count > 0 %}
-      {{ build_quick_links(quick_links_count, subgroup_name) }}
+      {{ _build_fake_quick_links(quick_links_count, subgroup_name) }}
     {% endif %}
   </ul>
 </li>
 {% endfor %}
 {% endmacro %}
 
-{% macro dropdown(id, title, is_open=False, links_count=3, has_button=False, sub_links_count=16, quick_links_count=0) %}
+{% macro build_fake_dropdown(id, title, is_open=False, links_count=3, has_cta_button=False, sub_links_count=16, quick_links_count=0) %}
 <div class="p-navigation__dropdown is-full-width {% if not is_open %}is-collapsed{% endif %} js-navigation-sliding-panel"  data-level="1" id="{{ id }}" {% if not is_open %}aria-hidden="true"{% endif %}>
   <div class="p-navigation__dropdown-content--sliding">
     <ul class="p-list u-no-margin js-dropdown-nav-list">{# TODO: use p-list temporarly, we will later have more specific styling class name for it #}
@@ -72,7 +72,7 @@
           Back
         </button>
       </li>
-      {{ build_dropdown_items(title, links_count, has_button, sub_links_count, quick_links_count) }}
+      {{ _build_fake_dropdown_items(title, links_count, has_cta_button, sub_links_count, quick_links_count) }}
     </ul>
   </div>
   <div class="p-navigation__dropdown-content--full-width">
diff --git a/templates/docs/examples/patterns/navigation/dropdown-full-width.html b/templates/docs/examples/patterns/navigation/dropdown-full-width.html
index 5df1607db..0c14a5c04 100644
--- a/templates/docs/examples/patterns/navigation/dropdown-full-width.html
+++ b/templates/docs/examples/patterns/navigation/dropdown-full-width.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% from "docs/examples/patterns/navigation/_full-width-dropdown.jinja" import dropdown %}
+{% from "docs/examples/patterns/navigation/_full-width-dropdown.jinja" import build_fake_dropdown %}
 
 {% block title %}Navigation / Full width dropdowns{% endblock %}
 
@@ -31,23 +31,23 @@
       <ul class="p-navigation__items is-active js-dropdown-nav-list js-navigation-sliding-panel">
         <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="products">
           <a class="p-navigation__link" href="#products" aria-controls="products-content" tabindex="0">Products</a>
-          {{ dropdown('products-content', 'Products', links_count=11, sub_links_count=10, quick_links_count=5) }}
+          {{ build_fake_dropdown('products-content', 'Products', links_count=11, sub_links_count=10, quick_links_count=5) }}
         </li>
         <li class="p-navigation__item--dropdown-toggle is-active js-navigation-dropdown-toggle" role="menuitem" id="use-case">
           <a class="p-navigation__link" href="#use-case" aria-controls="use-case-content" tabindex="0">Use cases</a>
-          {{ dropdown('use-case-content', 'Use cases', True) }}
+          {{ build_fake_dropdown('use-case-content', 'Use cases', True) }}
         </li>
         <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="support">
           <a class="p-navigation__link" href="#support" aria-controls="support-content" tabindex="0">Support</a>
-          {{ dropdown('support-content', 'Support', links_count=2, sub_links_count=8, quick_links_count=5) }}
+          {{ build_fake_dropdown('support-content', 'Support', links_count=2, sub_links_count=8, quick_links_count=5) }}
         </li>
         <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="community">
           <a class="p-navigation__link" href="#community" aria-controls="community-content" tabindex="0">Community</a>
-          {{ dropdown('community-content', 'Community', links_count=5, sub_links_count=7, quick_links_count=5) }}
+          {{ build_fake_dropdown('community-content', 'Community', links_count=5, sub_links_count=7, quick_links_count=5) }}
         </li>
         <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="get-ubuntu">
           <a class="p-navigation__link" href="#get-ubuntu" aria-controls="get-ubuntu-content" tabindex="0">Get Ubuntu</a>
-          {{ dropdown('get-ubuntu-content', 'Get Ubuntu', links_count=6, sub_links_count=3, quick_links_count=8, has_button=True ) }}
+          {{ build_fake_dropdown('get-ubuntu-content', 'Get Ubuntu', links_count=6, sub_links_count=3, quick_links_count=8, has_cta_button=True ) }}
         </li>
         <li class="p-navigation__item--dropdown-toggle is-right-shifted js-navigation-dropdown-toggle" role="menuitem" id="all-canonical">
           <button aria-controls="canonical-products" class="p-navigation__link" id="all-canonical-link" aria-expanded="false">All Canonical</button>
diff --git a/templates/docs/examples/patterns/navigation/reduced.html b/templates/docs/examples/patterns/navigation/reduced.html
index 32a2c7b88..798c0dcb4 100644
--- a/templates/docs/examples/patterns/navigation/reduced.html
+++ b/templates/docs/examples/patterns/navigation/reduced.html
@@ -1,5 +1,5 @@
 {% extends "_layouts/examples.html" %}
-{% from "docs/examples/patterns/navigation/_full-width-dropdown.jinja" import dropdown %}
+{% from "docs/examples/patterns/navigation/_full-width-dropdown.jinja" import build_fake_dropdown %}
 
 {% block title %}Navigation / Reduced{% endblock %}
 
@@ -27,26 +27,26 @@
       </ul>
     </div>
     <nav class="p-navigation__nav js-show-nav" aria-label="Categories">
-      <ul class="p-navigation__items js-dropdown-nav-list js-navigation-sliding-panel is-active">
+      <ul class="p-navigation__items js-dropdown-nav-list js-navigation-sliding-panel">
         <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="products">
           <a class="p-navigation__link" href="#products" aria-controls="products-content" tabindex="0">Products</a>
-          {{ dropdown('products-content', 'Products', links_count=11, sub_links_count=10, quick_links_count=5) }}
+          {{ build_fake_dropdown('products-content', 'Products', links_count=11, sub_links_count=10, quick_links_count=5) }}
         </li>
-        <li class="p-navigation__item--dropdown-toggle is-active js-navigation-dropdown-toggle" role="menuitem" id="use-case">
+        <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="use-case">
           <a class="p-navigation__link" href="#use-case" aria-controls="use-case-content" tabindex="0">Use cases</a>
-          {{ dropdown('use-case-content', 'Use cases', True) }}
+          {{ build_fake_dropdown('use-case-content', 'Use cases') }}
         </li>
         <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="support">
           <a class="p-navigation__link" href="#support" aria-controls="support-content" tabindex="0">Support</a>
-          {{ dropdown('support-content', 'Support', links_count=2, sub_links_count=8, quick_links_count=5) }}
+          {{ build_fake_dropdown('support-content', 'Support', links_count=2, sub_links_count=8, quick_links_count=5) }}
         </li>
         <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="community">
           <a class="p-navigation__link" href="#community" aria-controls="community-content" tabindex="0">Community</a>
-          {{ dropdown('community-content', 'Community', links_count=5, sub_links_count=7, quick_links_count=5) }}
+          {{ build_fake_dropdown('community-content', 'Community', links_count=5, sub_links_count=7, quick_links_count=5) }}
         </li>
         <li class="p-navigation__item--dropdown-toggle js-navigation-dropdown-toggle" role="menuitem" id="get-ubuntu">
           <a class="p-navigation__link" href="#get-ubuntu" aria-controls="get-ubuntu-content" tabindex="0">Get Ubuntu</a>
-          {{ dropdown('get-ubuntu-content', 'Get Ubuntu', links_count=6, sub_links_count=3, quick_links_count=8, has_button=True ) }}
+          {{ build_fake_dropdown('get-ubuntu-content', 'Get Ubuntu', links_count=6, sub_links_count=3, quick_links_count=8, has_cta_button=True ) }}
         </li>
         <li class="p-navigation__item--dropdown-toggle is-right-shifted js-navigation-dropdown-toggle" role="menuitem" id="all-canonical">
           <button aria-controls="canonical-products" class="p-navigation__link" id="all-canonical-link" aria-expanded="false">All Canonical</button>