projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d360ec8)
Small optimizations
authorMarcel Werk <burntime@woltlab.com>
Fri, 17 May 2013 16:17:57 +0000 (18:17 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 17 May 2013 16:17:57 +0000 (18:17 +0200)
wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php patch | blob | blame | history
wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php patch | blob | blame | history
wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php patch | blob | blame | history
wcfsetup/install/lang/de.xml patch | blob | blame | history
wcfsetup/install/lang/en.xml patch | blob | blame | history

diff --git a/wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php b/wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php
index bda265a0aefeadb6aded18a0bf280c2d48a207f4..32d74185d107ad03eae8b5b14f9ade1bf38021d5 100644 (file)
--- a/wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php
@@ -37,19 +37,15 @@ class MultipleSelectionFormElementContainer extends SelectionFormElementContaine
                }
                
                return <<<HTML
-<dl>
-       <dt><label>{$this->getLabel()}</label></dt>
-       <dd>
-               <fieldset>
-                       <legend>{$this->getLabel()}</legend>
-                       
-                       <div>
-                               {$content}
-                       </div>
-               </fieldset>
-               <small>{$this->getDescription()}</small>
-       </dd>
-</dl>
+<fieldset>
+       <legend>{$this->getLabel()}</legend>
+       
+       <small>{$this->getDescription()}</small>
+       
+       <dl>
+               <dd>{$content}</dd>
+       </dl>
+</fieldset>
 HTML;
        }
 }
diff --git a/wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php b/wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php
index c8e690cc4d3a39d2088f74e7050e12e4076acd64..8e9e0c8016642aaf1081f4b5423858720e6eac5a 100644 (file)
--- a/wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php
@@ -47,20 +47,15 @@ class SingleSelectionFormElementContainer extends SelectionFormElementContainer
                }
                
                return <<<HTML
-<dl>
-       <dt><label>{$this->getLabel()}</label></dt>
-       <dd>
-               <fieldset>
-                       <legend>{$this->getLabel()}</legend>
-                       
-                       <div>
-                               {$content}
-                       </div>
-               </fieldset>
-       </dd>
+<fieldset>
+       <legend>{$this->getLabel()}</legend>
+       
        <small>{$this->getDescription()}</small>
-       </div>
-</dl>
+       
+       <dl>
+               <dd>{$content}</dd>
+       </dl>
+</fieldset>
 HTML;
        }
 }
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index 05b801f4adf30215676ffb3ce8936eec878ce2f7..cbe79730112845d492c3b89bc7b8c4e52d283d7a 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -647,6 +647,8 @@ class PackageInstallationDispatcher {
                if (!PackageInstallationFormManager::findForm($this->queue, 'optionalPackages')) {
                        $container = new MultipleSelectionFormElementContainer();
                        $container->setName('optionalPackages');
+                       $container->setLabel(WCF::getLanguage()->get('wcf.acp.package.optionalPackages'));
+                       $container->setDescription(WCF::getLanguage()->get('wcf.acp.package.optionalPackages.description'));
                        
                        foreach ($packages as $package) {
                                $optionalPackage = new MultipleSelectionFormElement($container);
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 6a57bf08534d712382bea8e533ca52ce6a4e5814..e8f9dd5e2f5ae3557cdbe91b89ed71aa5161c1d2 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -532,6 +532,8 @@
                <item name="wcf.acp.package.version"><![CDATA[Version]]></item>
                <item name="wcf.acp.package.packageDir.input"><![CDATA[Installationsverzeichnis]]></item>
                <item name="wcf.acp.package.upload"><![CDATA[Paket hochladen]]></item>
+               <item name="wcf.acp.package.optionalPackages"><![CDATA[Optionale Pakete]]></item>
+               <item name="wcf.acp.package.optionalPackages.description"><![CDATA[Es stehen folgende optionale Pakete zur Auswahl:]]></item>
        </category>
        
        <category name="wcf.acp.pageMenu">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 2fc16097fa2e122c59187496296b924fa346dcde..6f19a327910488abd110c42d0ed0c9fe5293ce50 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -532,6 +532,8 @@
                <item name="wcf.acp.package.version"><![CDATA[Version]]></item>
                <item name="wcf.acp.package.packageDir.input"><![CDATA[Installation Directory]]></item>
                <item name="wcf.acp.package.upload"><![CDATA[TODO: Paket hochladen]]></item>
+               <item name="wcf.acp.package.optionalPackages"><![CDATA[TODO: Optionale Pakete]]></item>
+               <item name="wcf.acp.package.optionalPackages.description"><![CDATA[TODO: Es stehen folgende optionale Pakete zur Auswahl:]]></item>
        </category>
        
        <category name="wcf.acp.pageMenu">
WoltLab Suite Core (previously WoltLab Community Framework)