Skip to content

Commit d75725b

Browse files
MaikuolanMaikuolan
committed
Auxiliary rules update (CIDRAM/CIDRAM#624).
Changelog excerpt: - On the auxiliary rules page, when focused on the input field for a condition or webhook, if that field is empty, pressing backspace or delete will now hide the relevant fields for that condition or webhook. Such empty fields were already being disregarded when creating or updating auxiliary rules, so this change doesn't affect those mechanisms, but being able to hide such fields may slightly benefit the UX.
1 parent 3650cdf commit d75725b

File tree

10 files changed

+34
-20
lines changed

10 files changed

+34
-20
lines changed

‎themes/bluemetal/frontend.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ input[id=homebutton]{border-top-{FE_Align_Reverse}-radius:0;border-bottom-{FE_Al
101101
.fW{word-break:break-all}
102102
.exp{color:#ff0;background-color:#f00}
103103
.pieul{list-style-type:none;margin:0;padding:0}
104-
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick]{cursor:pointer}
104+
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick],.auxSuggestLink{cursor:pointer}
105105
.comCat::before{content:"➖";display:inline-block;margin-{FE_Align_Reverse}:6px;line-height:100%;cursor:pointer}
106106
.caret-down::before{animation:forRotate .2s linear 1;animation-fill-mode:both}
107107
.caret-up::before{animation:revRotate .2s linear 1;animation-fill-mode:both}

‎themes/fullmoon/_aux.html‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</li>
6363
<li>
6464
<div class="iCntr">
65-
<div class="iLabl s"><label for="statusCode">{label_aux_http_status_code_override}</label></div>
65+
<div class="iLabl s">{label_aux_http_status_code_override}</div>
6666
<div class="iCntn">
6767
<span id="statGroupX" class="statGroup">
6868
<input type="radio" class="auto" id="statusCodeX" name="statusCode" value="0" checked="true" /><label for="statusCodeX">🗙</label>
@@ -95,7 +95,7 @@
9595
<option value="actRdr">{optActRdr}</option>
9696
<option value="actRun">{optActRun}</option>
9797
<option value="actPro">{optActPro}</option>
98-
</select><input type="button" onclick="javascript:addCondition('', this.parentElement.parentElement.parentElement.nextSibling.nextSibling.nextSibling.nextSibling.firstChild.nextSibling.firstChild.nextSibling.firstChild.nextSibling.value)" value="{field_add_more_conditions} [1]" class="auto" accesskey="1" />
98+
</select><input type="button" onclick="javascript:addCondition('', this.parentElement.nextSibling.nextSibling.value)" value="{field_add_more_conditions} [1]" class="auto" accesskey="1" />
9999
</div>
100100
<div class="iCntn" id="conditions">
101101
<div class="flexrow"><select name="conSourceType[]" class="auto">{conSources}</select><select name="conIfOrNot[]" class="auto"><option value="If" class="ifOrNot">=</option><option value="Not" class="ifOrNot">≠</option></select><input type="text" name="conSourceValue[]" placeholder="{tip_condition_placeholder}" class="flexin" /></div>
@@ -139,7 +139,7 @@
139139
<li>
140140
<div class="iCntr">
141141
<div class="iLabl s"><label for="Notes">{label_aux_notes}</label></div>
142-
<div class="iCntn"><textarea name="Notes" class="half"></textarea></div>
142+
<div class="iCntn"><textarea name="Notes" id="Notes" class="half"></textarea></div>
143143
</div>
144144
</li>
145145
<li>
@@ -167,3 +167,10 @@
167167
</ul>
168168
</li>
169169
</ul></form></div>
170+
<script type="text/javascript">const inputContainer = document.getElementById('auxForm');
171+
inputContainer.addEventListener('keydown', function(event) {
172+
if ((event.target.matches('input[type="text"].flexin')||event.target.matches('input[type="text"].f500'))&&event.target.value===''&&(event.keyCode===8||event.keyCode===46)) {
173+
event.target.parentElement.style='display:none';
174+
}
175+
});
176+
</script>

‎themes/fullmoon/_aux_edit.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,11 @@
66
{Data}
77
</form>
88
<form id="auxFormMinified" action="?cidram-page=aux-edit" method="POST" style="display:none"><input type="hidden" id="minifiedFormData" name="minifiedFormData" value="" /></form>
9-
<script type="text/javascript">minifyForm('#auxForm','auxFormMinified','minifiedFormData')</script>
9+
<script type="text/javascript">minifyForm('#auxForm','auxFormMinified','minifiedFormData');
10+
const inputContainer = document.getElementById('auxForm');
11+
inputContainer.addEventListener('keydown', function(event) {
12+
if ((event.target.matches('input[type="text"].flexin')||event.target.matches('input[type="text"].f500'))&&event.target.value===''&&(event.keyCode===8||event.keyCode===46)) {
13+
event.target.parentElement.style='display:none';
14+
}
15+
});
16+
</script>

‎themes/fullmoon/frontend.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ input[id=homebutton]{border-top-{FE_Align_Reverse}-radius:0;border-bottom-{FE_Al
9797
.fW{word-break:break-all}
9898
.exp{color:#ff0;background-color:#f00}
9999
.pieul{list-style-type:none;margin:0;padding:0}
100-
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick]{cursor:pointer}
100+
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick],.auxSuggestLink{cursor:pointer}
101101
.comCat::before{content:"➖";display:inline-block;margin-{FE_Align_Reverse}:6px;line-height:100%;cursor:pointer}
102102
.caret-down::before{animation:forRotate .2s linear 1;animation-fill-mode:both}
103103
.caret-up::before{animation:revRotate .2s linear 1;animation-fill-mode:both}

‎themes/moss/frontend.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ input[id=homebutton]{border-top-{FE_Align_Reverse}-radius:0;border-bottom-{FE_Al
102102
.fW{word-break:break-all}
103103
.exp{color:#ff0;background-color:#f00}
104104
.pieul{list-style-type:none;margin:0;padding:0}
105-
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick]{cursor:pointer}
105+
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick],.auxSuggestLink{cursor:pointer}
106106
.comCat::before{content:"➖";display:inline-block;margin-{FE_Align_Reverse}:6px;line-height:100%;cursor:pointer}
107107
.caret-down::before{animation:forRotate .2s linear 1;animation-fill-mode:both}
108108
.caret-up::before{animation:revRotate .2s linear 1;animation-fill-mode:both}

‎themes/primer/frontend.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ input[type=button]:hover,input[type=submit]:hover,input[type=reset]:hover,button
9999
.fW{word-break:break-all}
100100
.exp{color:#ff0;background-color:#f00}
101101
.pieul{list-style-type:none;margin:0;padding:0}
102-
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick]{cursor:pointer}
102+
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick],.auxSuggestLink{cursor:pointer}
103103
.comCat::before{content:"➖";display:inline-block;margin-{FE_Align_Reverse}:6px;line-height:100%;cursor:pointer}
104104
.caret-down::before{animation:forRotate .2s linear 1;animation-fill-mode:both}
105105
.caret-up::before{animation:revRotate .2s linear 1;animation-fill-mode:both}

‎themes/primerdark/frontend.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ input[type=button],input[type=submit],input[type=reset],button{transition:all .2
102102
.fW{word-break:break-all}
103103
.exp{color:#ff0;background-color:#f00}
104104
.pieul{list-style-type:none;margin:0;padding:0}
105-
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick]{cursor:pointer}
105+
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick],.auxSuggestLink{cursor:pointer}
106106
.comCat::before{content:"➖";display:inline-block;margin-{FE_Align_Reverse}:6px;line-height:100%;cursor:pointer}
107107
.caret-down::before{animation:forRotate .2s linear 1;animation-fill-mode:both}
108108
.caret-up::before{animation:revRotate .2s linear 1;animation-fill-mode:both}

‎themes/rbi/frontend.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ input[id=homebutton]{border-top-{FE_Align_Reverse}-radius:0;border-bottom-{FE_Al
103103
.fW{word-break:break-all}
104104
.exp{color:#ff0;background-color:#f00}
105105
.pieul{list-style-type:none;margin:0;padding:0}
106-
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick]{cursor:pointer}
106+
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick],.auxSuggestLink{cursor:pointer}
107107
.comCat::before{content:"➖";display:inline-block;margin-{FE_Align_Reverse}:6px;line-height:100%;cursor:pointer}
108108
.caret-down::before{animation:forRotate .2s linear 1;animation-fill-mode:both}
109109
.caret-up::before{animation:revRotate .2s linear 1;animation-fill-mode:both}

‎themes/slate/frontend.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ input[id=homebutton]{border-top-{FE_Align_Reverse}-radius:0;border-bottom-{FE_Al
103103
.fW{word-break:break-all}
104104
.exp{color:#ff0;background-color:#f00}
105105
.pieul{list-style-type:none;margin:0;padding:0}
106-
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick]{cursor:pointer}
106+
li>span.comCat:first-child,input[type=button],input[type=file]::file-selector-button,input[type=checkbox],input[type=checkbox]+label,input[type=radio],input[type=radio]+label,input[type=reset],input[type=submit],span>span[onclick],li>span[onclick],.navicon[onclick],.auxSuggestLink{cursor:pointer}
107107
.comCat::before{content:"➖";display:inline-block;margin-{FE_Align_Reverse}:6px;line-height:100%;cursor:pointer}
108108
.caret-down::before{animation:forRotate .2s linear 1;animation-fill-mode:both}
109109
.caret-up::before{animation:revRotate .2s linear 1;animation-fill-mode:both}

‎themes/themes.dat‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ theme/bluemetal:
2525
Checksum:
2626
- "e7b728ac1bdb4107f9793801b0a5bc50c1ff41f9f165b6830a01ec84cb79651f:2010"
2727
- "7405a80593058c1ba96a58a27e75494e93f456fbe3cb913059cde9ae7eec2615:2518"
28-
- "232cad114187570138b18d60d2c0f67c7841930601b956eb82b66a8480ca7628:12550"
28+
- "360afab21aeb82dd3bdc5f3ee9c1f0e0f03ef0844965dea0a3ee592b7a64776d:12566"
2929
- "6c533c40ff1440d1f6e625b350386959679a359a801cf5874be33c4565edc6ae:886"
3030
- "27c4d3f0f99e06ef984a53a61fa1a54a407999e090181addd1018343de87907a:1394"
3131
Reannotate: "themes.dat"
@@ -110,8 +110,8 @@ theme/fullmoon:
110110
- "4b9f79eca5b293e3422f6c314186c5f51301f41b2c0017b6bc4f532b8a08f24b:1942"
111111
- "f75c954f671729916aa0e73979bd4b646ecd79aadea44c7eae66c6d6e3026766:2438"
112112
- "81faeba684e1c6783a523e45208089e09096ace7618602a83d99e7bc624f4e5a:1816"
113-
- "5f94b88bfebb2e6590d6c880fa06cdd74f80efcdb120a68922cd2e10d78639b0:8493"
114-
- "d4f4bc4006ec858e7c92aacb4f16a1fbbe0a03099d7d597dd2105fc7c3c05956:587"
113+
- "91021132355c4a710c011235517f7ba39a00d8da3903f2d50c192e9a3490079d:8749"
114+
- "5592e96dfd55fa01cf6e3888b05c60963c2105fecf4d93cc2e4f2f672a444a63:946"
115115
- "a7917d877858bb194ecce1db9b02ac0c9e740a3b526c7d3f4f597001aa1785f8:1753"
116116
- "b157e35ad544f3bad773e867060116cb7bc5b5a3196cfc354b74b17d64a287b8:48"
117117
- "22acfc70c6ffa7ef459126fededbac433e77db6e5a839caad2710b62a1acac8e:2339"
@@ -135,7 +135,7 @@ theme/fullmoon:
135135
- "25926fe60915a4e511968d5d83e9b6f39e724575f2a4defb0bce17d95e5cc653:43"
136136
- "552aba78cdb551e6f8c5b10fecc0ab4cd520449cc4fb8785e0c93f71ff01f309:5162"
137137
- "2dc043c315ad494bcc06b32ded6bd46b8beb09acde8237b0ece9f191323bb5e0:743"
138-
- "e73d1afc835989647f18602d793d14b986a50699927f89e772574dc26528b2ca:11481"
138+
- "9e7083fc0329493c4d3286c078f9b76f088176556cd543b7a511030aac1ace2e:11497"
139139
- "7a9e256639070415d9f59447e89bfbde4d22913251a9201f4b9be4f3f0cf2dd0:837"
140140
- "17703149e6f8a4312527243bfaf369c2dfa73e56c50d4d2fdb2b9f8fa0b332c3:34088"
141141
- "5b9d2c8399b1074e1fdc719e978d6cb170c465fa205fe455f1ea0328865e00a6:1393"
@@ -170,7 +170,7 @@ theme/moss:
170170
- "bd9c5e4c1d54d14fc1901ee8f7baee594491b9f4737ca762bbb657d8639d2de3:2438"
171171
- "ceb4497bbae40d04a2a8ecb42086307bc57677235685ea07bedf98795dea780f:17804"
172172
- "7e201d5b66569728b06eb38c3d9d36b7679e6d98a8f69dabd49c54ff0f543d29:1582"
173-
- "53e6cf797f273a799ea6a69a2f2785027c01f3d9f2ccc87c7524be35e3f3ef79:12761"
173+
- "dc8d2dbf9ac7ce77eed5c8be23789b7cfd16cd6f04e870476657170c5915e3d3:12777"
174174
- "6c533c40ff1440d1f6e625b350386959679a359a801cf5874be33c4565edc6ae:886"
175175
Reannotate: "themes.dat"
176176
theme/primer:
@@ -203,7 +203,7 @@ theme/primer:
203203
- "91e29d1ec09a7b4b0c80f14cd589d4d3e7984749047c2e3e57d1fe077658a839:3318"
204204
- "7d5936fe0484f6739b0ffa8d3acf81ce6df9353fe04dd7096c19c88a1134364a:1955"
205205
- "6145977fd40e6cf39446446915e1dc7691e87ce4f7f67f4f80b92cb06662cddc:574"
206-
- "353f2e45c8e5ec7f7065021318b19a4d0e441efe147fc24a46ceacfcb932c3de:13716"
206+
- "e4c52a4605e41aa338c04ec806a32464e81ed97615c07d116e2ccf3a6fc15ad7:13732"
207207
- "78237c45eb2394b72cb5dba4d0b33a366b2abc857ad3af1dbc5b5b2344a6a067:860"
208208
Reannotate: "themes.dat"
209209
theme/primerdark:
@@ -236,7 +236,7 @@ theme/primerdark:
236236
- "f24942206d223c88e901f510c7cf7147d9e8e53e88c139c8d166fedfb3d66418:3299"
237237
- "7d5936fe0484f6739b0ffa8d3acf81ce6df9353fe04dd7096c19c88a1134364a:1955"
238238
- "6145977fd40e6cf39446446915e1dc7691e87ce4f7f67f4f80b92cb06662cddc:574"
239-
- "c37401cf6f7c2315aca6ced01bbeed4c10c767fc596278846ff9475499cfe0ef:13572"
239+
- "449ee3b12b78f7803f5ab61d8705d2081fb62740a34a14e919a5e0924d094f59:13588"
240240
- "78237c45eb2394b72cb5dba4d0b33a366b2abc857ad3af1dbc5b5b2344a6a067:860"
241241
Reannotate: "themes.dat"
242242
theme/rbi:
@@ -261,7 +261,7 @@ theme/rbi:
261261
Checksum:
262262
- "f9fb589bfa0832a4e7df4365a41fe1fe65026f64ecda0737b2726d8611bb98f2:1927"
263263
- "53bc98db048566f9c2e06fd0555fb3956572ad7b78dffe44c2ea5d37cc0cd236:2408"
264-
- "4f5c092956ffeb1be013df9c1b2be34afd9163b82b0b8a4b65937f4a84546b42:12426"
264+
- "302a7bd846387fbe16236bad27b9d357f3cf5ef5146781138698e5554f63928d:12442"
265265
Reannotate: "themes.dat"
266266
theme/slate:
267267
Name: "Theme: Slate"
@@ -289,7 +289,7 @@ theme/slate:
289289
Checksum:
290290
- "f6495f9b934253d9a1758d8ade00c873df07f604e0df3ad7997e010b464a2148:1899"
291291
- "ea973ecef7375b90399afc7c0417b7b9427cc6c8e532a94fd87c71bb3c2ad66c:2580"
292-
- "e8a4fce420b22d32577eecd967e672efc19a55790c3861e05bc5e0e5e2c3fe6e:12512"
292+
- "514558d013a1fb85d1b012da361de2ddeb4f8af986d2bb07505a9c03eb193537:12528"
293293
- "6c533c40ff1440d1f6e625b350386959679a359a801cf5874be33c4565edc6ae:886"
294294
- "b1e24a988b17cfbb8163e912e0cb7d5da50ea3a4d2e9e07c7aa565943e68130f:1389"
295295
Reannotate: "themes.dat"

0 commit comments

Comments
 (0)