Cleans up package

diff --git a/acptemplates/styleAdd.tpl b/acptemplates/styleAdd.tpl
index b4770b2874b8d2343e98e7f0343789bfaeda983a..d20b8d4f47d333e86b8f8220025a9a03c3557cbc 100644 (file)
--- a/acptemplates/styleAdd.tpl
+++ b/acptemplates/styleAdd.tpl
@@ -28,7 +28,7 @@
                
                {if $action == 'edit' && $__wcf->getSession()->getPermission('admin.style.canAddStyle')}
                        new WCF.ACP.Style.CopyStyle({@$style->styleID});
-               
+                       
                        WCF.Language.addObject({
                                'wcf.acp.style.copyStyle.confirmMessage': '{lang}wcf.acp.style.copyStyle.confirmMessage{/lang}'
                        });
@@ -62,7 +62,7 @@
        </nav>
 </div>
 
-<form method="post" action="{if $action == 'add'}{link controller='StyleAdd'}{/link}{else}{link controller='StyleEdit'}{/link}{/if}">
+<form method="post" action="{if $action == 'add'}{link controller='StyleAdd'}{/link}{else}{link controller='StyleEdit' id=$styleID}{/link}{/if}">
        <div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
                <nav class="tabMenu">
                        <ul>
@@ -487,7 +487,6 @@
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="tmpHash" value="{$tmpHash}" />
-               {if $styleID|isset}<input type="hidden" name="id" value="{@$styleID}" />{/if}
        </div>
 </form>
 

diff --git a/acptemplates/styleExport.tpl b/acptemplates/styleExport.tpl
index da0fa9f48dccbb906eadd44c3ea97f8ef5f767c0..ff60bd87a675c10980b5eb5056d6bafe1aa1f1e5 100644 (file)
--- a/acptemplates/styleExport.tpl
+++ b/acptemplates/styleExport.tpl
@@ -14,7 +14,7 @@
        </nav>
 </div>
 
-<form method="post" action="{link controller='StyleExport'}{/link}">
+<form method="post" action="{link controller='StyleExport' id=$styleID}{/link}">
        <div class="container containerPadding marginTop shadow">
                <fieldset>
                        <legend>{lang}wcf.acp.style.exportStyle.components{/lang}</legend>
@@ -69,7 +69,6 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.acp.style.button.exportStyle{/lang}" accesskey="s" />
-               <input type="hidden" name="id" value="{@$styleID}" />
        </div>
 </form>
 

diff --git a/acptemplates/styleList.tpl b/acptemplates/styleList.tpl
index 74a58acab4379a235a2348482286a72ac10f489e..bb6fd2f6ee82f61e712d1c5235b855354f8fa38c 100644 (file)
--- a/acptemplates/styleList.tpl
+++ b/acptemplates/styleList.tpl
@@ -26,7 +26,7 @@
                                        {if $__wcf->session->getPermission('admin.style.canAddStyle')}
                                                <li><a href="{link controller='StyleAdd'}{/link}" title="{lang}wcf.acp.menu.link.style.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
                                        {/if}
-
+                                       
                                        {event name='largeButtons'}
                                {/content}
                        </ul>
@@ -80,7 +80,7 @@
                                        {if $__wcf->session->getPermission('admin.style.canAddStyle')}
                                                <li><a href="{link controller='StyleAdd'}{/link}" title="{lang}wcf.acp.menu.link.style.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
                                        {/if}
-
+                                       
                                        {event name='largeButtons'}
                                {/content}
                        </ul>

diff --git a/files/lib/acp/form/StyleAddForm.class.php b/files/lib/acp/form/StyleAddForm.class.php
index e06834b151a819c7adc46d0c5d74f66fa145f8b1..2e8f366251d9f26d57efc489aa94b274bd9e5888 100644 (file)
--- a/files/lib/acp/form/StyleAddForm.class.php
+++ b/files/lib/acp/form/StyleAddForm.class.php
@@ -20,7 +20,7 @@ use wcf\util\StringUtil;
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    com.woltlab.wcf.acp.style
  * @subpackage acp.form
- * @category   Community Framework
+ * @category   Community Framework
  */
 class StyleAddForm extends ACPForm {
        /**

diff --git a/files/lib/acp/form/StyleEditForm.class.php b/files/lib/acp/form/StyleEditForm.class.php
index 6eac33af3f2905c7e32459941ed340909d9f707b..c77b5d7ba0f205a50fc44da748f28838076d52f6 100644 (file)
--- a/files/lib/acp/form/StyleEditForm.class.php
+++ b/files/lib/acp/form/StyleEditForm.class.php
@@ -14,7 +14,7 @@ use wcf\system\WCF;
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    com.woltlab.wcf.acp.style
  * @subpackage acp.form
- * @category   Community Framework
+ * @category   Community Framework
  */
 class StyleEditForm extends StyleAddForm {
        /**

diff --git a/files/lib/acp/form/StyleExportForm.class.php b/files/lib/acp/form/StyleExportForm.class.php
index 063d9ecdc3ff7b177b74a5edb5ed42820b772a5b..b036884556e2c581cafab9b73203fb37dd9cb9f1 100644 (file)
--- a/files/lib/acp/form/StyleExportForm.class.php
+++ b/files/lib/acp/form/StyleExportForm.class.php
@@ -3,7 +3,6 @@ namespace wcf\acp\form;
 use wcf\data\package\Package;
 use wcf\data\style\Style;
 use wcf\data\style\StyleEditor;
-use wcf\form\AbstractForm;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
@@ -17,9 +16,14 @@ use wcf\util\StringUtil;
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    com.woltlab.wcf.acp.style
  * @subpackage acp.form
- * @category   Community Framework
+ * @category   Community Framework
  */
-class StyleExportForm extends AbstractForm {
+class StyleExportForm extends ACPForm {
+       /**
+        * @see wcf\acp\form\ACPForm::$activeMenuItem
+        */
+       public $activeMenuItem = 'wcf.acp.menu.link.style';
+       
        /**
         * true, if style has custom icons
         * @var boolean

diff --git a/files/lib/acp/page/StyleListPage.class.php b/files/lib/acp/page/StyleListPage.class.php
index 052367ed7022783f0babe8a6ea6154ff88b24df8..31c8e912ede621d5acff95e4555db4d485f79b87 100644 (file)
--- a/files/lib/acp/page/StyleListPage.class.php
+++ b/files/lib/acp/page/StyleListPage.class.php
@@ -34,6 +34,9 @@ class StyleListPage extends MultipleLinkPage {
         */
        public $sortOrder = 'ASC';
        
+       /**
+        * @see wcf\page\MultipleLinkPage::initObjectList()
+        */
        public function initObjectList() {
                parent::initObjectList();
                

diff --git a/files/style/styleEditor.less b/files/style/styleEditor.less
index 4d4a97df9b170a208c2420e5cafb9acf07198e82..3bfd1decfb36b15094b6abb5de065f3a031cc523 100644 (file)
--- a/files/style/styleEditor.less
+++ b/files/style/styleEditor.less
@@ -16,7 +16,7 @@
                width: 200px;
        }
 }
-       
+
 .colorList {
        > li {
                float: left;