add required to required optiontypes

diff --git a/com.woltlab.wcf/templates/integerOptionType.tpl b/com.woltlab.wcf/templates/integerOptionType.tpl
index 8fe3659e33e7c0f398c5e8c1e14ecb665ee735b3..96bdc5ee51236d70ab0694cffac6e5fe3eac8ccc 100644 (file)
--- a/com.woltlab.wcf/templates/integerOptionType.tpl
+++ b/com.woltlab.wcf/templates/integerOptionType.tpl
@@ -1 +1 @@
-<input type="number" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minvalue !== null} min="{$option->minvalue}"{/if}{if $option->maxvalue !== null} max="{$option->maxvalue}"{/if}{if $inputClass} class="{@$inputClass}"{/if}>
\ No newline at end of file
+<input type="number" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minvalue !== null} min="{$option->minvalue}"{/if}{if $option->maxvalue !== null} max="{$option->maxvalue}"{/if}{if $inputClass} class="{@$inputClass}"{/if}{if $option->required} required{/if}>
\ No newline at end of file

diff --git a/com.woltlab.wcf/templates/messageOptionType.tpl b/com.woltlab.wcf/templates/messageOptionType.tpl
index 8a50966e57fe5133f81ba3fe1b17770c03567b2f..ab24c38947b9473d53c6e78d36dc11dd830be68c 100644 (file)
--- a/com.woltlab.wcf/templates/messageOptionType.tpl
+++ b/com.woltlab.wcf/templates/messageOptionType.tpl
@@ -1,4 +1,4 @@
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10"{if $option->required} required{/if}>{$value}</textarea>
 {include file='wysiwyg' wysiwygSelector=$option->optionName}
 
 <script data-relocate="true">

diff --git a/com.woltlab.wcf/templates/multiSelectOptionType.tpl b/com.woltlab.wcf/templates/multiSelectOptionType.tpl
index d38909b56dd62e1995fd8937d5822cdf2f14f3c3..d1faa4ebd3e184ef5751eaff3c1c52a72bd1c8b7 100644 (file)
--- a/com.woltlab.wcf/templates/multiSelectOptionType.tpl
+++ b/com.woltlab.wcf/templates/multiSelectOptionType.tpl
@@ -1,4 +1,4 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if $option->required} required{/if}>
 {foreach from=$selectOptions key=key item=selectOption}
        <option value="{$key}"{if $key|in_array:$value} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 {/foreach}

diff --git a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
index a0de77592261d07d5ca8ff43e4d2c6cb7d665258..4cc730f701a1956451edc2f3a69e5914ae516b3d 100644 (file)
--- a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
@@ -1,5 +1,5 @@
 <label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled{/if}>
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled{/if}{if $option->required} required{/if}>
        {foreach from=$selectOptions key=key item=selectOption}
                <option value="{$key}"{if $key|in_array:$value} selected{/if}>{lang}{@$selectOption}{/lang}</option>
        {/foreach}

diff --git a/com.woltlab.wcf/templates/selectOptionType.tpl b/com.woltlab.wcf/templates/selectOptionType.tpl
index 40bc997f006cfcb4e1c9d6f17ba7225f05f4de0d..e926ae672953590fe1c381a5fa3803ba8b534006 100644 (file)
--- a/com.woltlab.wcf/templates/selectOptionType.tpl
+++ b/com.woltlab.wcf/templates/selectOptionType.tpl
@@ -1,5 +1,5 @@
 <label class="selectDropdown">
-       <select id="{$option->optionName}" name="values[{$option->optionName}]">
+       <select id="{$option->optionName}" name="values[{$option->optionName}]"{if $option->required} required{/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{/if}>{lang}{@$selectOption}{/lang}</option>

diff --git a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
index 1aade96a44258fc692398ed76e621f243cc77ea4..6bbca4b8128bf4932bf14b7752872fabedf59593 100644 (file)
--- a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
@@ -1,6 +1,6 @@
 <label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 <label class="selectDropdown">
-       <select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled{/if}>
+       <select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled{/if}{if $option->required} required{/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{/if}>{lang}{@$selectOption}{/lang}</option>

diff --git a/com.woltlab.wcf/templates/textI18nOptionType.tpl b/com.woltlab.wcf/templates/textI18nOptionType.tpl
index 95606c98c94e75539aeb8560724946ff1b795b7a..9efd440d65ff17201510e2038e2833fc06d6c4af 100644 (file)
--- a/com.woltlab.wcf/templates/textI18nOptionType.tpl
+++ b/com.woltlab.wcf/templates/textI18nOptionType.tpl
@@ -1,2 +1,2 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" class="long">
+<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}"{if $option->required} required{/if} class="long">
 {include file='multipleLanguageInputJavascript' elementIdentifier=$option->optionName forceSelection=false}
\ No newline at end of file

diff --git a/com.woltlab.wcf/templates/textOptionType.tpl b/com.woltlab.wcf/templates/textOptionType.tpl
index eb75d8830e8d9e3c57c55c0a1c13fd08390a0a6c..653d3c9eb30accf674fabdb36dd97e603d4d2129 100644 (file)
--- a/com.woltlab.wcf/templates/textOptionType.tpl
+++ b/com.woltlab.wcf/templates/textOptionType.tpl
@@ -1 +1 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minlength > 0} required{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if}>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minlength > 0 || $option->required} required{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if}>

diff --git a/com.woltlab.wcf/templates/textSearchableOptionType.tpl b/com.woltlab.wcf/templates/textSearchableOptionType.tpl
index 81c0de79b486ddc45798c345861ca64618d2c55a..e366d1312866dfdad523684e0538848ade8fe247 100644 (file)
--- a/com.woltlab.wcf/templates/textSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/textSearchableOptionType.tpl
@@ -1,5 +1,5 @@
 <label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled{/if}>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled{/if}{if $option->required} required{/if}>
 
 <script data-relocate="true">
 //<![CDATA[

diff --git a/com.woltlab.wcf/templates/textareaI18nOptionType.tpl b/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
index 099a5388772b2a0586ea8f1b38d1f542e63dcec2..fdc85d9b7c422d216604f4a2e40ed0d7e745a223 100644 (file)
--- a/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
+++ b/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
@@ -1,2 +1,2 @@
-<textarea id="{$option->optionName}" name="{$option->optionName}" cols="40" rows="10">{$i18nPlainValues[$option->optionName]}</textarea>
+<textarea id="{$option->optionName}" name="{$option->optionName}" cols="40" rows="10"{if $option->required} required{/if}>{$i18nPlainValues[$option->optionName]}</textarea>
 {include file='multipleLanguageInputJavascript' elementIdentifier=$option->optionName forceSelection=false}

diff --git a/com.woltlab.wcf/templates/textareaOptionType.tpl b/com.woltlab.wcf/templates/textareaOptionType.tpl
index 310cd47267b2652a529a79b087cc1b3db22974f8..6995a1bc378181aaaf654f390d870a674be830d0 100644 (file)
--- a/com.woltlab.wcf/templates/textareaOptionType.tpl
+++ b/com.woltlab.wcf/templates/textareaOptionType.tpl
@@ -1 +1 @@
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10"{if $option->required} required{/if}>{$value}</textarea>

diff --git a/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl b/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
index 8c9f10a4e15b76af4c06550895575852c19d80f9..dcda2aeacf52696cba0ff46e4b40b197ba8450c9 100644 (file)
--- a/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
@@ -1,5 +1,5 @@
 <label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled{/if} cols="40" rows="10">{$value}</textarea>
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled{/if} cols="40" rows="10"{if $option->required} required{/if}>{$value}</textarea>
 
 <script data-relocate="true">
 //<![CDATA[