Fix a few bugs in templates openlibhums/consortial_billing#74

openlibhums · Oct 31, 2024 · bcb0a84 · bcb0a84
1 parent ae91643
commit bcb0a84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/components/form/button.html b/components/form/button.html
@@ -18,7 +18,6 @@
   {% if aria_controls %}
     aria-controls="{{ aria_controls }}"
     aria-expanded="false"
-    aria-pressed="false"
   {% endif %}
   {% if id %}
     id="{{ id }}"
@@ -30,16 +29,8 @@
     p-4 not-prose
     rounded-full border {{ border }} {{ fg }} {{ bg }}
     flex gap-4 items-center
-  "
-  {% for attr in data_attributes %}
-    {{ attr }}
-  {% endfor %}
-  >
-  <span
-    class="
-      uppercase
-      font-poppins-bold text-xs tracking-widest
-    ">
+  ">
+  <span class="uppercase font-poppins-bold text-xs tracking-widest">
     {% slot "text" default %}
       Button
     {% endslot %}
@@ -51,18 +42,23 @@
   const thisButton = document.querySelector('[data-{{ pid }}]');
   const form = thisButton.closest('form');
   const allButtons = form.querySelectorAll('button');
+  // Make it clear the button is selected and that it has opened
+  // new content in the next section of the page.
   thisButton.addEventListener('click', () => {
+    // First return other buttons in this form to normal
     for (const button of allButtons) {
       button.classList.remove('bg-white');
       button.classList.remove('text-blue');
       button.classList.add('text-white');
-      button.setAttribute('aria-pressed', 'false');
-    thisButton.setAttribute('aria-expanded', 'false');
+      if (button.hasAttribute('aria-controls')) {
+        button.setAttribute('aria-expanded', 'false');
+      }
     }
     thisButton.classList.add('bg-white');
     thisButton.classList.add('text-blue');
     thisButton.classList.remove('text-white');
-    thisButton.setAttribute('aria-pressed', 'true');
-    thisButton.setAttribute('aria-expanded', 'true');
+    if (thisButton.hasAttribute('aria-controls')) {
+      thisButton.setAttribute('aria-expanded', 'true');
+    }
   })
 </script>
diff --git a/templates/custom/recommend-us-choose-article.html b/templates/custom/recommend-us-choose-article.html
@@ -14,7 +14,7 @@ <h2 class="text-white">Article{{ article_count|pluralize }} with “{{ query }}
         <div class="not-prose">
           <ul>
             {% for article in articles %}
-              <li class="list-none">
+              <li class="list-none mt-4">
                 <div>{{ article.how_to_cite }}</div>
                 {% component_block "button_group"  %}
                   {% url 'recommend_us_generate_email' as hx_post %}

diff --git a/templates/custom/recommend-us-choose-journal.html b/templates/custom/recommend-us-choose-journal.html
@@ -14,7 +14,7 @@ <h2 class="text-white">Journal{{ journal_count|pluralize }} with “{{ query }}
         <div class="not-prose">
           <ul>
             {% for setting in journal_names %}
-              <li class="list-none">
+              <li class="list-none mt-4">
                 <div>{{ setting.value }}</div>
                 {% component_block "button_group"  %}
                   {% url 'recommend_us_generate_email' as hx_post %}