From 7991009f00af5b2c8a22a8f867366a7ab35fb41b Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 14 Jan 2013 22:29:38 +0100 Subject: [PATCH] Updates/Adds template events cf. #877 --- .../files/acp/templates/acpSessionLog.tpl | 6 +- .../files/acp/templates/acpSessionLogList.tpl | 54 ++++++++---- .../files/acp/templates/applicationEdit.tpl | 12 ++- .../acp/templates/applicationManagement.tpl | 76 +++++++++------- .../install/files/acp/templates/cacheList.tpl | 12 ++- .../files/acp/templates/categoryList.tpl | 6 +- .../files/acp/templates/cronjobAdd.tpl | 5 +- .../files/acp/templates/cronjobList.tpl | 8 +- .../files/acp/templates/cronjobLogList.tpl | 28 ++++-- .../install/files/acp/templates/index.tpl | 5 +- .../files/acp/templates/languageAdd.tpl | 6 ++ .../files/acp/templates/languageExport.tpl | 4 + .../files/acp/templates/languageList.tpl | 88 ++++++++++--------- .../acp/templates/languageMultilingualism.tpl | 16 +++- .../files/acp/templates/languageServerAdd.tpl | 4 + .../acp/templates/languageServerList.tpl | 6 ++ .../files/acp/templates/masterPassword.tpl | 2 +- .../acp/templates/masterPasswordInit.tpl | 2 +- .../install/files/acp/templates/option.tpl | 12 +++ .../files/acp/templates/optionImport.tpl | 12 +++ .../install/files/acp/templates/package.tpl | 30 ++++++- .../acp/templates/packageAutoUpdateList.tpl | 8 +- .../templates/packageInstallationConfirm.tpl | 18 ++-- .../files/acp/templates/packageList.tpl | 59 +++++++------ .../acp/templates/packageStartInstall.tpl | 6 +- .../files/acp/templates/packageUpdate.tpl | 2 +- .../files/acp/templates/packageUpdateAuth.tpl | 8 +- .../acp/templates/packageUpdateSearch.tpl | 14 ++- .../templates/packageUpdateSearchResult.tpl | 20 +++++ .../files/acp/templates/pageMenuItemAdd.tpl | 18 ++-- .../files/acp/templates/pageMenuItemList.tpl | 10 ++- .../install/files/acp/templates/styleAdd.tpl | 56 +++++++++++- .../files/acp/templates/styleExport.tpl | 8 ++ .../files/acp/templates/styleImport.tpl | 2 + .../install/files/acp/templates/styleList.tpl | 6 +- .../files/acp/templates/updateServerAdd.tpl | 5 +- .../files/acp/templates/updateServerList.tpl | 8 +- .../install/files/acp/templates/userAdd.tpl | 12 +-- .../files/acp/templates/userAssignToGroup.tpl | 18 ++++ .../acp/templates/userEmailAddressExport.tpl | 17 ++++ .../files/acp/templates/userGroupAdd.tpl | 2 +- .../files/acp/templates/userGroupList.tpl | 14 +-- .../files/acp/templates/userGroupOption.tpl | 14 ++- .../install/files/acp/templates/userList.tpl | 8 +- .../install/files/acp/templates/userMail.tpl | 6 +- .../files/acp/templates/userSearch.tpl | 19 ++-- .../acp/templates/usersMassProcessing.tpl | 20 ++++- 47 files changed, 550 insertions(+), 222 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl index 76ff4a5726..d43293f309 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl @@ -13,7 +13,7 @@ @@ -34,7 +34,7 @@ {lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} {/if} {lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} {/if} - {event name='headColumns'} + {event name='columnHeads'} @@ -64,7 +64,7 @@ diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index d071a1e07a..4ff2fad09d 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -8,9 +8,19 @@
{pages print=true assign=pagesLinks controller="ACPSessionLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"} + + {hascontent} + + {/hascontent}
-{hascontent} +{if $objects|count}

{lang}wcf.acp.sessionLog.list{/lang} {#$items}

@@ -27,33 +37,41 @@ {lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} {/if} {lang}wcf.acp.sessionLog.actions{/lang}{if $sortField == 'accesses'} {/if} - {event name='headColumns'} + {event name='columnHeads'} - {content} - {foreach from=$objects item=sessionLog} - -

{@$sessionLog->sessionLogID}

-

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

-

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

-

{$sessionLog->userAgent|truncate:75}

-

{@$sessionLog->time|time}

-

{@$sessionLog->lastActivityTime|time}

-

{#$sessionLog->accesses}

- - {event name='columns'} - - {/foreach} - {/content} + {foreach from=$objects item=sessionLog} + +

{@$sessionLog->sessionLogID}

+

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

+

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

+

{$sessionLog->userAgent|truncate:75}

+

{@$sessionLog->time|time}

+

{@$sessionLog->lastActivityTime|time}

+

{#$sessionLog->accesses}

+ + {event name='columns'} + + {/foreach}
{@$pagesLinks} + + {hascontent} + + {/hascontent}
-{/hascontent} +{/if} {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl index 0751bf362c..77ff5162a4 100644 --- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl +++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl @@ -36,10 +36,12 @@
@@ -65,6 +67,7 @@ {/if} +
@@ -72,6 +75,8 @@ {lang}wcf.acp.application.domainPath.description{/lang}
+ + {event name='domainFields'}
@@ -94,6 +99,7 @@ {/if} +
@@ -109,6 +115,8 @@ {/if}
+ + {event name='cookieFields'}
{event name='fieldsets'} diff --git a/wcfsetup/install/files/acp/templates/applicationManagement.tpl b/wcfsetup/install/files/acp/templates/applicationManagement.tpl index 1aa331e7c9..e12157c409 100644 --- a/wcfsetup/install/files/acp/templates/applicationManagement.tpl +++ b/wcfsetup/install/files/acp/templates/applicationManagement.tpl @@ -1,10 +1,18 @@ {include file='header' pageTitle='wcf.acp.application.management'} -
- {* todo: event *} -
- {hascontent} +
+ +
+{/hascontent} + +{if $applicationList|count}

{lang}wcf.acp.application.list{/lang} {#$applicationList|count}

@@ -22,38 +30,46 @@ {lang}wcf.acp.application.cookieDomain{/lang} {lang}wcf.acp.application.cookiePath{/lang} - {event name='headColumns'} + {event name='columnHeads'} - {content} - {foreach from=$applicationList item=application} - - - {#$application->packageID} - - {$application->getPackage()} - {if $application->isPrimary} - - {/if} - - {$application->domainName} - {$application->domainPath} - {$application->cookieDomain} - {$application->cookiePath} - - {/foreach} - {/content} + {foreach from=$applicationList item=application} + + + {#$application->packageID} + + {$application->getPackage()} + {if $application->isPrimary} + + {/if} + + {$application->domainName} + {$application->domainPath} + {$application->cookieDomain} + {$application->cookiePath} + + {event name='columns'} + + {/foreach} -{/hascontent} - -
- {* todo: event *} -
+ + {hascontent} +
+ +
+ {/hascontent} +{/if} {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 15364bf43c..30868e5f13 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -52,9 +52,11 @@
@@ -103,9 +105,11 @@
diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl index 07dee62cb1..da6c8f1a93 100644 --- a/wcfsetup/install/files/acp/templates/categoryList.tpl +++ b/wcfsetup/install/files/acp/templates/categoryList.tpl @@ -82,7 +82,7 @@
  • {@$objectType->getProcessor()->getLanguageVariable('add')}
    • {/if} - {event name='contentNavigationButtons'} + {event name='contentNavigationButtonsTop'} {/content} @@ -125,7 +125,7 @@ {/if} - {event name='buttons'} + {event name='itemButtons'} @@ -154,7 +154,7 @@
  • {@$objectType->getProcessor()->getLanguageVariable('add')}
    • {/if} - {event name='contentNavigationButtons'} + {event name='contentNavigationButtonsBottom'} {/content} diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl index ba339ca8f3..2275ecc4cf 100644 --- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl @@ -24,12 +24,12 @@
  • {lang}wcf.acp.cronjob.execute{/lang}
    • {/if} - {event name='largeButtons'} + {event name='contentNavigationButtons'} -
    +
    {lang}wcf.global.form.data{/lang} @@ -146,7 +146,6 @@
    - {if $cronjobID|isset}{/if}
    diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl index a7379d2ecd..f96521c9b2 100644 --- a/wcfsetup/install/files/acp/templates/cronjobList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl @@ -40,7 +40,7 @@
    @@ -63,7 +63,7 @@ {lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if} {lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} {/if} - {event name='headColumns'} + {event name='columnHeads'} @@ -95,7 +95,7 @@ {/if} - {event name='buttons'} + {event name='rowButtons'}

    {@$cronjob->cronjobID}

    {$cronjob->startMinute|truncate:30}

    @@ -134,7 +134,7 @@ diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl index aa4fc45d64..dcc24c4aeb 100644 --- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl @@ -19,7 +19,7 @@ } }); }); - + $('.jsCronjobError').click(function(event) { $(event.currentTarget).next().wcfDialog({ title: '{lang}wcf.acp.cronjob.log.error.details{/lang}' @@ -35,17 +35,25 @@
    -{hascontent} -
    - {pages print=true assign=pagesLinks controller="CronjobLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"} - +
    + {pages print=true assign=pagesLinks controller="CronjobLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"} + + {hascontent} -
    - + {/hascontent} +
    + +{hascontent}

    {lang}wcf.acp.cronjob.log{/lang} {#$items}

    @@ -60,7 +68,7 @@ {lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} {/if} {lang}wcf.acp.cronjob.log.status{/lang}{if $sortField == 'success'} {/if} - {event name='headColumns'} + {event name='columnHeads'} @@ -96,6 +104,8 @@
    diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl index e6ff316751..75d2b59f75 100644 --- a/wcfsetup/install/files/acp/templates/index.tpl +++ b/wcfsetup/install/files/acp/templates/index.tpl @@ -29,7 +29,8 @@ {if $health !== 'success'}
  • Health
    • {/if}
  • News
  • Credits
    • - {event name='tabs'} + + {event name='tabMenuTabs'} @@ -127,6 +128,6 @@ - {event name='tabContent'} + {event name='tabMenuContents'} {include file='footer'} \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/languageAdd.tpl b/wcfsetup/install/files/acp/templates/languageAdd.tpl index 507ce64167..b00c61506d 100644 --- a/wcfsetup/install/files/acp/templates/languageAdd.tpl +++ b/wcfsetup/install/files/acp/templates/languageAdd.tpl @@ -50,6 +50,8 @@ + + {event name='modeFields'}
    @@ -83,6 +85,8 @@ {/if} + + {event name='importFields'}
    @@ -124,6 +128,8 @@ {/if} + + {event name='copyFields'}
    {event name='fieldsets'} diff --git a/wcfsetup/install/files/acp/templates/languageExport.tpl b/wcfsetup/install/files/acp/templates/languageExport.tpl index e0e2af949f..fd5493dbfe 100644 --- a/wcfsetup/install/files/acp/templates/languageExport.tpl +++ b/wcfsetup/install/files/acp/templates/languageExport.tpl @@ -61,7 +61,11 @@ + + {event name='exportFields'} + + {event name='fieldsets'}
    diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl index eab0115782..3adc10cc99 100644 --- a/wcfsetup/install/files/acp/templates/languageList.tpl +++ b/wcfsetup/install/files/acp/templates/languageList.tpl @@ -66,57 +66,63 @@ {lang}wcf.acp.language.users{/lang}{if $sortField == 'users'} {/if} {lang}wcf.acp.language.variables{/lang}{if $sortField == 'variables'} {/if} {lang}wcf.acp.language.customVariables{/lang}{if $sortField == 'customVariables'} {/if} + + {event name='columnHeads'} - {foreach from=$objects item=language} - - - {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')} - - {else} - - {/if} - - {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')} - {if !$language->isDefault} - + {foreach from=$objects item=language} + + + {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')} + + {else} + + {/if} + + {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')} + {if !$language->isDefault} + + {else} + + {/if} {else} {/if} - {else} - - {/if} - - {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')} - - {else} - - {/if} - {if $__wcf->getSession()->getPermission('admin.language.canDeleteLanguage')} - {if !$language->isDefault} - + + {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')} + + {else} + + {/if} + {if $__wcf->getSession()->getPermission('admin.language.canDeleteLanguage')} + {if !$language->isDefault} + + {else} + + {/if} {else} {/if} - {else} - - {/if} - - {@$language->languageID} - - {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')} - {$language->languageName} ({@$language->languageCode}) - {else} - {$language->languageName} ({@$language->languageCode}) - {/if} - - {#$language->users} - {#$language->variables} - {if $language->customVariables > 0 && $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}{#$language->customVariables}{else}{#$language->customVariables}{/if} - - {/foreach} + + {event name='rowButtons'} + + {@$language->languageID} + + {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')} + {$language->languageName} ({@$language->languageCode}) + {else} + {$language->languageName} ({@$language->languageCode}) + {/if} + + {#$language->users} + {#$language->variables} + {if $language->customVariables > 0 && $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}{#$language->customVariables}{else}{#$language->customVariables}{/if} + + {event name='columns'} + + {/foreach}
    diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl index 1dc94b15a0..ba9c74d851 100644 --- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl +++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl @@ -24,6 +24,18 @@

    {lang}wcf.acp.language.multilingualism.success{/lang}

    {/if} +{hascontent} +
    + +
    +{/hascontent} +
    @@ -43,8 +55,10 @@ - {event name='additionalFields'} + {event name='enableFields'}
    + + {event name='fieldsets'}
    diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl index b90a029ca7..a18f1a3c50 100644 --- a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl @@ -48,7 +48,11 @@ {lang}wcf.acp.languageServer.server.description{/lang} + + {event name='dataFields'} + + {event name='fieldsets'}
    diff --git a/wcfsetup/install/files/acp/templates/languageServerList.tpl b/wcfsetup/install/files/acp/templates/languageServerList.tpl index f82cf76445..2ff2bb1c9d 100644 --- a/wcfsetup/install/files/acp/templates/languageServerList.tpl +++ b/wcfsetup/install/files/acp/templates/languageServerList.tpl @@ -50,6 +50,8 @@ {lang}wcf.global.objectID{/lang}{if $sortField == 'languageServerID'} {/if} {lang}wcf.acp.languageServer.serverURL{/lang}{if $sortField == 'serverURL'} {/if} + + {event name='columnHeads'} @@ -69,6 +71,8 @@ {else} {/if} + + {event name='rowButtons'} {@$languageServer->languageServerID} @@ -78,6 +82,8 @@ {@$languageServer->serverURL} {/if} + + {event name='columns'} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl index d2ae7ac466..6d4645ba7b 100644 --- a/wcfsetup/install/files/acp/templates/masterPassword.tpl +++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl @@ -14,7 +14,7 @@ -{if $errorField != ''} +{if $errorField}

    {lang}wcf.global.form.error{/lang}

    {/if} diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl index 7920a19c4a..610e9181d6 100644 --- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl +++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl @@ -18,7 +18,7 @@ -{if $errorField != ''} +{if $errorField}

    {lang}wcf.global.form.error{/lang}

    {/if} diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl index 1c43707c25..bd6e74e79e 100644 --- a/wcfsetup/install/files/acp/templates/option.tpl +++ b/wcfsetup/install/files/acp/templates/option.tpl @@ -35,6 +35,18 @@

    {lang}wcf.global.form.error{/lang}

    {/if} +{hascontent} +
    + +
    +{/hascontent} +
    @@ -109,7 +127,7 @@ {lang}wcf.acp.package.version{/lang} {lang}wcf.acp.package.packageDate{/lang} - {event name='requirementHeadColumns'} + {event name='requirementColumnHeads'} @@ -167,7 +185,7 @@ {lang}wcf.acp.package.version{/lang} {lang}wcf.acp.package.packageDate{/lang} - {event name='dependencyHeadColumns'} + {event name='dependencyColumnHeads'} @@ -208,8 +226,12 @@
    {/hascontent} + + {event name='DependenciesSubTabMenuContents'}
    {/if} + + {event name='tabMenuContents'}
    @@ -228,7 +250,7 @@
  • {lang}wcf.acp.package.button.update{/lang}
    • {/if} - {event name='largeButtons'} + {event name='contentNavigationButtonsBottom'}
  • {lang}wcf.acp.menu.link.package.list{/lang}
    • diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl index ca81ed84da..b03917c381 100644 --- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl +++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl @@ -1,5 +1,11 @@ {include file='header' pageTitle='wcf.acp.packageUpdate'} +{* + todo: + * update CSS classes + * add events +*} + + + + {/hascontent} +
    {/if} -
    - {@$pagesLinks} - - {hascontent} - - - {/hascontent} -
    - {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl index 47fa741093..e59a633ae1 100644 --- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl +++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl @@ -11,7 +11,7 @@ -{if $errorField != ''} +{if $errorField}

    {lang}wcf.global.form.error{/lang}

    {/if} @@ -20,7 +20,7 @@ @@ -68,7 +68,7 @@ {event name='fieldsets'} - +
    diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl index fe22d398fe..390b23ff34 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl @@ -28,7 +28,6 @@ {if $packageInstallationStack|count}
    -
    {lang}wcf.acp.packageUpdate.updates{/lang} @@ -45,6 +44,7 @@
    + {event name='fieldsets'}
    diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl index a8ab66dd0a..be4f3e4191 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl @@ -6,7 +6,7 @@ -{if $errorField != ''} +{if $errorField}

    {lang}wcf.global.form.error{/lang}

    {/if} @@ -31,6 +31,8 @@
    {@$message}
    {/if} + + {event name='dataFields'}
    @@ -63,7 +65,11 @@
    {lang}wcf.acp.packageUpdate.auth.save.description{/lang}
    + + {event name='authFields'}
    + + {event name='fieldsets'}
    diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl index 3a0ab868e2..5c37b2c7ad 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl @@ -43,13 +43,11 @@ -{if $errorField != ''} +{if $errorField}

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

    {/if} -{if !$updateServers|count} -

    {lang}wcf.acp.updateServer.view.noneAvailable{/lang}

    -{else} +{if $updateServers|count}
    @@ -70,6 +68,8 @@ {/foreach} + + {event name='serverFields'}
    @@ -104,13 +104,19 @@ + + {event name='conditionFields'}
    + + {event name='fieldsets'}
    +{else} +

    {lang}wcf.acp.updateServer.view.noneAvailable{/lang}

    {/if} {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl index b837d6f582..84d1d21418 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl @@ -8,6 +8,16 @@
    {pages print=true assign=pagesLinks controller="PackageUpdateSearchResult" id=$searchID link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"} + + {hascontent} + + {/hascontent}
    @@ -100,6 +110,16 @@
    {@$pagesLinks} + + {hascontent} + + {/hascontent}
    {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl index 86f6cbf9d2..c6da57fca9 100644 --- a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl +++ b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl @@ -53,6 +53,8 @@
    @@ -119,6 +121,8 @@ {include file='multipleLanguageInputJavascript' elementIdentifier='pageMenuItem' forceSelection=true} + + {event name='dataFields'}
    @@ -165,6 +169,8 @@ {include file='multipleLanguageInputJavascript' elementIdentifier='menuItemLink' forceSelection=false} + + {event name='linkFields'}
    @@ -182,20 +188,16 @@ + + {event name='advancedFields'}
    + {event name='fields'} +
    -
    - -
    - {include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl index f6e76fa41a..530a06f073 100644 --- a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl +++ b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl @@ -27,7 +27,7 @@ @@ -55,6 +55,8 @@ {else} {/if} + + {event name='headerItemButtons'} {if $menuItem|count} @@ -67,6 +69,8 @@ + + {event name='subHeaderItemButtons'} @@ -100,6 +104,8 @@ + + {event name='footerItemButtons'} @@ -119,7 +125,7 @@ diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl index 1cab6f48d6..7c34bf5bb5 100644 --- a/wcfsetup/install/files/acp/templates/styleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl @@ -66,6 +66,8 @@ {if $__wcf->session->getPermission('admin.style.canDeleteStyle') || $__wcf->session->getPermission('admin.style.canEditStyle')}
  • {lang}wcf.acp.menu.link.style.list{/lang}
    • {/if} + + {event name='contentNavigationButtons'} {/content} @@ -80,6 +82,8 @@
  • {lang}wcf.acp.style.globals{/lang}
  • {lang}wcf.acp.style.colors{/lang}
  • {lang}wcf.acp.style.advanced{/lang}
    • + + {event name='tabMenuTabs'} @@ -210,6 +214,8 @@ {include file='multipleLanguageInputJavascript' elementIdentifier='styleDescription' forceSelection=true} + + {event name='dataFields'}
    @@ -288,7 +294,11 @@ {lang}wcf.acp.style.imagePath.description{/lang} + + {event name='fileFields'}
    + + {event name='generalFieldsets'} {* globals *} @@ -332,6 +342,8 @@ {lang}wcf.acp.style.globals.pageLogo.description{/lang} + + {event name='layoutFields'} {* font *} @@ -359,7 +371,11 @@ + + {event name='fontFields'} + + {event name='globalFieldsets'} {* colors *} @@ -373,7 +389,11 @@
  • {include file='styleVariableColor' variableName='wcfPageColor' languageVariable='color'}
  • {include file='styleVariableColor' variableName='wcfPageLinkColor' languageVariable='linkColor'}
  • {include file='styleVariableColor' variableName='wcfPageLinkHoverColor' languageVariable='linkHoverColor'}
    • + + {event name='pageColorListItems'} + + {event name='pageColorLists'}
    @@ -386,7 +406,11 @@
  • {include file='styleVariableColor' variableName='wcfDimmedColor' languageVariable='dimmedColor'}
  • {include file='styleVariableColor' variableName='wcfLinkColor' languageVariable='linkColor'}
  • {include file='styleVariableColor' variableName='wcfLinkHoverColor' languageVariable='linkHoverColor'}
    • + + {event name='contentColorListItems'} + + {event name='contentColorLists'}
    @@ -398,7 +422,11 @@
  • {include file='styleVariableColor' variableName='wcfContainerAccentBackgroundColor' languageVariable='accentBackgroundColor'}
  • {include file='styleVariableColor' variableName='wcfContainerBorderColor' languageVariable='borderColor'}
  • {include file='styleVariableColor' variableName='wcfContainerHoverBackgroundColor' languageVariable='hoverBackgroundColor'}
    • + + {event name='containerColorListItems'} + + {event name='containerColorLists'}
    @@ -410,7 +438,11 @@
  • {include file='styleVariableColor' variableName='wcfUserPanelColor' languageVariable='color'}
  • {include file='styleVariableColor' variableName='wcfUserPanelHoverBackgroundColor' languageVariable='hoverBackgroundColor'}
  • {include file='styleVariableColor' variableName='wcfUserPanelHoverColor' languageVariable='hoverColor'}
    • + + {event name='userPanelColorListItems'} + + {event name='userPanelColorLists'}
    @@ -421,7 +453,11 @@
  • {include file='styleVariableColor' variableName='wcfTabularBoxBackgroundColor' languageVariable='backgroundColor'}
  • {include file='styleVariableColor' variableName='wcfTabularBoxColor' languageVariable='color'}
  • {include file='styleVariableColor' variableName='wcfTabularBoxHoverColor' languageVariable='hoverColor'}
    • + + {event name='tabularColorListItems'} + + {event name='tabularColorLists'}
    @@ -432,6 +468,8 @@
  • {include file='styleVariableColor' variableName='wcfButtonBackgroundColor' languageVariable='backgroundColor'}
  • {include file='styleVariableColor' variableName='wcfButtonBorderColor' languageVariable='borderColor'}
  • {include file='styleVariableColor' variableName='wcfButtonColor' languageVariable='color'}
    • + + {event name='defaultButtonColorListItems'} {* button:hover *} @@ -439,6 +477,8 @@
  • {include file='styleVariableColor' variableName='wcfButtonHoverBackgroundColor' languageVariable='hoverBackgroundColor'}
  • {include file='styleVariableColor' variableName='wcfButtonHoverBorderColor' languageVariable='hoverBorderColor'}
  • {include file='styleVariableColor' variableName='wcfButtonHoverColor' languageVariable='hoverColor'}
    • + + {event name='hoverButtonColorListItems'} {* primary button *} @@ -446,21 +486,31 @@
  • {include file='styleVariableColor' variableName='wcfButtonPrimaryBackgroundColor' languageVariable='primaryBackgroundColor'}
  • {include file='styleVariableColor' variableName='wcfButtonPrimaryBorderColor' languageVariable='primaryBorderColor'}
  • {include file='styleVariableColor' variableName='wcfButtonPrimaryColor' languageVariable='primaryColor'}
    • + + {event name='primaryButtonColorListItems'} + + {event name='buttonsColorLists'}
    {lang}wcf.acp.style.colors.formInput{/lang} - {* default button *} + {* form input *} + + {event name='formInputColorLists'}
    + + {event name='colorFieldsets'} {* advanced *} @@ -488,7 +538,11 @@ {/if} {lang}wcf.acp.style.advanced.overrideLess.description{/lang} + + {event name='syntaxFieldsets'} + + {event name='tabMenuContents'}
    diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl index 897665f45e..b3618046d4 100644 --- a/wcfsetup/install/files/acp/templates/styleExport.tpl +++ b/wcfsetup/install/files/acp/templates/styleExport.tpl @@ -10,6 +10,8 @@
    @@ -35,6 +37,8 @@ + + {event name='componentFields'}
    @@ -64,7 +68,11 @@ {lang}wcf.acp.style.packageName.description{/lang} + + {event name='exportAsPackageFields'}
    + + {event name='fieldsets'}
    diff --git a/wcfsetup/install/files/acp/templates/styleImport.tpl b/wcfsetup/install/files/acp/templates/styleImport.tpl index c1e034b276..f3685558a0 100644 --- a/wcfsetup/install/files/acp/templates/styleImport.tpl +++ b/wcfsetup/install/files/acp/templates/styleImport.tpl @@ -18,6 +18,8 @@ {if $__wcf->session->getPermission('admin.style.canDeleteStyle') || $__wcf->session->getPermission('admin.style.canEditStyle')}
  • {lang}wcf.acp.menu.link.style.list{/lang}
    • {/if} + + {event name='contentNavigationButtons'} {/content} diff --git a/wcfsetup/install/files/acp/templates/styleList.tpl b/wcfsetup/install/files/acp/templates/styleList.tpl index f6ebbe40a5..77dbf77611 100644 --- a/wcfsetup/install/files/acp/templates/styleList.tpl +++ b/wcfsetup/install/files/acp/templates/styleList.tpl @@ -28,7 +28,7 @@
  • {lang}wcf.acp.menu.link.style.import{/lang}
    • {/if} - {event name='largeButtons'} + {event name='contentNavigationButtonsTop'} {/content} @@ -53,6 +53,8 @@
    • {/if} + + {event name='itemButtons'}
    {lang}wcf.acp.style.users{/lang}
    @@ -85,7 +87,7 @@
  • {lang}wcf.acp.menu.link.style.import{/lang}
    • {/if} - {event name='largeButtons'} + {event name='contentNavigationButtonsBottom'} {/content} diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl index af16c74215..ab4d4285a5 100644 --- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl @@ -23,12 +23,12 @@
    -
    +
    {lang}wcf.acp.updateServer.data{/lang} @@ -73,7 +73,6 @@
    - {if $packageUpdateServerID|isset}{/if}
    diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl index 44128666b2..b62ffd7fe1 100644 --- a/wcfsetup/install/files/acp/templates/updateServerList.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl @@ -26,7 +26,7 @@
    @@ -47,7 +47,7 @@ {lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} {/if} {lang}wcf.acp.updateServer.lastUpdateTime{/lang}{if $sortField == 'lastUpdateTime'} {/if} - {event name='headColumns'} + {event name='columnHeads'} @@ -60,7 +60,7 @@ - {event name='buttons'} + {event name='itemButtons'}

    {@$updateServer->packageUpdateServerID}

    {$updateServer->serverURL}

    @@ -85,7 +85,7 @@ diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl index c8a5c4b887..f9af965df0 100644 --- a/wcfsetup/install/files/acp/templates/userAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userAdd.tpl @@ -32,7 +32,7 @@
  • {lang}wcf.acp.menu.link.user.list{/lang}
  • {lang}wcf.acp.user.search{/lang}
    • - {event name='largeButtons'} + {event name='contentNavigationButtons'} @@ -68,6 +68,8 @@ {/if} + + {event name='generalFields'} {if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')} @@ -101,6 +103,8 @@ {/if} + + {event name='emailFields'} {/if} @@ -135,6 +139,8 @@ {/if} + + {event name='passwordFields'} {/if} @@ -147,8 +153,6 @@ {foreach from=$optionTree item=categoryLevel1}
  • {lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}
    • {/foreach} - - {event name='tabMenuTabs'} @@ -200,8 +204,6 @@ {/foreach} {/foreach} - - {event name='tabMenuContent'} {/if} diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl index f0e5df9508..66b470e6ed 100644 --- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl +++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl @@ -10,6 +10,18 @@

    {lang}wcf.global.form.error{/lang}

    {/if} +{hascontent} +
    + +
    +{/hascontent} +
    @@ -18,6 +30,8 @@
    {implode from=$users item=$user}{$user}{/implode}
    + + {event name='markedUserFields'}
    @@ -33,7 +47,11 @@ {/if}
    + + {event name='userGroupFields'}
    + + {event name='fieldsets'}
    diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl index 122fbdb3c4..9b44aa9f12 100644 --- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl +++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl @@ -14,6 +14,18 @@ +{hascontent} +
    + +
    +{/hascontent} +
    @@ -22,6 +34,8 @@
    {implode from=$users item=$user}{$user}{/implode}
    + + {event name='markedUserFields'}
    @@ -48,8 +62,11 @@ + + {event name='emailAddressFormatFields'}
    + {event name='fieldsets'}
    diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index 99329f39f2..cb15b9d57a 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -31,7 +31,7 @@
    diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl index c90c4b8f5f..5cdebff400 100644 --- a/wcfsetup/install/files/acp/templates/userGroupList.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl @@ -21,9 +21,11 @@ @@ -61,7 +63,7 @@ {/if} - {event name='buttons'} + {event name='rowButtons'}

    {@$group->groupID}

    @@ -94,9 +96,11 @@ diff --git a/wcfsetup/install/files/acp/templates/userGroupOption.tpl b/wcfsetup/install/files/acp/templates/userGroupOption.tpl index 538ac87271..5429729da1 100644 --- a/wcfsetup/install/files/acp/templates/userGroupOption.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupOption.tpl @@ -14,7 +14,17 @@ -
    +{hascontent} +
    + +
    +{/hascontent}

    {lang}wcf.acp.group.option.hint{/lang}

    @@ -39,6 +49,8 @@ {/foreach} + {event name='fieldsets'} +
    diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index 6f872fdd61..31ee77ff27 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -43,7 +43,7 @@ {/if}
  • {lang}wcf.acp.user.search{/lang}
    • - {event name='largeButtons'} + {event name='contentNavigationButtonsTop'}
    @@ -69,7 +69,7 @@ {lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if} {/foreach} - {event name='headColumns'} + {event name='columnHeads'} @@ -90,7 +90,7 @@ {/if} - {event name='buttons'} + {event name='rowButtons'}

    {@$user->userID}

    {if $user->editable}{$user->username}{else}{$user->username}{/if}

    @@ -119,7 +119,7 @@ {/if}
  • {lang}wcf.acp.user.search{/lang}
    • - {event name='largeButtons'} + {event name='contentNavigationButtonsBottom'}
    diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl index c3b2e2e12d..f046c68259 100644 --- a/wcfsetup/install/files/acp/templates/userMail.tpl +++ b/wcfsetup/install/files/acp/templates/userMail.tpl @@ -36,7 +36,7 @@
  • {lang}wcf.acp.menu.link.user.list{/lang}
  • {lang}wcf.acp.user.search{/lang}
    • - {event name='largeButtons'} + {event name='contentNavigationButtons'} @@ -50,6 +50,8 @@
    {implode from=$userList item=$user}{$user}{/implode}
    + + {event name='markedUserFields'} {/if} @@ -71,6 +73,8 @@ {/if} + + {event name='userGroupFields'} {/if} diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl index 5b8cad36f5..9d56ee5959 100644 --- a/wcfsetup/install/files/acp/templates/userSearch.tpl +++ b/wcfsetup/install/files/acp/templates/userSearch.tpl @@ -19,12 +19,6 @@

    {lang}wcf.acp.user.search.error.noMatches{/lang}

    {/if} -{*if $deletedUsers} -

    {lang}wcf.acp.user.delete.success{/lang}

    -{elseif $deletedUsers === 0} -

    {lang}wcf.acp.user.delete.error{/lang}

    -{/if*} -
    @@ -89,6 +83,8 @@ {/if} + + {event name='generalFields'} {event name='fieldsets'} @@ -116,6 +112,8 @@ {include file='optionFieldList' options=$category[options] langPrefix='wcf.user.option.'} {/foreach} + + {event name='profileFieldsets'} {/if} @@ -133,7 +131,7 @@ - + {if $additionalSortFields|isset}{@$additionalSortFields}{/if} @@ -144,7 +142,7 @@ - +
    @@ -177,8 +175,9 @@
    - + + {event name='resultOptionFieldsets'} diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl index 89a7a55ccc..257c965457 100644 --- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl @@ -76,6 +76,18 @@

    {lang}wcf.acp.user.massProcessing.success{/lang}

    {/if} +{hascontent} +
    + +
    +{/hascontent} +
    @@ -116,6 +128,8 @@ {/if} + + {event name='generalFields'}
    {event name='fieldsets'} @@ -140,7 +154,7 @@ {/if} - {event name='tabMenuContent'} + {event name='tabMenuContents'}
    {/hascontent} @@ -221,8 +235,8 @@ - - + +
    -- 2.20.1