Fix separator of multiple form CSS classes

See #2509

diff --git a/com.woltlab.wcf/templates/__dialogForm.tpl b/com.woltlab.wcf/templates/__dialogForm.tpl
index a9e70ba54e2301c99ecb2fcaadc27e0953be9354..d42513b72f7f769de580a9e9badd71f072f6b898 100644 (file)
--- a/com.woltlab.wcf/templates/__dialogForm.tpl
+++ b/com.woltlab.wcf/templates/__dialogForm.tpl
@@ -13,7 +13,7 @@
        {assign var='__formEnd' value='</section>'}
 {/if}
 
-{@$__formStart} id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+{@$__formStart} id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
        {foreach from=$form item='child'}
                {if $child->isAvailable()}
                        {@$child->getHtml()}

diff --git a/com.woltlab.wcf/templates/__form.tpl b/com.woltlab.wcf/templates/__form.tpl
index 5f50ac22b6a2f089b12960cf077a3f366f43df0e..dff9c392ce01d4a65240cd6fb8e47101bc072530 100644 (file)
--- a/com.woltlab.wcf/templates/__form.tpl
+++ b/com.woltlab.wcf/templates/__form.tpl
@@ -5,7 +5,7 @@
        });
 </script>
 
-<form method="{@$form->getMethod()}" action="{@$form->getAction()}" id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+<form method="{@$form->getMethod()}" action="{@$form->getAction()}" id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
        {foreach from=$form item='child'}
                {if $child->isAvailable()}
                        {@$child->getHtml()}

diff --git a/com.woltlab.wcf/templates/__formFieldHeader.tpl b/com.woltlab.wcf/templates/__formFieldHeader.tpl
index cc3438f97c8d39b43e6724a06805e73509e89bfe..865a32195293cdf1785daeb1107eebccf314f1cf 100644 (file)
--- a/com.woltlab.wcf/templates/__formFieldHeader.tpl
+++ b/com.woltlab.wcf/templates/__formFieldHeader.tpl
@@ -1,3 +1,3 @@
-<dl id="{@$field->getPrefixedId()}Container" {if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$field->checkDependencies()} style="display: none;"{/if}>
        <dt><label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label></dt>
+<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}>
        <dd>

diff --git a/wcfsetup/install/files/acp/templates/__dialogForm.tpl b/wcfsetup/install/files/acp/templates/__dialogForm.tpl
index a9e70ba54e2301c99ecb2fcaadc27e0953be9354..d42513b72f7f769de580a9e9badd71f072f6b898 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__dialogForm.tpl
+++ b/wcfsetup/install/files/acp/templates/__dialogForm.tpl
@@ -13,7 +13,7 @@
        {assign var='__formEnd' value='</section>'}
 {/if}
 
-{@$__formStart} id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+{@$__formStart} id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
        {foreach from=$form item='child'}
                {if $child->isAvailable()}
                        {@$child->getHtml()}

diff --git a/wcfsetup/install/files/acp/templates/__form.tpl b/wcfsetup/install/files/acp/templates/__form.tpl
index 5f50ac22b6a2f089b12960cf077a3f366f43df0e..dff9c392ce01d4a65240cd6fb8e47101bc072530 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__form.tpl
+++ b/wcfsetup/install/files/acp/templates/__form.tpl
@@ -5,7 +5,7 @@
        });
 </script>
 
-<form method="{@$form->getMethod()}" action="{@$form->getAction()}" id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+<form method="{@$form->getMethod()}" action="{@$form->getAction()}" id="{@$form->getId()}"{if !$form->getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
        {foreach from=$form item='child'}
                {if $child->isAvailable()}
                        {@$child->getHtml()}

diff --git a/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl b/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl
index cc3438f97c8d39b43e6724a06805e73509e89bfe..865a32195293cdf1785daeb1107eebccf314f1cf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl
+++ b/wcfsetup/install/files/acp/templates/__formFieldHeader.tpl
@@ -1,3 +1,3 @@
-<dl id="{@$field->getPrefixedId()}Container" {if !$field->getClasses()|empty} class="{implode from=$field->getClasses() item='class'}{$class}{/implode}"{/if}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$field->checkDependencies()} style="display: none;"{/if}>
        <dt><label for="{@$field->getPrefixedId()}">{@$field->getLabel()}</label></dt>
+<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}>
        <dd>