From b46e449b6a98c5be11018239951ecd6c6dd512a4 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 18 Mar 2016 16:39:34 +0100
Subject: [PATCH] Fixed select element DOM

---
 com.woltlab.wcf/templates/search.tpl          | 24 +++++++++++--------
 .../templates/selectOptionType.tpl            | 14 ++++++-----
 .../templates/selectSearchableOptionType.tpl  | 14 ++++++-----
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index 9480135d9d..9191e57009 100644
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -65,17 +65,21 @@
 		<dl>
 			<dt><label for="sortField">{lang}wcf.search.sortBy{/lang}</label></dt>
 			<dd>
-				<select id="sortField" name="sortField">
-					<option value="relevance"{if $sortField == 'relevance'} selected="selected"{/if}>{lang}wcf.search.sortBy.relevance{/lang}</option>
-					<option value="subject"{if $sortField == 'subject'} selected="selected"{/if}>{lang}wcf.global.subject{/lang}</option>
-					<option value="time"{if $sortField == 'time'} selected="selected"{/if}>{lang}wcf.search.sortBy.time{/lang}</option>
-					<option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.search.sortBy.username{/lang}</option>
-				</select>
+				<label class="selectDropdown">
+					<select id="sortField" name="sortField">
+						<option value="relevance"{if $sortField == 'relevance'} selected="selected"{/if}>{lang}wcf.search.sortBy.relevance{/lang}</option>
+						<option value="subject"{if $sortField == 'subject'} selected="selected"{/if}>{lang}wcf.global.subject{/lang}</option>
+						<option value="time"{if $sortField == 'time'} selected="selected"{/if}>{lang}wcf.search.sortBy.time{/lang}</option>
+						<option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.search.sortBy.username{/lang}</option>
+					</select>
+				</label>
 				
-				<select name="sortOrder">
-					<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
-					<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
-				</select>
+				<label class="selectDropdown">
+					<select name="sortOrder">
+						<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
+						<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
+					</select>
+				</label>
 				{event name='displayOptions'}
 			</dd>
 		</dl>
diff --git a/com.woltlab.wcf/templates/selectOptionType.tpl b/com.woltlab.wcf/templates/selectOptionType.tpl
index bd220fe3cb..ea30b398aa 100644
--- a/com.woltlab.wcf/templates/selectOptionType.tpl
+++ b/com.woltlab.wcf/templates/selectOptionType.tpl
@@ -1,6 +1,8 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}]">
-	{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
-	{foreach from=$selectOptions key=key item=selectOption}
-		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
-	{/foreach}
-</select>
\ No newline at end of file
+<label class="selectDropdown">
+	<select id="{$option->optionName}" name="values[{$option->optionName}]">
+		{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
+		{foreach from=$selectOptions key=key item=selectOption}
+			<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+		{/foreach}
+	</select>
+</label>
diff --git a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
index cb54c0476f..ce95ace340 100644
--- a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
@@ -1,10 +1,12 @@
 <label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
-<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if}>
-	{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
-	{foreach from=$selectOptions key=key item=selectOption}
-		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
-	{/foreach}
-</select>
+<label class="selectDropdown">
+	<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if}>
+		{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
+		{foreach from=$selectOptions key=key item=selectOption}
+			<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+		{/foreach}
+	</select>
+</label>
 
 <script data-relocate="true">
 //<![CDATA[
-- 
2.20.1