mvc: first scoping fix was before for, that obviously didn't work; closes #1245

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

@@ -82,9 +82,9 @@ label           :   dialog label
                         </tr>
                         {% endif %}
                         {% for field in base_dialog_fields|default({})%}
+                            {# looks a bit buggy in the volt templates, field parameters won't reset properly here #}
                             {% set advanced=false %}
                             {% set help=false %}
-                            {% set style=false %}
                             {% set hint=false %}
                             {% set style=false %}
                             {% set maxheight=false %}

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

@@ -66,15 +66,15 @@ data_title      :   data-title to set on form
                 {% 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>
+        {% for field in fields|default({})%}
+            {# looks a bit buggy in the volt templates, field parameters won't reset properly here #}
             {% set advanced=false %}
             {% set help=false %}
-        {% set style=false %}
             {% set hint=false %}
             {% set style=false %}
             {% set maxheight=false %}
             {% set width=false %}
             {% set allownew=false %}
-        {% for field in fields|default({})%}
             {% if field['type'] == 'header' %}
               {# close table and start new one with header #}
 
@@ -100,16 +100,6 @@ data_title      :   data-title to set on form
             {% else %}
               {{ partial("layout_partials/form_input_tr",field)}}
             {% endif %}
-
-            {# looks a bit buggy in the volt templates, field parameters won't reset properly here #}
-            {% set advanced=false %}
-            {% set help=false %}
-            {% set style=false %}
-            {% set hint=false %}
-            {% set style=false %}
-            {% set maxheight=false %}
-            {% set width=false %}
-            {% set allownew=false %}
         {% endfor %}
         {% if apply_btn_id|default('') != '' %}
         <tr>