From b393608c728cf2b63c037ce28577bc08547c8a3d Mon Sep 17 00:00:00 2001
From: sfisher <scott.fisher@ucop.edu>
Date: Fri, 20 Dec 2024 16:57:16 -0800
Subject: [PATCH] Encloses radio buttons in fieldset as indicated in ticket
 544.

---
 templates/create/_datacite_title.html       |  4 +-
 templates/includes/advanced_publish_id.html | 40 ++++++++--------
 templates/includes/simple_id_type.html      | 53 +++++++++++----------
 3 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/templates/create/_datacite_title.html b/templates/create/_datacite_title.html
index ea7d01493..1d0a335ab 100644
--- a/templates/create/_datacite_title.html
+++ b/templates/create/_datacite_title.html
@@ -23,7 +23,7 @@
   {% if forloop.counter == 1 %}
     {% include "create/_datacite_inlinetext.html" with field=t_field reqd="true" %}
   {% elif forloop.counter == 2 %}
-    <div class="fieldset-inline create__form-element-group" role="group" aria-labelledby="title-type-{{forloop.counter}}">
+    <fieldset class="fieldset-inline create__form-element-group" role="group" aria-labelledby="title-type-{{forloop.counter}}">
       <span id="title-type-{{forloop.counter}}" class="fieldset-inline__legend create__inline-nested-legend">{{ t_field.label }}</span>
       {% for radio in t_field %}
       <label for="{{ radio.id_for_label }}" class="fcontrol__radio-label-inline">
@@ -31,7 +31,7 @@
         <span>{{ radio.choice_label }}</span>
       </label>
       {% endfor %}
-    </div>
+    </fieldset>
   {% else %}
     {% include "create/_datacite_inlinetext.html" with field=t_field %}
   {% endif %}
diff --git a/templates/includes/advanced_publish_id.html b/templates/includes/advanced_publish_id.html
index 44fa2be06..a25451440 100644
--- a/templates/includes/advanced_publish_id.html
+++ b/templates/includes/advanced_publish_id.html
@@ -3,25 +3,25 @@
 
 <div class="fieldset-stacked" role="group" aria-labelledby="fieldset-publish">
   <div id="fieldset-publish" aria-label="{% trans "Step 3 - Publishing options" %}" class="fieldset-stacked__legend-number-3"><h2 class="fieldset__heading-2">{% trans "Decide" %}</h2></div>
-  <div class="fieldset-inline create__form-element-group" role="group" aria-labelledby="create__publish">
-    <span id="create__publish" class="fieldset-inline__legend create__inline-nested-legend">{% trans "Make this identifier" %}</span>
-    <label for="publish_true" class="fcontrol__radio-label-inline">
-      <input id="publish_true" class="fcontrol__radio-button-stacked" type="radio" value="True" name="publish" 
-      {% if request.POST.publish != 'False' or request.GET.publish != 'False' %}
-        checked="checked"
-      {% endif %} 
-      ><span>{% trans "Public" %}</span>
-    </label>
-    <label for="publish_false" class="fcontrol__radio-label-inline">
-      <input id="publish_false" class="fcontrol__radio-button-stacked" type="radio" value="False" name="publish"
-      {% if request.POST.publish == 'False' or request.GET.publish == 'False' %}
-        checked="checked"
-      {% endif %} 
-      ><span>{% trans "Reserved" %}</span>
-    </label>
-    {% help_icon "decide_public" _("on making an identifier public or reserved") %}
-  </div>
-  <div id="harv_index" class="fieldset-inline create__form-element-group" role="group" aria-labelledby="fieldset-harvesting">
+  <fieldset class="fieldset-inline create__form-element-group" role="group" aria-labelledby="create__publish">
+      <span id="create__publish" class="fieldset-inline__legend create__inline-nested-legend">{% trans "Make this identifier" %}</span>
+      <label for="publish_true" class="fcontrol__radio-label-inline">
+        <input id="publish_true" class="fcontrol__radio-button-stacked" type="radio" value="True" name="publish"
+        {% if request.POST.publish != 'False' or request.GET.publish != 'False' %}
+          checked="checked"
+        {% endif %}
+        ><span>{% trans "Public" %}</span>
+      </label>
+      <label for="publish_false" class="fcontrol__radio-label-inline">
+        <input id="publish_false" class="fcontrol__radio-button-stacked" type="radio" value="False" name="publish"
+        {% if request.POST.publish == 'False' or request.GET.publish == 'False' %}
+          checked="checked"
+        {% endif %}
+        ><span>{% trans "Reserved" %}</span>
+      </label>
+      {% help_icon "decide_public" _("on making an identifier public or reserved") %}
+  </fieldset>
+  <fieldset1 id="harv_index" class="fieldset-inline create__form-element-group" role="group" aria-labelledby="fieldset-harvesting">
     <span id="fieldset-harvesting" class="fieldset-inline__legend create__inline-nested-legend">{% trans "Allow harvesting/indexing?" %}</span>
     <label for="export_yes" class="fcontrol__radio-label-inline">
       <input id="export_yes" class="fcontrol__radio-button-stacked" type="radio" value="yes" name="export"
@@ -38,5 +38,5 @@
       > <span>{% trans "No" %}</span>
     </label>
     {% help_icon "decide_export" _("on harvesting/indexing") %}
-  </div>
+  </fieldset1>
 </div>
diff --git a/templates/includes/simple_id_type.html b/templates/includes/simple_id_type.html
index d7cc2876d..8e5ff2707 100644
--- a/templates/includes/simple_id_type.html
+++ b/templates/includes/simple_id_type.html
@@ -1,30 +1,33 @@
 {% load layout_extras %}
 {% load i18n %}
 
-  <div class="fieldset-stacked" role="group" aria-labelledby="create__fieldset1">
-    <div id="create__fieldset1" aria-label="{% trans "Step 1 - Choose an identifier type" %}" class="fieldset-stacked__legend-number-1"><h2 class="fieldset__heading-2">{% trans "Choose an identifier type" %}</h2>
-    {% if calling_page == 'demo' %}
-      {% help_icon "choose_id_demo" _("on choosing the type of identifier") %}
+<div class="fieldset-stacked" role="group" aria-labelledby="create__fieldset1">
+  <fieldset>
+    <div id="create__fieldset1" aria-label="{% trans "Step 1 - Choose an identifier type" %}" class="fieldset-stacked__legend-number-1">
+      <h2 class="fieldset__heading-2">{% trans "Choose an identifier type" %}</h2>
+      {% if calling_page == 'demo' %}
+        {% help_icon "choose_id_demo" _("on choosing the type of identifier") %}
+      {% else %}
+        {% help_icon "choose_id" _("on choosing the type of identifier") %}
+      {% endif %}
+    </div>
+    {% if prefixes|duplicate_id_types %}
+      {% comment %}
+        class 'ays-ignore' is used by 'are-you-sure.js' which prevents users from accidentally leaving
+        a form they are working on. In this case, we will allow users to choose between shoulder types.
+        Although it's best we map already filled in fields over to next profile, which is something we should implement.
+      {% endcomment %}
+      {% for p in prefixes %}
+        <label for="{{p.prefix}}" class="fcontrol__radio-label-stacked create__radio-button">
+          <input id="{{p.prefix}}" class="fcontrol__radio-button-stacked ays-ignore" type="radio" value="{{p.prefix}}" name="shoulder" {% selected_radio "shoulder" forloop.counter p.prefix %} /> <span>{% shoulder_display p "False" testPrefixes "False" %}</span>
+        </label>
+      {% endfor %}
     {% else %}
-      {% help_icon "choose_id" _("on choosing the type of identifier") %}
+      {% for p in prefixes %}
+        <label for="{{p.prefix}}" class="fcontrol__radio-label-stacked create__radio-button">
+          <input id="{{p.prefix}}" class="fcontrol__radio-button-stacked ays-ignore" type="radio" value="{{p.prefix}}" name="shoulder" {% selected_radio "shoulder" forloop.counter p.prefix %} /> <span>{% shoulder_display p "False" testPrefixes "True" %}</span>
+        </label>
+      {% endfor %}
     {% endif %}
-  </div>
-  {% if prefixes|duplicate_id_types %}
-  {% comment %}
-    class 'ays-ignore' is used by 'are-you-sure.js' which prevents users from accidentally leaving
-    a form they are working on. In this case, we will allow users to choose between shoulder types.
-    Although it's best we map already filled in fields over to next profile, which is something we should implement.
-  {% endcomment %}
-    {% for p in prefixes %}
-    <label for="{{p.prefix}}" class="fcontrol__radio-label-stacked create__radio-button">
-      <input id="{{p.prefix}}" class="fcontrol__radio-button-stacked ays-ignore" type="radio" value="{{p.prefix}}" name="shoulder" {% selected_radio "shoulder" forloop.counter p.prefix %} /> <span>{% shoulder_display p "False" testPrefixes "False" %}</span>
-    </label>
-    {% endfor %}
-  {% else %}
-    {% for p in prefixes %}
-    <label for="{{p.prefix}}" class="fcontrol__radio-label-stacked create__radio-button">
-      <input id="{{p.prefix}}" class="fcontrol__radio-button-stacked ays-ignore" type="radio" value="{{p.prefix}}" name="shoulder" {% selected_radio "shoulder" forloop.counter p.prefix %} /> <span>{% shoulder_display p "False" testPrefixes "True" %}</span>
-    </label>
-    {% endfor %}
-  {% endif %}
-  </div>
+  </fieldset>
+</div>