From aa223bd70e8ab6a52c84bdd813b959c1bd2e79ac Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 24 Feb 2019 14:36:18 +0100
Subject: [PATCH] Set form container classes via PHP API

This way, the default classes can also be removed again

See #2509
---
 com.woltlab.wcf/templates/__formContainer.tpl         |  6 +++++-
 com.woltlab.wcf/templates/__tabFormContainer.tpl      |  6 +++++-
 com.woltlab.wcf/templates/__tabMenuFormContainer.tpl  |  6 +++++-
 .../templates/__tabTabMenuFormContainer.tpl           |  5 ++++-
 .../install/files/acp/templates/__formContainer.tpl   |  6 +++++-
 .../files/acp/templates/__tabFormContainer.tpl        |  6 +++++-
 .../files/acp/templates/__tabMenuFormContainer.tpl    |  6 +++++-
 .../files/acp/templates/__tabTabMenuFormContainer.tpl |  5 ++++-
 .../form/builder/container/FormContainer.class.php    |  7 +++++++
 .../form/builder/container/TabFormContainer.class.php |  7 +++++++
 .../builder/container/TabMenuFormContainer.class.php  |  8 ++++++++
 .../container/TabTabMenuFormContainer.class.php       | 11 +++++++++--
 12 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/com.woltlab.wcf/templates/__formContainer.tpl b/com.woltlab.wcf/templates/__formContainer.tpl
index 9a1a0bee22..1bc1bbc956 100644
--- a/com.woltlab.wcf/templates/__formContainer.tpl
+++ b/com.woltlab.wcf/templates/__formContainer.tpl
@@ -1,4 +1,8 @@
-<section id="{@$container->getPrefixedId()}Container" class="section{foreach from=$container->getClasses() item='class'} {$class}{/foreach}"{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$container->checkDependencies()} style="display: none;"{/if}>
+<section id="{@$container->getPrefixedId()}Container"{*
+	*}{if !$container->getClasses()|empty}class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}" {/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+	*}{if !$container->checkDependencies()} style="display: none;"{/if}{*
+*}>
 	{if $container->getLabel() !== null}
 		{if $container->getDescription() !== null}
 			<header class="sectionHeader">
diff --git a/com.woltlab.wcf/templates/__tabFormContainer.tpl b/com.woltlab.wcf/templates/__tabFormContainer.tpl
index 179eadff14..b7e12b038f 100644
--- a/com.woltlab.wcf/templates/__tabFormContainer.tpl
+++ b/com.woltlab.wcf/templates/__tabFormContainer.tpl
@@ -1,4 +1,8 @@
-<div id="{@$container->getPrefixedId()}Container" class="tabMenuContent{foreach from=$container->getClasses() item='class'} {$class}{/foreach}"{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$container->checkDependencies()} style="display: none;"{/if}>
+<div id="{@$container->getPrefixedId()}Container"{*
+	*}{if !$container->getClasses()|empty}class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}" {/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+	*}{if !$container->checkDependencies()} style="display: none;"{/if}{*
+*}>
 	{include file='__formContainerChildren'}
 </div>
 
diff --git a/com.woltlab.wcf/templates/__tabMenuFormContainer.tpl b/com.woltlab.wcf/templates/__tabMenuFormContainer.tpl
index f8f3e15b80..8b349ccee5 100644
--- a/com.woltlab.wcf/templates/__tabMenuFormContainer.tpl
+++ b/com.woltlab.wcf/templates/__tabMenuFormContainer.tpl
@@ -1,4 +1,8 @@
-<div id="{@$container->getPrefixedId()}Container" class="section tabMenuContainer{foreach from=$container->getClasses() item='class'} {$class}{/foreach}"{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$container->checkDependencies()} style="display: none;"{/if}{if !$container->checkDependencies()} style="display: none;"{/if}>
+<div id="{@$container->getPrefixedId()}Container" {*
+	*}{if !$container->getClasses()|empty}class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}" {/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+	*}{if !$container->checkDependencies()} style="display: none;"{/if}{*
+*}>
 	<nav class="tabMenu">
 		<ul>
 			{foreach from=$container item='child'}
diff --git a/com.woltlab.wcf/templates/__tabTabMenuFormContainer.tpl b/com.woltlab.wcf/templates/__tabTabMenuFormContainer.tpl
index a181463413..2db5b317be 100644
--- a/com.woltlab.wcf/templates/__tabTabMenuFormContainer.tpl
+++ b/com.woltlab.wcf/templates/__tabTabMenuFormContainer.tpl
@@ -1,4 +1,7 @@
-<div id="{@$container->getPrefixedId()}Container" class="tabMenuContainer tabMenuContent{foreach from=$container->getClasses() item='class'} {$class}{/foreach}"{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+<div id="{@$container->getPrefixedId()}Container" {*
+	*}{if !$container->getClasses()|empty}class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}" {/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+*}>
 	<nav class="menu">
 		<ul>
 			{foreach from=$container item='child'}
diff --git a/wcfsetup/install/files/acp/templates/__formContainer.tpl b/wcfsetup/install/files/acp/templates/__formContainer.tpl
index 9a1a0bee22..1bc1bbc956 100644
--- a/wcfsetup/install/files/acp/templates/__formContainer.tpl
+++ b/wcfsetup/install/files/acp/templates/__formContainer.tpl
@@ -1,4 +1,8 @@
-<section id="{@$container->getPrefixedId()}Container" class="section{foreach from=$container->getClasses() item='class'} {$class}{/foreach}"{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$container->checkDependencies()} style="display: none;"{/if}>
+<section id="{@$container->getPrefixedId()}Container"{*
+	*}{if !$container->getClasses()|empty}class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}" {/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+	*}{if !$container->checkDependencies()} style="display: none;"{/if}{*
+*}>
 	{if $container->getLabel() !== null}
 		{if $container->getDescription() !== null}
 			<header class="sectionHeader">
diff --git a/wcfsetup/install/files/acp/templates/__tabFormContainer.tpl b/wcfsetup/install/files/acp/templates/__tabFormContainer.tpl
index 179eadff14..b7e12b038f 100644
--- a/wcfsetup/install/files/acp/templates/__tabFormContainer.tpl
+++ b/wcfsetup/install/files/acp/templates/__tabFormContainer.tpl
@@ -1,4 +1,8 @@
-<div id="{@$container->getPrefixedId()}Container" class="tabMenuContent{foreach from=$container->getClasses() item='class'} {$class}{/foreach}"{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$container->checkDependencies()} style="display: none;"{/if}>
+<div id="{@$container->getPrefixedId()}Container"{*
+	*}{if !$container->getClasses()|empty}class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}" {/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+	*}{if !$container->checkDependencies()} style="display: none;"{/if}{*
+*}>
 	{include file='__formContainerChildren'}
 </div>
 
diff --git a/wcfsetup/install/files/acp/templates/__tabMenuFormContainer.tpl b/wcfsetup/install/files/acp/templates/__tabMenuFormContainer.tpl
index f8f3e15b80..8b349ccee5 100644
--- a/wcfsetup/install/files/acp/templates/__tabMenuFormContainer.tpl
+++ b/wcfsetup/install/files/acp/templates/__tabMenuFormContainer.tpl
@@ -1,4 +1,8 @@
-<div id="{@$container->getPrefixedId()}Container" class="section tabMenuContainer{foreach from=$container->getClasses() item='class'} {$class}{/foreach}"{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{if !$container->checkDependencies()} style="display: none;"{/if}{if !$container->checkDependencies()} style="display: none;"{/if}>
+<div id="{@$container->getPrefixedId()}Container" {*
+	*}{if !$container->getClasses()|empty}class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}" {/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+	*}{if !$container->checkDependencies()} style="display: none;"{/if}{*
+*}>
 	<nav class="tabMenu">
 		<ul>
 			{foreach from=$container item='child'}
diff --git a/wcfsetup/install/files/acp/templates/__tabTabMenuFormContainer.tpl b/wcfsetup/install/files/acp/templates/__tabTabMenuFormContainer.tpl
index a181463413..2db5b317be 100644
--- a/wcfsetup/install/files/acp/templates/__tabTabMenuFormContainer.tpl
+++ b/wcfsetup/install/files/acp/templates/__tabTabMenuFormContainer.tpl
@@ -1,4 +1,7 @@
-<div id="{@$container->getPrefixedId()}Container" class="tabMenuContainer tabMenuContent{foreach from=$container->getClasses() item='class'} {$class}{/foreach}"{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}>
+<div id="{@$container->getPrefixedId()}Container" {*
+	*}{if !$container->getClasses()|empty}class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}" {/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+*}>
 	<nav class="menu">
 		<ul>
 			{foreach from=$container item='child'}
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/FormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/FormContainer.class.php
index ae9d6d2283..35fd43f87a 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/FormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/FormContainer.class.php
@@ -31,6 +31,13 @@ class FormContainer implements IFormContainer {
 	 */
 	protected $templateName = '__formContainer';
 	
+	/**
+	 * @inheritDoc
+	 */
+	public function __construct() {
+		$this->addClass('section');
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/TabFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/TabFormContainer.class.php
index 484440acfe..93c0a680d9 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/TabFormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/TabFormContainer.class.php
@@ -15,4 +15,11 @@ class TabFormContainer extends FormContainer implements ITabFormContainer {
 	 * @inheritDoc
 	 */
 	protected $templateName = '__tabFormContainer';
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function __construct() {
+		$this->addClass('tabMenuContent');
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/TabMenuFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/TabMenuFormContainer.class.php
index 6e46617706..29d506fbe4 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/TabMenuFormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/TabMenuFormContainer.class.php
@@ -15,4 +15,12 @@ class TabMenuFormContainer extends FormContainer implements ITabMenuFormContaine
 	 * @inheritDoc
 	 */
 	protected $templateName = '__tabMenuFormContainer';
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function __construct() {
+		$this->addClass('section')
+			->addClass('tabMenuContainer');
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/TabTabMenuFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/TabTabMenuFormContainer.class.php
index 763afdddb5..bde3e0ec5d 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/TabTabMenuFormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/TabTabMenuFormContainer.class.php
@@ -10,9 +10,16 @@ namespace wcf\system\form\builder\container;
  * @package	WoltLabSuite\Core\System\Form\Builder\Container
  * @since	5.2
  */
-class TabTabMenuFormContainer extends FormContainer implements ITabFormContainer, ITabMenuFormContainer {
+class TabTabMenuFormContainer extends TabMenuFormContainer implements ITabFormContainer {
 	/**
 	 * @inheritDoc
 	 */
-	protected $templateName = '__formTabTabMenuContainer';
+	protected $templateName = '__tabTabMenuFormContainer';
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function __construct() {
+		$this->addClass('tabMenuContainer')->addClass('tabMenuContent');
+	}
 }
-- 
2.20.1