mvc: contained fix for apply button spinner on 17.1

(cherry picked from commit 9079f06d)

src/opnsense/mvc/app/views/layout_partials/base_form.volt

@@ -55,6 +55,7 @@ data_title      :   data-title to set on form
 {%- endmacro %}
 
 {# Find if there are help supported or advanced field on this page #}
+{% set base_form_id=id %}
 {% set help=false %}
 {% set advanced=false %}
 {% for field in fields|default({})%}
@@ -70,7 +71,7 @@ data_title      :   data-title to set on form
 {%         break %}
 {%     endif %}
 {% endfor %}
-<form id="{{id}}" class="form-inline" data-title="{{data_title|default('')}}">
+<form id="{{base_form_id}}" class="form-inline" data-title="{{data_title|default('')}}">
   <div class="table-responsive">
     <table class="table table-striped table-condensed">
         <colgroup>
@@ -80,9 +81,9 @@ data_title      :   data-title to set on form
         </colgroup>
         <tbody>
         <tr>
-            <td align="left">{% if advanced|default(false) %}<a href="#"><i class="fa fa-toggle-off text-danger" id="show_advanced_{{id}}" type="button"></i> </a><small>{{ lang._('advanced mode') }} </small>{% endif %}</td>
+            <td align="left">{% if advanced|default(false) %}<a href="#"><i class="fa fa-toggle-off text-danger" id="show_advanced_{{base_form_id}}" type="button"></i> </a><small>{{ lang._('advanced mode') }} </small>{% endif %}</td>
             <td colspan="2" align="right">
-                {% if help|default(false) %}<small>{{ lang._('full help') }} </small><a href="#"><i class="fa fa-toggle-off text-danger" id="show_all_help_{{id}}" type="button"></i></a>{% endif %}
+                {% if help|default(false) %}<small>{{ lang._('full help') }} </small><a href="#"><i class="fa fa-toggle-off text-danger" id="show_all_help_{{base_form_id}}" type="button"></i></a>{% endif %}
             </td>
         </tr>
         {% set advanced=false %}
@@ -103,7 +104,7 @@ data_title      :   data-title to set on form
         {% endfor %}
         {% if apply_btn_id|default('') != '' %}
         <tr>
-            <td colspan="3"><button class="btn btn-primary" id="{{apply_btn_id}}" type="button"><b>{{ lang._('Apply') }} </b><i id="{{id}}_progress" class=""></i></button></td>
+            <td colspan="3"><button class="btn btn-primary" id="{{apply_btn_id}}" type="button"><b>{{ lang._('Apply') }} </b><i id="{{base_form_id}}_progress" class=""></i></button></td>
         </tr>
         {% endif %}
         </tbody>

src/opnsense/mvc/app/views/layout_partials/form_input_tr.volt

@@ -58,7 +58,7 @@ allownew    :   allow new items (for list) if applicable
             <input type="checkbox" id="{{ id }}" >
         {% elseif type == "select_multiple" %}
             <select multiple="multiple" {% if size|default(false) %}size="{{size}}"{% endif %}  id="{{ id }}" {% if style|default(false) %}class="{{style}}" {% endif %}  {% if hint|default(false) %}data-hint="{{hint}}"{% endif %}  {% if maxheight|default(false) %}data-maxheight="{{maxheight}}"{% endif %} data-width="{{width|default("348px")}}" data-allownew="{{allownew|default("false")}}" data-nbdropdownelements="{{nbDropdownElements|default("10")}}"></select>
-            <br/><a href="#" class="text-danger" id="clear-options" for="{{id}}"><i class="fa fa-times-circle"></i></a> <small>{{ lang._('Clear All') }}</small>
+            <br/><a href="#" class="text-danger" id="clear-options" for="{{ id }}"><i class="fa fa-times-circle"></i></a> <small>{{ lang._('Clear All') }}</small>
         {% elseif type == "dropdown" %}
             <select {% if size|default(false) %}size="{{size}}"{% endif %}  id="{{ id }}" class="{{style|default('selectpicker')}}"  data-width="{{width|default("348px")}}"></select>
         {% elseif type == "password" %}