Uses AbstractPage::$activeMenuItem and removes use of ACPForm

diff --git a/files/lib/acp/form/StyleAddForm.class.php b/files/lib/acp/form/StyleAddForm.class.php
index b11f9f7f62aceca2f5f3e1fce287fbbdcd9ce8c4..ac003282276081d23af0c8ec427d7ce1cc917dcc 100644 (file)
--- a/files/lib/acp/form/StyleAddForm.class.php
+++ b/files/lib/acp/form/StyleAddForm.class.php
@@ -3,6 +3,7 @@ namespace wcf\acp\form;
 use wcf\data\package\Package;
 use wcf\data\style\StyleAction;
 use wcf\data\template\group\TemplateGroupList;
+use wcf\form\AbstractForm;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
@@ -22,9 +23,9 @@ use wcf\util\StringUtil;
  * @subpackage acp.form
  * @category   Community Framework
  */
-class StyleAddForm extends ACPForm {
+class StyleAddForm extends AbstractForm {
        /**
-        * @see wcf\acp\form\ACPForm::$activeMenuItem
+        * @see wcf\page\AbstractPage::$activeMenuItem
         */
        public $activeMenuItem = 'wcf.acp.menu.link.style.add';
        

diff --git a/files/lib/acp/form/StyleEditForm.class.php b/files/lib/acp/form/StyleEditForm.class.php
index b896a2499dda1584bc1e79338be3e705df454912..e3cd72ad8b95b88bfbb60468d1d15871024e1f42 100644 (file)
--- a/files/lib/acp/form/StyleEditForm.class.php
+++ b/files/lib/acp/form/StyleEditForm.class.php
@@ -18,7 +18,7 @@ use wcf\system\WCF;
  */
 class StyleEditForm extends StyleAddForm {
        /**
-        * @see wcf\acp\form\ACPForm::$activeMenuItem
+        * @see wcf\page\AbstractPage::$activeMenuItem
         */
        public $activeMenuItem = 'wcf.acp.menu.link.style';
        

diff --git a/files/lib/acp/form/StyleExportForm.class.php b/files/lib/acp/form/StyleExportForm.class.php
index b036884556e2c581cafab9b73203fb37dd9cb9f1..8dbee480913f411f0afac8fc794fff355c690d40 100644 (file)
--- a/files/lib/acp/form/StyleExportForm.class.php
+++ b/files/lib/acp/form/StyleExportForm.class.php
@@ -3,6 +3,7 @@ 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;
@@ -18,9 +19,9 @@ use wcf\util\StringUtil;
  * @subpackage acp.form
  * @category   Community Framework
  */
-class StyleExportForm extends ACPForm {
+class StyleExportForm extends AbstractForm {
        /**
-        * @see wcf\acp\form\ACPForm::$activeMenuItem
+        * @see wcf\page\AbstractPage::$activeMenuItem
         */
        public $activeMenuItem = 'wcf.acp.menu.link.style';
        

diff --git a/files/lib/acp/form/StyleImportForm.class.php b/files/lib/acp/form/StyleImportForm.class.php
index c8b305c9f83d2cc18d43e03e75ad6b30fcaa893e..2c9ce895520d8b0a5475161acbab046cc97c6d2d 100644 (file)
--- a/files/lib/acp/form/StyleImportForm.class.php
+++ b/files/lib/acp/form/StyleImportForm.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\form;
 use wcf\data\style\StyleEditor;
+use wcf\form\AbstractForm;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
@@ -15,9 +16,9 @@ use wcf\util\FileUtil;
  * @subpackage acp.form
  * @category   Community Framework
  */
-class StyleImportForm extends ACPForm {
+class StyleImportForm extends AbstractForm {
        /**
-        * @see wcf\acp\form\ACPForm::$activeMenuItem
+        * @see wcf\page\AbstractPage::$activeMenuItem
         */
        public $activeMenuItem = 'wcf.acp.menu.link.style.import';
        

diff --git a/files/lib/acp/page/StyleListPage.class.php b/files/lib/acp/page/StyleListPage.class.php
index 938fb76501beb5750c2b5aa51802c3ccbedc6414..e83d9f0f6e33c28477144e6b9716f9c1e61a6a13 100644 (file)
--- a/files/lib/acp/page/StyleListPage.class.php
+++ b/files/lib/acp/page/StyleListPage.class.php
@@ -1,7 +1,6 @@
 <?php
 namespace wcf\acp\page;
 use wcf\page\MultipleLinkPage;
-use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows the style list page.
@@ -14,6 +13,11 @@ use wcf\system\menu\acp\ACPMenu;
  * @category   Community Framework
  */
 class StyleListPage extends MultipleLinkPage {
+       /**
+        * @see wcf\page\AbstractPage::$activeMenuItem
+        */
+       public $activeMenuItem = 'wcf.acp.menu.link.style.list';
+       
        /**
         * @see wcf\page\AbstractPage::$neededPermissions
         */
@@ -42,14 +46,4 @@ class StyleListPage extends MultipleLinkPage {
                
                $this->objectList->sqlSelects = "(SELECT COUNT(*) FROM wcf".WCF_N."_user WHERE styleID = style.styleID) AS users";
        }
-       
-       /**
-        * @see wcf\page\IPage::show()
-        */
-       public function show() {
-               // set active menu item.
-               ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.style.list');
-       
-               parent::show();
-       }
 }