From 8d8c8d6fdcfea9deb5ac4bb213052e5f955ac4a2 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Thu, 13 Oct 2011 19:08:17 +0200 Subject: [PATCH] Revert "Renamed templates and classes" This reverts commit 0892d9e28c5d25f939f408d2ba4e146c0944719f. --- ...istDetailed.tpl => detailedPackageList.tpl} | 18 +++++++++--------- .../files/acp/templates/packageList.tpl | 4 ++-- .../files/acp/templates/packageListPlugins.tpl | 2 +- ...nstallation.tpl => packageStartInstall.tpl} | 18 +++++++++--------- .../packageUninstallationDependencies.tpl | 2 +- .../files/acp/templates/packageView.tpl | 6 +++--- ...s.php => PackageStartInstallForm.class.php} | 2 +- ...s.php => DetailedPackageListPage.class.php} | 2 +- .../system/package/PackageArchive.class.php | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) rename wcfsetup/install/files/acp/templates/{packageListDetailed.tpl => detailedPackageList.tpl} (84%) rename wcfsetup/install/files/acp/templates/{packageInstallation.tpl => packageStartInstall.tpl} (76%) rename wcfsetup/install/files/lib/acp/form/{PackageInstallationForm.class.php => PackageStartInstallForm.class.php} (99%) rename wcfsetup/install/files/lib/acp/page/{PackageListDetailedPage.class.php => DetailedPackageListPage.class.php} (97%) diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/detailedPackageList.tpl similarity index 84% rename from wcfsetup/install/files/acp/templates/packageListDetailed.tpl rename to wcfsetup/install/files/acp/templates/detailedPackageList.tpl index 36672ca0f4..74c99dcac1 100644 --- a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl +++ b/wcfsetup/install/files/acp/templates/detailedPackageList.tpl @@ -18,12 +18,12 @@
- {pages print=true assign=pagesLinks controller='PackageListDetailed' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"} + {pages print=true assign=pagesLinks controller='DetailedPackageList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"} {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset} @@ -39,11 +39,11 @@ - - - - - + + + + + {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} @@ -54,7 +54,7 @@
{lang}wcf.acp.package.list.id{/lang}{if $sortField == 'packageID'} {/if}{lang}wcf.acp.package.list.name{/lang}{if $sortField == 'packageName'} {/if}{lang}wcf.acp.package.list.author{/lang}{if $sortField == 'author'} {/if}{lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} {/if}{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} {/if}{lang}wcf.acp.package.list.id{/lang}{if $sortField == 'packageID'} {/if}{lang}wcf.acp.package.list.name{/lang}{if $sortField == 'packageName'} {/if}{lang}wcf.acp.package.list.author{/lang}{if $sortField == 'author'} {/if}{lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} {/if}{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} {/if}
{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} {/if} @@ -98,7 +98,7 @@ {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset} diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index 9cfe50a308..489887f456 100644 --- a/wcfsetup/install/files/acp/templates/packageList.tpl +++ b/wcfsetup/install/files/acp/templates/packageList.tpl @@ -72,7 +72,7 @@ @@ -102,7 +102,7 @@
diff --git a/wcfsetup/install/files/acp/templates/packageListPlugins.tpl b/wcfsetup/install/files/acp/templates/packageListPlugins.tpl index 380537306b..986926054a 100644 --- a/wcfsetup/install/files/acp/templates/packageListPlugins.tpl +++ b/wcfsetup/install/files/acp/templates/packageListPlugins.tpl @@ -5,7 +5,7 @@
    -
    • +
diff --git a/wcfsetup/install/files/acp/templates/packageInstallation.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl similarity index 76% rename from wcfsetup/install/files/acp/templates/packageInstallation.tpl rename to wcfsetup/install/files/acp/templates/packageStartInstall.tpl index 0d3d0f2053..25f189cd39 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallation.tpl +++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl @@ -4,7 +4,7 @@ {if $packageID == 0}
-

{lang}wcf.acp.package.installation{/lang}

+

{lang}wcf.acp.package.startInstall{/lang}

{else} @@ -27,14 +27,14 @@ -
+
- {lang}wcf.acp.package.installation.source{/lang} + {lang}wcf.acp.package.startInstall.source{/lang} -
+
{if $errorField == 'uploadPackage'} @@ -45,24 +45,24 @@ {* todo: use language variable (-> else) *} 
{$phpRequirements|print_r}
{else} - {lang}wcf.acp.package.installation.error.{@$errorType}{/lang} + {lang}wcf.acp.package.startInstall.error.{@$errorType}{/lang} {/if} {/if} - {lang}wcf.acp.package.installation.source.upload.description{/lang} + {lang}wcf.acp.package.startInstall.source.upload.description{/lang}
-
+
{if $errorField == 'downloadPackage'} - {lang}wcf.acp.package.installation.error.{@$errorType}{/lang} + {lang}wcf.acp.package.startInstall.error.{@$errorType}{/lang} {/if} - {lang}wcf.acp.package.installation.source.download.description{/lang} + {lang}wcf.acp.package.startInstall.source.download.description{/lang}
diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl index ad42675cf0..b5ad9c4a46 100644 --- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl +++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl @@ -93,7 +93,7 @@
{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} {/if} diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index 044a1ef63d..e4b16a0618 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -138,7 +138,7 @@
{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} {/if} @@ -196,7 +196,7 @@
{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} {/if} @@ -246,7 +246,7 @@ {if $package->standalone && $package->package != 'com.woltlab.wcf'}
  • {lang}wcf.acp.package.view.button.makeActive{/lang}
    • {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}
  • {lang}wcf.acp.package.view.button.uninstall{/lang}
    • {/if} {/if} - {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
  • {lang}wcf.acp.package.view.button.update{/lang}
    • {/if} + {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
  • {lang}wcf.acp.package.view.button.update{/lang}
    • {/if} {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if} diff --git a/wcfsetup/install/files/lib/acp/form/PackageInstallationForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php similarity index 99% rename from wcfsetup/install/files/lib/acp/form/PackageInstallationForm.class.php rename to wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php index 95aba17d81..70c64570ab 100755 --- a/wcfsetup/install/files/lib/acp/form/PackageInstallationForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php @@ -29,7 +29,7 @@ class PackageStartInstallForm extends ACPForm { /** * @see wcf\page\AbstractPage::$templateName */ - public $templateName = 'packageInstallation'; + public $templateName = 'packageStartInstall'; /** * @see wcf\acp\form\ACPForm::$activeMenuItem diff --git a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php b/wcfsetup/install/files/lib/acp/page/DetailedPackageListPage.class.php similarity index 97% rename from wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php rename to wcfsetup/install/files/lib/acp/page/DetailedPackageListPage.class.php index fabb7be423..c196d40dd5 100644 --- a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/DetailedPackageListPage.class.php @@ -15,7 +15,7 @@ use wcf\system\WCF; * @subpackage acp.page * @category Community Framework */ -class PackageListDetailedPage extends SortablePage { +class DetailedPackageListPage extends SortablePage { /** * @see wcf\page\AbstractPage::$neededPermissions */ diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php index d1efd4f422..a8f132aa67 100644 --- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php @@ -108,7 +108,7 @@ class PackageArchive { */ public function __construct($archive, Package $package = null) { $this->archive = $archive; // be careful: this is a string within this class, - // but an object in the packageInstallationForm.class! + // but an object in the packageStartInstallForm.class! $this->package = $package; } -- 2.20.1