Merge branch '5.3'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 27 Dec 2020 13:13:56 +0000 (14:13 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 27 Dec 2020 13:13:56 +0000 (14:13 +0100)
1  2 
com.woltlab.wcf/templates/__formField.tpl
wcfsetup/install/files/acp/templates/__formField.tpl

index e78e5d179b18637787460f29d9d048c8f799b72f,0f752fcb9e3bc805eacf8c69028c18399ef0e14c..4415049764cd64f0bdaf1222efa8243525cae1c6
@@@ -1,5 -1,9 +1,9 @@@
- <dl id="{@$field->getPrefixedId()}Container" {if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$field->checkDependencies()} style="display: none;"{/if}>
+ <dl id="{@$field->getPrefixedId()}Container"{*
+       *}{if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+       *}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+       *}{if !$field->checkDependencies()} style="display: none;"{/if}{*
+ *}>
 -      <dt>{if $field->getLabel() !== null}<label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label>{if $field->isRequired()} <span class="formFieldRequired">*</span>{/if}{/if}</dt>
 +      <dt>{if $field->getLabel() !== null}<label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label>{if $field->isRequired() && $form->marksRequiredFields()} <span class="formFieldRequired">*</span>{/if}{/if}</dt>
        <dd>
                {@$field->getFieldHtml()}
                
index e78e5d179b18637787460f29d9d048c8f799b72f,0f752fcb9e3bc805eacf8c69028c18399ef0e14c..4415049764cd64f0bdaf1222efa8243525cae1c6
@@@ -1,5 -1,9 +1,9 @@@
- <dl id="{@$field->getPrefixedId()}Container" {if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$field->checkDependencies()} style="display: none;"{/if}>
+ <dl id="{@$field->getPrefixedId()}Container"{*
+       *}{if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+       *}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+       *}{if !$field->checkDependencies()} style="display: none;"{/if}{*
+ *}>
 -      <dt>{if $field->getLabel() !== null}<label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label>{if $field->isRequired()} <span class="formFieldRequired">*</span>{/if}{/if}</dt>
 +      <dt>{if $field->getLabel() !== null}<label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label>{if $field->isRequired() && $form->marksRequiredFields()} <span class="formFieldRequired">*</span>{/if}{/if}</dt>
        <dd>
                {@$field->getFieldHtml()}