chg: [instance:settings] UI improvements

src/Model/Table/SettingsProviderTable.php

@@ -216,31 +216,30 @@ class SettingsProviderTable extends AppTable
                                     'Narud' => 'Narud',
                                 ];
                             },
-                            'name' => 'Antagonist',
+                            'severity' => 'warning',
                             'type' => 'select'
                         ],
                     ],
                     'floating-setting' => [
                         'description' => 'floaringSetting',
-                        'errorMessage' => 'floaringSetting',
-                        'default' => 'A default value',
+                        // 'default' => 'A default value',
                         'name' => 'Uncategorized Setting',
-                        'test' => 'testEmptyBecomesDefault',
-                        'type' => 'string'
+                        // 'severity' => 'critical',
+                        'severity' => 'warning',
+                        // 'severity' => 'info',
+                        'type' => 'integer'
                     ],
                 ],
                 'Network' => [
                     'Proxy' => [
                         'proxy.host' => [
                             'description' => __('The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy.'),
-                            'default' => '',
                             'name' => __('Host'),
                             'test' => 'testHostname',
                             'type' => 'string',
                         ],
                         'proxy.port' => [
                             'description' => __('The TCP port for the HTTP proxy.'),
-                            'default' => '',
                             'name' => __('Port'),
                             'test' => 'testForRangeXY',
                             'type' => 'integer',

templates/Instance/settings.php

@@ -474,6 +474,8 @@ function isLeaf($setting)
             let oldValue = settingsFlattened[$input.data('setting-name')].value
             if ($input.is('select')) {
                 oldValue = oldValue !== undefined ? oldValue : -1
+            } else {
+                oldValue = oldValue !== undefined ? oldValue : ''
             }
             $input.val(oldValue)
             handleSettingValueChange($input)
@@ -503,7 +505,7 @@ function isLeaf($setting)
     function handleSettingValueChange($input) {
         const oldValue = settingsFlattened[$input.data('setting-name')].value
         const newValue = ($input.attr('type') == 'checkbox' ? $input.is(':checked') : $input.val())
-        if (newValue == oldValue) {
+        if (newValue == oldValue || (newValue == '' && oldValue == undefined)) {
             restoreWarnings($input)
         } else {
             removeWarnings($input)
@@ -664,4 +666,8 @@ function isLeaf($setting)
     .custom-select ~ div > a.btn-reset-setting {
         left: -2.5em;
     }
+
+    .form-control ~ div > a.btn-reset-setting {
+        left: -3em;
+    }
 </style>