small tidyups

changedetectionio/conditions/form.py

@@ -7,17 +7,18 @@ class ConditionFormRow(Form):
     # ✅ Ensure Plugins Are Loaded BEFORE Importing Choices
     from changedetectionio.conditions import plugin_manager
     from changedetectionio.conditions import operator_choices, field_choices
+    field = SelectField(
+        "Field",
+        choices=field_choices,
+        validators=[validators.Optional()]
+    )
 
     operator = SelectField(
         "Operator",
         choices=operator_choices,
         validators=[validators.Optional()]
     )
-    field = SelectField(
-        "Field",
-        choices=field_choices,
-        validators=[validators.Optional()]
-    )
+
     value = StringField("Value", validators=[validators.Optional()])
 
     def validate(self, extra_validators=None):

changedetectionio/templates/edit.html

@@ -287,14 +287,8 @@ Math: {{ 1 + 1 }}") }}
 
             <div class="tab-pane-inner" id="conditions">
                 <div class="pure-control-group">
-                    <a id="conditions-delete-all" class="pure-button button-secondary button-xsmall" >Reset all conditions</a>
-                </div>
-
-                <div class="pure-control-group">
-                    <!-- Grid Header -->
                     {{ render_field(form.conditions_match_logic) }}
                     {{ render_fieldlist_of_formfields_as_table(form.conditions) }}
-
                 </div>
             </div>
             <div class="tab-pane-inner" id="filters-and-triggers">