Renamed PackageListDetailed -> PackageList
authorAlexander Ebert <ebert@woltlab.com>
Tue, 1 Jan 2013 21:05:50 +0000 (22:05 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 1 Jan 2013 21:05:50 +0000 (22:05 +0100)
wcfsetup/install/files/acp/templates/packageList.tpl [new file with mode: 0644]
wcfsetup/install/files/acp/templates/packageListDetailed.tpl [deleted file]
wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php [deleted file]
wcfsetup/install/files/lib/acp/page/PackageListPage.class.php [new file with mode: 0644]

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
new file mode 100644 (file)
index 0000000..75dd190
--- /dev/null
@@ -0,0 +1,122 @@
+{include file='header' pageTitle='wcf.acp.package.list'}
+
+<script type="text/javascript">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.add('wcf.acp.package.view.button.uninstall.sure', '{lang}wcf.acp.package.view.button.uninstall.sure{/lang}');
+               
+               new WCF.ACP.Package.Uninstallation($('.jsPackageRow .jsUninstallButton'));
+       });
+       //]]>
+</script>
+
+<header class="boxHeadline">
+       <hgroup>
+               <h1>{lang}wcf.acp.package.list{/lang}</h1>
+       </hgroup>
+</header>
+
+<div class="contentNavigation">
+       {pages print=true assign=pagesLinks controller='PackageList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       
+       {hascontent}
+               <nav>
+                       <ul>
+                               {content}
+                                       {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}
+                                               <li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
+                                       {/if}
+                                       
+                                       {event name='largeButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
+</div>
+
+{if $objects|count > 0}
+       <div class="tabularBox tabularBoxTitle marginTop">
+               <hgroup>
+                       <h1>{lang}wcf.acp.package.list{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.package.list.count{/lang}">{#$items}</span></h1>
+               </hgroup>
+               
+               <table class="table">
+                       <thead>
+                               <tr>
+                                       <th colspan="2" class="columnID{if $sortField == 'packageID'} active{/if}"><a href="{link controller='PackageList'}pageNo={@$pageNo}&sortField=packageID&sortOrder={if $sortField == 'packageID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}{if $sortField == 'packageID'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th colspan="2" class="columnTitle{if $sortField == 'packageName'} active{/if}"><a href="{link controller='PackageList'}pageNo={@$pageNo}&sortField=packageName&sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.package.name{/lang}{if $sortField == 'packageName'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText{if $sortField == 'author'} active{/if}"><a href="{link controller='PackageList'}pageNo={@$pageNo}&sortField=author&sortOrder={if $sortField == 'author' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.package.author{/lang}{if $sortField == 'author'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText">{lang}wcf.acp.package.version{/lang}</th>
+                                       <th class="columnDate{if $sortField == 'updateDate'} active{/if}"><a href="{link controller='PackageList'}pageNo={@$pageNo}&sortField=updateDate&sortOrder={if $sortField == 'updateDate' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       
+                                       {event name='headColumns'}
+                               </tr>
+                       </thead>
+                       
+                       <tbody>
+                               {foreach from=$objects item=$package}
+                                       <tr class="jsPackageRow">
+                                               <td class="columnIcon">
+                                                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
+                                                               <a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}"><img src="{@$__wcf->getPath()}icon/update.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="icon16 jsTooltip" /></a>
+                                                       {else}
+                                                               <img src="{@$__wcf->getPath()}icon/update.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="icon16 disabled" />
+                                                       {/if}
+                                                       {if $package->canUninstall()}
+                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="icon16 jsUninstallButton jsTooltip" data-object-id="{@$package->packageID}" data-confirm-message="{lang}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" />
+                                                       {else}
+                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="icon16 disabled" />
+                                                       {/if}
+                                                       
+                                                       {event name='buttons'}
+                                               </td>
+                                               <td class="columnID"><p>{@$package->packageID}</p></td>
+                                               <td class="columnIcon">
+                                                       {if $package->isApplication}
+                                                               <img src="{@$__wcf->getPath()}icon/window.svg" alt="" title="{lang}wcf.acp.package.type.application{/lang}" class="icon16 jsTooltip" />
+                                                       {else}
+                                                               <img src="{@$__wcf->getPath()}icon/plugin.svg" alt="" title="{lang}wcf.acp.package.type.plugin{/lang}" class="icon16 jsTooltip" />
+                                                       {/if}
+                                               </td>
+                                               <td id="packageName{@$package->packageID}" class="columnTitle" title="{$package->packageDescription|language}">
+                                                       <a href="{link controller='Package' id=$package->packageID}{/link}"><span>{$package}</span></a>
+                                               </td>
+                                               <td class="columnText"><p>{if $package->authorURL}<a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="wcf-externalURL">{$package->author}</a>{else}{$package->author}{/if}</p></td>
+                                               <td class="columnText"><p>{$package->packageVersion}</p></td>
+                                               <td class="columnDate"><p>{@$package->updateDate|time}</p></td>
+                                               
+                                               {event name='columns'}
+                                       </tr>
+                               {/foreach}
+                       </tbody>
+               </table>
+               
+       </div>
+{/if}
+
+<div class="contentNavigation">
+       {@$pagesLinks}
+       
+       {hascontent}
+               <script type="text/javascript">
+                       //<![CDATA[
+                       $(function() {
+                               new WCF.ACP.Package.Uninstallation($('.jsPluginContainer .jsUninstallButton'));
+                       });
+                       //]]>
+               </script>
+               <nav>
+                       <ul>
+                               {content}
+                                       {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}
+                                               <li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
+                                       {/if}
+                                       
+                                       {event name='largeButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
+</div>
+
+{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
deleted file mode 100644 (file)
index 91f7abf..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-{include file='header' pageTitle='wcf.acp.package.list'}
-
-<script type="text/javascript">
-       //<![CDATA[
-       $(function() {
-               WCF.Language.add('wcf.acp.package.view.button.uninstall.sure', '{lang}wcf.acp.package.view.button.uninstall.sure{/lang}');
-               
-               new WCF.ACP.Package.Uninstallation($('.jsPackageRow .jsUninstallButton'));
-       });
-       //]]>
-</script>
-
-<header class="boxHeadline">
-       <hgroup>
-               <h1>{lang}wcf.acp.package.list{/lang}</h1>
-       </hgroup>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller='PackageListDetailed' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
-       
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}
-                                               <li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
-                                       {/if}
-                                       
-                                       {event name='largeButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
-{if $objects|count > 0}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <hgroup>
-                       <h1>{lang}wcf.acp.package.list{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.package.list.count{/lang}">{#$items}</span></h1>
-               </hgroup>
-               
-               <table class="table">
-                       <thead>
-                               <tr>
-                                       <th colspan="2" class="columnID{if $sortField == 'packageID'} active{/if}"><a href="{link controller='PackageListDetailed'}pageNo={@$pageNo}&sortField=packageID&sortOrder={if $sortField == 'packageID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}{if $sortField == 'packageID'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th colspan="2" class="columnTitle{if $sortField == 'packageName'} active{/if}"><a href="{link controller='PackageListDetailed'}pageNo={@$pageNo}&sortField=packageName&sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.package.name{/lang}{if $sortField == 'packageName'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnText{if $sortField == 'author'} active{/if}"><a href="{link controller='PackageListDetailed'}pageNo={@$pageNo}&sortField=author&sortOrder={if $sortField == 'author' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.package.author{/lang}{if $sortField == 'author'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnText">{lang}wcf.acp.package.version{/lang}</th>
-                                       <th class="columnDate{if $sortField == 'updateDate'} active{/if}"><a href="{link controller='PackageListDetailed'}pageNo={@$pageNo}&sortField=updateDate&sortOrder={if $sortField == 'updateDate' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       
-                                       {event name='headColumns'}
-                               </tr>
-                       </thead>
-                       
-                       <tbody>
-                               {foreach from=$objects item=$package}
-                                       <tr class="jsPackageRow">
-                                               <td class="columnIcon">
-                                                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-                                                               <a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}"><img src="{@$__wcf->getPath()}icon/update.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="icon16 jsTooltip" /></a>
-                                                       {else}
-                                                               <img src="{@$__wcf->getPath()}icon/update.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="icon16 disabled" />
-                                                       {/if}
-                                                       {if $package->canUninstall()}
-                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="icon16 jsUninstallButton jsTooltip" data-object-id="{@$package->packageID}" data-confirm-message="{lang}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" />
-                                                       {else}
-                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="icon16 disabled" />
-                                                       {/if}
-                                                       
-                                                       {event name='buttons'}
-                                               </td>
-                                               <td class="columnID"><p>{@$package->packageID}</p></td>
-                                               <td class="columnIcon">
-                                                       {if $package->isApplication}
-                                                               <img src="{@$__wcf->getPath()}icon/window.svg" alt="" title="{lang}wcf.acp.package.type.application{/lang}" class="icon16 jsTooltip" />
-                                                       {else}
-                                                               <img src="{@$__wcf->getPath()}icon/plugin.svg" alt="" title="{lang}wcf.acp.package.type.plugin{/lang}" class="icon16 jsTooltip" />
-                                                       {/if}
-                                               </td>
-                                               <td id="packageName{@$package->packageID}" class="columnTitle" title="{$package->packageDescription|language}">
-                                                       <a href="{link controller='Package' id=$package->packageID}{/link}"><span>{$package}</span></a>
-                                               </td>
-                                               <td class="columnText"><p>{if $package->authorURL}<a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="wcf-externalURL">{$package->author}</a>{else}{$package->author}{/if}</p></td>
-                                               <td class="columnText"><p>{$package->packageVersion}</p></td>
-                                               <td class="columnDate"><p>{@$package->updateDate|time}</p></td>
-                                               
-                                               {event name='columns'}
-                                       </tr>
-                               {/foreach}
-                       </tbody>
-               </table>
-               
-       </div>
-{/if}
-
-<div class="contentNavigation">
-       {@$pagesLinks}
-       
-       {hascontent}
-               <script type="text/javascript">
-                       //<![CDATA[
-                       $(function() {
-                               new WCF.ACP.Package.Uninstallation($('.jsPluginContainer .jsUninstallButton'));
-                       });
-                       //]]>
-               </script>
-               <nav>
-                       <ul>
-                               {content}
-                                       {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}
-                                               <li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
-                                       {/if}
-                                       
-                                       {event name='largeButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
-{include file='footer'}
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php
deleted file mode 100644 (file)
index 8b27d61..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-namespace wcf\acp\page;
-use wcf\page\SortablePage;
-
-/**
- * Shows a list of all installed packages.
- * 
- * @author     Marcel Werk
- * @copyright  2001-2012 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage acp.page
- * @category   Community Framework
- */
-class PackageListDetailedPage extends SortablePage {
-       /**
-        * @see wcf\page\AbstractPage::$activeMenuItem
-        */
-       public $activeMenuItem = 'wcf.acp.menu.link.package.list';
-       
-       /**
-        * @see wcf\page\AbstractPage::$neededPermissions
-        */
-       public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canUninstallPackage');
-       
-       /**
-        * @see wcf\page\MultipleLinkPage::$itemsPerPage
-        */
-       public $itemsPerPage = 50;
-       
-       /**
-        * @see wcf\page\SortablePage::$defaultSortField
-        */
-       public $defaultSortField = 'packageType';
-       
-       /**
-        * @see wcf\page\SortablePage::$defaultSortOrder
-        */
-       public $defaultSortOrder = 'DESC';
-       
-       /**
-        * @see wcf\page\SortablePage::$validSortFields
-        */
-       public $validSortFields = array('packageID', 'package', 'packageDir', 'packageName', 'packageDescription', 'packageDate', 'packageURL', 'isApplication', 'author', 'authorURL', 'installDate', 'updateDate');
-       
-       /**
-        * @see wcf\page\MultipleLinkPage::$objectListClassName
-        */
-       public $objectListClassName = 'wcf\data\package\PackageList';
-       
-       /**
-        * @see wcf\page\MultipleLinkPage::readObjects()
-        */
-       protected function readObjects() {
-               $this->sqlOrderBy = 'package.'.($this->sortField == 'packageType' ? 'isApplication '.$this->sortOrder : $this->sortField.' '.$this->sortOrder).($this->sortField != 'packageName' ? ', package.packageName ASC' : '');
-               
-               parent::readObjects();
-       }
-}
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
new file mode 100644 (file)
index 0000000..a381e1f
--- /dev/null
@@ -0,0 +1,59 @@
+<?php
+namespace wcf\acp\page;
+use wcf\page\SortablePage;
+
+/**
+ * Shows a list of all installed packages.
+ * 
+ * @author     Marcel Werk
+ * @copyright  2001-2013 WoltLab GmbH
+ * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package    com.woltlab.wcf
+ * @subpackage acp.page
+ * @category   Community Framework
+ */
+class PackageListPage extends SortablePage {
+       /**
+        * @see wcf\page\AbstractPage::$activeMenuItem
+        */
+       public $activeMenuItem = 'wcf.acp.menu.link.package.list';
+       
+       /**
+        * @see wcf\page\AbstractPage::$neededPermissions
+        */
+       public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canUninstallPackage');
+       
+       /**
+        * @see wcf\page\MultipleLinkPage::$itemsPerPage
+        */
+       public $itemsPerPage = 50;
+       
+       /**
+        * @see wcf\page\SortablePage::$defaultSortField
+        */
+       public $defaultSortField = 'packageType';
+       
+       /**
+        * @see wcf\page\SortablePage::$defaultSortOrder
+        */
+       public $defaultSortOrder = 'DESC';
+       
+       /**
+        * @see wcf\page\SortablePage::$validSortFields
+        */
+       public $validSortFields = array('packageID', 'package', 'packageDir', 'packageName', 'packageDescription', 'packageDate', 'packageURL', 'isApplication', 'author', 'authorURL', 'installDate', 'updateDate');
+       
+       /**
+        * @see wcf\page\MultipleLinkPage::$objectListClassName
+        */
+       public $objectListClassName = 'wcf\data\package\PackageList';
+       
+       /**
+        * @see wcf\page\MultipleLinkPage::readObjects()
+        */
+       protected function readObjects() {
+               $this->sqlOrderBy = 'package.'.($this->sortField == 'packageType' ? 'isApplication '.$this->sortOrder : $this->sortField.' '.$this->sortOrder).($this->sortField != 'packageName' ? ', package.packageName ASC' : '');
+               
+               parent::readObjects();
+       }
+}