From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 18 May 2022 16:24:37 +0000 (+0200)
Subject: Improved structure of the search form filter options
X-Git-Tag: 5.5.0_Beta_3~5^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b92e85d248336107a6765664c9f95567671ddcc;p=GitHub%2FWoltLab%2FWCF.git

Improved structure of the search form filter options
---

diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index e32350d785..143f273ef1 100644
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -20,9 +20,10 @@
 		
 			<div class="searchFilters defaultSearchFilters">
 				<dl>
-					<dt></dt>
+					<dt><label>{lang}wcf.search.searchIn{/lang}</label></dt>
 					<dd>
-						<label><input type="checkbox" name="subjectOnly" value="1"> {lang}wcf.search.subjectOnly{/lang}</label>
+						<label><input type="radio" name="subjectOnly" value="" checked> {lang}wcf.search.searchIn.subjectAndMessage{/lang}</label>
+						<label><input type="radio" name="subjectOnly" value="1"> {lang}wcf.search.searchIn.subjectOnly{/lang}</label>
 						{* deprecated *}{event name='queryOptions'}
 					</dd>
 				</dl>
diff --git a/ts/WoltLabSuite/Core/Ui/Search/Extended.ts b/ts/WoltLabSuite/Core/Ui/Search/Extended.ts
index 9f544e3ad8..b4afc7102c 100644
--- a/ts/WoltLabSuite/Core/Ui/Search/Extended.ts
+++ b/ts/WoltLabSuite/Core/Ui/Search/Extended.ts
@@ -194,7 +194,10 @@ export class UiSearchExtended {
           });
           if (id) {
             DatePicker.setDate(id, new Date(value));
+            return;
           }
+
+          element.value = value;
         } else if (element instanceof HTMLInputElement) {
           if (element.type === "checkbox") {
             element.checked = true;
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
index 95b89cc9d4..32a99dfd7d 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
@@ -149,7 +149,9 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Date/Picker", "../..
                         });
                         if (id) {
                             Picker_1.default.setDate(id, new Date(value));
+                            return;
                         }
+                        element.value = value;
                     }
                     else if (element instanceof HTMLInputElement) {
                         if (element.type === "checkbox") {
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7f1d1f446e..0e2b2a9032 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4514,8 +4514,10 @@ Dateianhänge:
 		<item name="wcf.search.sortBy.relevance"><![CDATA[Relevanz]]></item>
 		<item name="wcf.search.sortBy.time"><![CDATA[Datum]]></item>
 		<item name="wcf.search.sortBy.username"><![CDATA[Autor]]></item>
-		<item name="wcf.search.subjectOnly"><![CDATA[Nur Betreff durchsuchen]]></item>
-		<item name="wcf.search.type"><![CDATA[Suche in]]></item>
+		<item name="wcf.search.searchIn"><![CDATA[Suchen in]]></item>
+		<item name="wcf.search.searchIn.subjectAndMessage"><![CDATA[Betreff und Nachricht]]></item>
+		<item name="wcf.search.searchIn.subjectOnly"><![CDATA[Nur Betreff]]></item>
+		<item name="wcf.search.type"><![CDATA[Art der Inhalte]]></item>
 		<item name="wcf.search.type.everywhere"><![CDATA[Alles]]></item>
 		<item name="wcf.search.object.com.woltlab.wcf.article"><![CDATA[Artikel]]></item>
 		<item name="wcf.search.type.com.woltlab.wcf.article"><![CDATA[Artikel]]></item>
@@ -5618,5 +5620,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
 	<item name="wcf.user.profile.customization" />
 	<item name="wcf.acp.option.enable_desktop_notifications"/>
 	<item name="wcf.acp.option.enable_desktop_notifications.description"/>
+	<item name="wcf.search.subjectOnly" />
 </delete>
 </language>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c9e8dcd267..8f76d2c0e7 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4516,8 +4516,10 @@ Attachments:
 		<item name="wcf.search.sortBy.relevance"><![CDATA[Relevance]]></item>
 		<item name="wcf.search.sortBy.time"><![CDATA[Time]]></item>
 		<item name="wcf.search.sortBy.username"><![CDATA[Author]]></item>
-		<item name="wcf.search.subjectOnly"><![CDATA[Search subject only]]></item>
-		<item name="wcf.search.type"><![CDATA[Search in]]></item>
+		<item name="wcf.search.searchIn"><![CDATA[Search In]]></item>
+		<item name="wcf.search.searchIn.subjectAndMessage"><![CDATA[Subject and message]]></item>
+		<item name="wcf.search.searchIn.subjectOnly"><![CDATA[Subject only]]></item>
+		<item name="wcf.search.type"><![CDATA[Content Type]]></item>
 		<item name="wcf.search.type.everywhere"><![CDATA[Everywhere]]></item>
 		<item name="wcf.search.object.com.woltlab.wcf.article"><![CDATA[Article]]></item>
 		<item name="wcf.search.type.com.woltlab.wcf.article"><![CDATA[Articles]]></item>
@@ -5620,5 +5622,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
 	<item name="wcf.user.profile.customization" />
 	<item name="wcf.acp.option.enable_desktop_notifications"/>
 	<item name="wcf.acp.option.enable_desktop_notifications.description"/>
+	<item name="wcf.search.subjectOnly" />
 </delete>
 </language>