From ddacb0bcbc08e2c14bb1cfffe460b01dd1e52fba Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Fri, 14 Mar 2025 17:48:31 +0100
Subject: [PATCH] small tidyups

---
 changedetectionio/conditions/form.py  | 11 ++++++-----
 changedetectionio/templates/edit.html |  6 ------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/changedetectionio/conditions/form.py b/changedetectionio/conditions/form.py
index 78745025..e57da545 100644
--- a/changedetectionio/conditions/form.py
+++ b/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):
diff --git a/changedetectionio/templates/edit.html b/changedetectionio/templates/edit.html
index ae82c9df..3f7027fd 100644
--- a/changedetectionio/templates/edit.html
+++ b/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">