From d1f1b2389ff3db3c7f5f473d6e42859e7711f21f Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Fri, 2 Mar 2012 21:13:00 +0100 Subject: [PATCH] Removes RELATIVE_WCF_DIR in templates --- .../files/acp/templates/acpSessionLog.tpl | 16 ++++---- .../files/acp/templates/acpSessionLogList.tpl | 18 ++++----- .../install/files/acp/templates/cacheList.tpl | 12 +++--- .../files/acp/templates/cronjobAdd.tpl | 6 +-- .../files/acp/templates/cronjobList.tpl | 40 +++++++++---------- .../files/acp/templates/cronjobLogList.tpl | 10 ++--- .../install/files/acp/templates/footer.tpl | 2 +- .../install/files/acp/templates/header.tpl | 24 +++++------ .../install/files/acp/templates/login.tpl | 2 +- .../files/acp/templates/masterPassword.tpl | 2 +- .../acp/templates/masterPasswordInit.tpl | 2 +- .../install/files/acp/templates/option.tpl | 2 +- .../files/acp/templates/optionImport.tpl | 4 +- .../acp/templates/packageAutoUpdateList.tpl | 4 +- .../templates/packageInstallationConfirm.tpl | 6 +-- .../packageInstallationStepPrepare.tpl | 2 +- .../files/acp/templates/packageList.tpl | 20 +++++----- .../acp/templates/packageListDetailed.tpl | 38 +++++++++++------- .../acp/templates/packageListPlugins.tpl | 8 ++-- .../acp/templates/packageStartInstall.tpl | 6 +-- .../packageUninstallationDependencies.tpl | 24 +++++------ .../packageUninstallationStepPrepare.tpl | 2 +- .../files/acp/templates/packageUpdate.tpl | 2 +- .../files/acp/templates/packageUpdateAuth.tpl | 2 +- .../acp/templates/packageUpdateSearch.tpl | 2 +- .../templates/packageUpdateSearchResult.tpl | 12 +++--- .../files/acp/templates/packageView.tpl | 40 +++++++++---------- .../files/acp/templates/updateServerAdd.tpl | 4 +- .../files/acp/templates/updateServerList.tpl | 24 +++++------ .../install/files/acp/templates/userAdd.tpl | 6 +-- .../files/acp/templates/userAssignToGroup.tpl | 2 +- .../acp/templates/userEmailAddressExport.tpl | 2 +- .../files/acp/templates/userGroupAdd.tpl | 4 +- .../files/acp/templates/userGroupList.tpl | 20 +++++----- .../install/files/acp/templates/userList.tpl | 24 +++++------ .../install/files/acp/templates/userMail.tpl | 6 +-- .../files/acp/templates/userSearch.tpl | 6 +-- .../acp/templates/usersMassProcessing.tpl | 2 +- .../install/files/acp/templates/worker.tpl | 2 +- .../install/files/lib/system/WCF.class.php | 5 +++ 40 files changed, 213 insertions(+), 202 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl index 08528a0687..95f3b5456c 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl @@ -1,7 +1,7 @@ {include file='header'}
- +

{lang}wcf.acp.sessionLog.access.list{/lang}

@@ -20,13 +20,13 @@ - - - - - - - + + + + + + + {event name='headColumns'} diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index 6b75a076bc..55cf54bd6a 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -1,7 +1,7 @@ {include file='header'}
- +

{lang}wcf.acp.sessionLog.list{/lang}

@@ -20,13 +20,13 @@
{lang}wcf.global.objectID{/lang}{if $sortField == 'sessionAccessLogID'} {/if}{lang}wcf.user.ipAddress{/lang}{if $sortField == 'ipAddress'} {/if}{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if}{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} {/if}{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} {/if}

{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} {/if}{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} {/if}{lang}wcf.global.objectID{/lang}{if $sortField == 'sessionAccessLogID'} {/if}{lang}wcf.user.ipAddress{/lang}{if $sortField == 'ipAddress'} {/if}{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if}{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} {/if}{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} {/if}

{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} {/if}{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} {/if}
- - - - - - - + + + + + + + {event name='headColumns'} @@ -37,7 +37,7 @@ {foreach from=$objects item=sessionLog} - + diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index a877ffe2b4..1694ec0ec6 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -4,8 +4,8 @@ //getPath()}icon/opened2.svg', + 'wcf.global.closed': '{@$__wcf->getPath()}icon/closed2.svg' }); WCF.Collapsible.Simple.init(); }); @@ -13,7 +13,7 @@
- +

{lang}wcf.acp.cache.list{/lang}

@@ -51,7 +51,7 @@
{lang}wcf.global.objectID{/lang}{if $sortField == 'sessionLogID'} {/if}{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}{lang}wcf.user.ipAddress{/lang}{if $sortField == 'ipAddress'} {/if}{lang}wcf.user.userAgent{/lang}{if $sortField == 'userAgent'} {/if}{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if}{lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} {/if}{lang}wcf.acp.sessionLog.accesses{/lang}{if $sortField == 'accesses'} {/if}{lang}wcf.global.objectID{/lang}{if $sortField == 'sessionLogID'} {/if}{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}{lang}wcf.user.ipAddress{/lang}{if $sortField == 'ipAddress'} {/if}{lang}wcf.user.userAgent{/lang}{if $sortField == 'userAgent'} {/if}{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if}{lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} {/if}{lang}wcf.acp.sessionLog.accesses{/lang}{if $sortField == 'accesses'} {/if}

{@$sessionLog->sessionLogID}

{if $__wcf->user->userID == $sessionLog->userID}{/if} {$sessionLog->username}

{if $__wcf->user->userID == $sessionLog->userID}{/if} {$sessionLog->username}

{$sessionLog->ipAddress}{if $sessionLog->hostname != $sessionLog->ipAddress}
{$sessionLog->hostname}{/if}

{$sessionLog->userAgent}

{@$sessionLog->time|time}
- - - - - - - - + + + + + + + + {event name='headColumns'} @@ -80,30 +80,30 @@
{lang}wcf.global.objectID{/lang}{if $sortField == 'cronjobID'} {/if}{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} {/if}{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} {/if}{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} {/if}{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} {/if}{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} {/if}{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if}{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} {/if}{lang}wcf.global.objectID{/lang}{if $sortField == 'cronjobID'} {/if}{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} {/if}{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} {/if}{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} {/if}{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} {/if}{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} {/if}{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if}{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} {/if}
{if $__wcf->session->getPermission('admin.system.cronjob.canEditCronjob')} - + {else} - + {/if} {if $cronjob->canBeDisabled()} - + {else} {if $cronjob->active} - + {else} - + {/if} {/if} {if $cronjob->isEditable()} - + {else} - + {/if} {if $cronjob->isDeletable()} - + {else} - + {/if} {event name='buttons'} @@ -143,7 +143,7 @@ {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')} {/if} diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl index 6b9ad2e268..10713b7434 100644 --- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl @@ -1,7 +1,7 @@ {include file='header'}
- +

{lang}wcf.acp.cronjob.log{/lang}

{lang}wcf.acp.cronjob.subtitle{/lang}

@@ -22,10 +22,10 @@ - - - - + + + + {event name='headColumns'} diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl index a1f0f0af90..fd57e301f5 100644 --- a/wcfsetup/install/files/acp/templates/footer.tpl +++ b/wcfsetup/install/files/acp/templates/footer.tpl @@ -9,7 +9,7 @@
{lang}wcf.global.objectID{/lang}{if $sortField == 'cronjobID'} {/if}{lang}wcf.acp.cronjob.className{/lang}{if $sortField == 'className'} {/if}{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if}{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} {/if}{lang}wcf.global.objectID{/lang}{if $sortField == 'cronjobID'} {/if}{lang}wcf.acp.cronjob.className{/lang}{if $sortField == 'className'} {/if}{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if}{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} {/if}
- - - - - + + + + + {event name='headColumns'} @@ -61,12 +61,20 @@ {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} {else} - + {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package->package != 'com.woltlab.wcf' && $package->packageID != PACKAGE_ID} - + {else} - + + + {else} + + {/if} + {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package->package != 'com.woltlab.wcf' && $package->packageID != PACKAGE_ID} + + {else} + {/if} {event name='buttons'} @@ -74,17 +82,17 @@ - + @@ -105,7 +113,7 @@ - + diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl index 433db243eb..073142e906 100644 --- a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl +++ b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl @@ -1,6 +1,6 @@
- +

Paket »{$queue->packageName}« wird deinstalliert …

Aktueller Schritt: {lang}wcf.package.uninstallation.step.prepare{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl index 3c57fee196..6f888c5da7 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl @@ -1,7 +1,7 @@ {include file='header'}
- +

{lang}wcf.acp.packageUpdate{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl index e77873739b..20884988f8 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl @@ -1,7 +1,7 @@ {include file='header'}
- +

{lang}wcf.acp.packageUpdate.auth{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl index 17778a9c67..efa2117aa1 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl @@ -38,7 +38,7 @@
- +

{lang}wcf.acp.packageUpdate.search{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl index df72a02962..bf4825f0f3 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl @@ -1,9 +1,7 @@ {include file='header'} - -
- +

{lang}wcf.acp.packageUpdate.search{/lang}

@@ -20,11 +18,11 @@

{if $package.isApplication == 1} - + {elseif $package.plugin != ''} - + {else} - + {/if} {$package.packageName}

@@ -63,7 +61,7 @@
- {if $package.authorURL}{$package.author}{else}{$package.author}{/if} + {if $package.authorURL}{$package.author}{else}{$package.author}{/if}
{/if} diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index d10e4ee765..c361334c56 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -9,7 +9,7 @@
- +

{$package->getName()}

{$package->packageDescription}

@@ -77,7 +77,7 @@ {/if}
{lang}wcf.acp.package.author{/lang}
-
{if $package->authorURL}{$package->author}{else}{$package->author}{/if}
+
{if $package->authorURL}{$package->author}{else}{$package->author}{/if}
{event name='propertyFields'} @@ -127,24 +127,24 @@
@@ -187,24 +187,24 @@ @@ -237,19 +237,19 @@ diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl index 377e069310..e268dfc4b0 100644 --- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl @@ -1,7 +1,7 @@ {include file='header'}
- +

{lang}wcf.acp.updateServer.{$action}{/lang}

@@ -22,7 +22,7 @@
{lang}wcf.global.objectID{/lang}{if $sortField == 'packageID'} {/if}{lang}wcf.acp.package.name{/lang}{if $sortField == 'packageName'} {/if}{lang}wcf.acp.package.author{/lang}{if $sortField == 'author'} {/if}{lang}wcf.acp.package.version{/lang}{if $sortField == 'packageVersion'} {/if}{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} {/if}{lang}wcf.global.objectID{/lang}{if $sortField == 'packageID'} {/if}{lang}wcf.acp.package.name{/lang}{if $sortField == 'packageName'} {/if}{lang}wcf.acp.package.author{/lang}{if $sortField == 'author'} {/if}{lang}wcf.acp.package.version{/lang}{if $sortField == 'packageVersion'} {/if}{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} {/if}

{@$package->packageID}

 {if $package->isApplication} - + {elseif $package->isPlugin()} - + {else} - + {/if} {$package->getName()}{if $package->instanceNo > 1 && $package->instanceName == ''} (#{#$package->instanceNo}){/if}

{if $package->authorURL}{$package->author}{else}{$package->author}{/if}

{if $package->authorURL}{$package->author}{else}{$package->author}{/if}

{$package->packageVersion}

{@$package->updateDate|time}

{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} - + {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package.package != 'com.woltlab.wcf' && $package.packageID != PACKAGE_ID} - + {else} - + {/if} {event name='buttons'} @@ -108,15 +108,15 @@

{@$package.packageID}

 {if $package.isApplication} - + {elseif $package.parentPackageID} - + {else} - + {/if}

{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}

{if $package.authorURL}{$package.author}{else}{$package.author}{/if}

{if $package.authorURL}{$package.author}{else}{$package.author}{/if}

{$package.packageVersion}

{@$package.packageDate|date}

{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} - + {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $requiredPackage.package != 'com.woltlab.wcf' && $requiredPackage.packageID != PACKAGE_ID} - + {else} - + {/if}

{@$requiredPackage.packageID}

 {if $requiredPackage.isApplication} - + {elseif $requiredPackage.parentPackageID} - + {else} - + {/if}

{$requiredPackage.packageName}{if $requiredPackage.instanceNo > 1 && $requiredPackage.instanceName == ''} (#{#$requiredPackage.instanceNo}){/if}

{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} - + {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $dependentPackage.package != 'com.woltlab.wcf' && $dependentPackage.packageID != PACKAGE_ID} - + {else} - + {/if}

{@$dependentPackage.packageID}

 {if $dependentPackage.isApplication} - + {elseif $dependentPackage.parentPackageID} - + {else} - + {/if}

{$dependentPackage.packageName}{if $dependentPackage.instanceNo > 1 && $dependentPackage.instanceName == ''} (#{#$dependentPackage.instanceNo}){/if}
- - - - - - + + + + + + {event name='headColumns'} @@ -57,9 +57,9 @@ {foreach from=$objects item=updateServer} @@ -84,7 +84,7 @@
{lang}wcf.global.objectID{/lang}{if $sortField == 'packageUpdateServerID'} {/if}{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} {/if}{lang}wcf.acp.updateServer.packages{/lang}{if $sortField == 'packages'} {/if}{lang}wcf.acp.updateServer.status{/lang}{if $sortField == 'status'} {/if}{lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} {/if}{lang}wcf.acp.updateServer.lastUpdateTime{/lang}{if $sortField == 'lastUpdateTime'} {/if}{lang}wcf.global.objectID{/lang}{if $sortField == 'packageUpdateServerID'} {/if}{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} {/if}{lang}wcf.acp.updateServer.packages{/lang}{if $sortField == 'packages'} {/if}{lang}wcf.acp.updateServer.status{/lang}{if $sortField == 'status'} {/if}{lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} {/if}{lang}wcf.acp.updateServer.lastUpdateTime{/lang}{if $sortField == 'lastUpdateTime'} {/if}
- - - + + + {event name='buttons'}
- - - + + + {event name='headColumns'} @@ -49,14 +49,14 @@ - - + + {foreach from=$columnHeads key=column item=columnLanguageVariable} - + {/foreach} {event name='headColumns'} @@ -66,14 +66,14 @@
{lang}wcf.global.objectID{/lang}{if $sortField == 'groupID'} {/if}{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} {/if}{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} {/if}{lang}wcf.global.objectID{/lang}{if $sortField == 'groupID'} {/if}{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} {/if}{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} {/if}
{if $group->isEditable()} - + {else} - + {/if} {if $group->isDeletable()} - + {else} - + {/if} {event name='buttons'} @@ -78,7 +78,7 @@ {@$pagesLinks}
{lang}wcf.global.objectID{/lang}{if $sortField == 'userID'} {/if}{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}{lang}wcf.global.objectID{/lang}{if $sortField == 'userID'} {/if}{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if}{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if} {if $user->editable} - + {else} - + {/if} {if $user->deletable} - + {else} - + {/if} {event name='buttons'} @@ -102,9 +102,9 @@