More gui improvements

dev/Sieve/Commands/Tests.js

@@ -230,7 +230,6 @@ export class HeaderTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.match_type = ':is';
 		this.address_part = ':all';
 		this.header_names = new GrammarStringList;
 		this.key_list     = new GrammarStringList;

dev/Sieve/Extensions/rfc5235.js

@@ -51,7 +51,7 @@ export class VirusTestTest extends TestCommand
 		this._value = new GrammarQuotedString; // 1 - 5
 	}
 
-	get require() { return /:value|:count/.test(this.match_type) ? ['virustest','relational'] : 'virustest'; }
+	get require() { return /:value/.test(this.match_type) ? ['virustest','relational'] : 'virustest'; }
 
 	get value() { return this._value.value; }
 	set value(v) { this._value.value = v; }

snappymail/v/0.0.0/app/templates/Views/Sieve/AllOfTest.html

@@ -1,9 +1,7 @@
 <!-- rfc5228 -->
 <div data-bind="foreach: tests">
-	<div class="sieve-block">
-		<details>
-			<summary data-bind="text: $data"></summary>
-			<div data-bind="template: {name: $root.templateName($data)}"></div>
-		</details>
-	</div>
+	<details class="sieve-block">
+		<summary data-bind="text: $data"></summary>
+		<div data-bind="template: {name: $root.templateName($data)}"></div>
+	</details>
 </div>

snappymail/v/0.0.0/app/templates/Views/Sieve/AnyOfTest.html

@@ -1,9 +1,7 @@
 <!-- rfc5228 -->
-<div data-bind="foreach: tests">
-	<div class="sieve-block">
-		<details>
-			<summary data-bind="text: $data"></summary>
-			<div data-bind="template: {name: $root.templateName($data)}"></div>
-		</details>
-	</div>
-</div>
+<!-- ko foreach: tests -->
+	<details class="sieve-block">
+		<summary data-bind="text: $data"></summary>
+		<div data-bind="template: {name: $root.templateName($data)}"></div>
+	</details>
+<!-- /ko -->

snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html

@@ -1,3 +1,8 @@
 <!-- rfc5173 -->
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 body_transform = ''; // :raw, :content <string-list>, :text
 <input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>

snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html

@@ -1,5 +1,10 @@
 <!-- rfc5260 -->
 currentdate
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: zone">
 	<input type="text" data-bind="textInput: date_part">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>

snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html

@@ -1,5 +1,10 @@
 <!-- rfc5260 -->
 date
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: zone">
 	<label><input type="checkbox" data-bind="checked: originalzone"> originalzone</label>
 	<input type="text" data-bind="textInput: header_name">

snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html

@@ -1,4 +1,9 @@
 <!-- rfc5183 -->
 environment
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: name">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>

snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html

@@ -1,4 +1,9 @@
 <!-- rfc5232 -->
 hasflag
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: variable_list" pattern='".+"|\[".+"(,".+")*\]'>
 	<input type="text" data-bind="textInput: list_of_flags" pattern='".+"|\[".+"(,".+")*\]'>

snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html

@@ -13,8 +13,8 @@
 	<option>:domain</option>
 	<option>:all</option>
 </select>
--->
 <br/>
+-->
 <input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
 <br/>
 <input type="number" data-bind="textInput: index">

snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html

@@ -1,5 +1,10 @@
 <!-- rfc5490 -->
 metadata
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: mailbox">
 	<input type="text" data-bind="textInput: annotation_name">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>

snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html

@@ -1,5 +1,10 @@
 <!-- rfc5435 -->
 notifymethodcapability
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: notification_uri">
 	<input type="text" data-bind="textInput: notification_capability">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>

snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html

@@ -1,4 +1,9 @@
 <!-- rfc5490 -->
 servermetadata
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: annotation_name">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>

snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html

@@ -1,4 +1,9 @@
 <!-- rfc5235 -->
 spamtest
 	<input type="number">
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: value">

snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html

@@ -1,4 +1,9 @@
 <!-- rfc5229 -->
 string
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>

snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html

@@ -1,3 +1,8 @@
 <!-- rfc5235 -->
 virustest
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: value"> // 1 - 5