From: Marcel Werk Date: Fri, 22 Apr 2016 14:56:42 +0000 (+0200) Subject: Template overhaul X-Git-Tag: 3.0.0_Beta_1~1837^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e93caf9fdf77283264030fbdf8c706d50d8182c;p=GitHub%2FWoltLab%2FWCF.git Template overhaul * Moved documentHeader, head, body, contentHeader, userNotice into header.tpl * Moved closing head / body tags into footer.tpl * Moved position of 'contentTop' boxes * Unified template code --- diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl index fe438e86cc..71d1ace6b1 100644 --- a/com.woltlab.wcf/templates/accountManagement.tpl +++ b/com.woltlab.wcf/templates/accountManagement.tpl @@ -1,33 +1,11 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.accountManagement{/lang} - {lang}wcf.user.usercp{/lang}{/capture} - - {lang}wcf.user.accountManagement{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.accountManagement{/lang}{/capture} {include file='userMenuSidebar'} {include file='header'} -
-
-

{lang}wcf.user.accountManagement{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'}

{lang}wcf.user.accountManagement.warning{/lang}

@@ -290,6 +268,3 @@ {include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl index 62c21721b6..ac66906b2c 100644 --- a/com.woltlab.wcf/templates/avatarEdit.tpl +++ b/com.woltlab.wcf/templates/avatarEdit.tpl @@ -1,33 +1,11 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.avatar.edit{/lang} - {lang}wcf.user.usercp{/lang}{/capture} - - {lang}wcf.user.avatar.edit{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.avatar.edit{/lang}{/capture} {include file='userMenuSidebar'} {include file='header'} -
-
-

{lang}wcf.user.avatar.edit{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {if $__wcf->user->disableAvatar}

{lang}wcf.user.avatar.error.disabled{/lang}

{/if} @@ -105,8 +83,6 @@ {/if} -{include file='footer'} - {if $__wcf->getSession()->getPermission('user.profile.avatar.canUploadAvatar')} {/if} - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/cms.tpl b/com.woltlab.wcf/templates/cms.tpl index bac53b2029..134012f5b8 100644 --- a/com.woltlab.wcf/templates/cms.tpl +++ b/com.woltlab.wcf/templates/cms.tpl @@ -1,50 +1,46 @@ -{include file='documentHeader'} +{if !$__wcf->isLandingPage()} + {capture assign='pageTitle'}{$content[title]}{/capture} +{/if} - - {if !$__wcf->isLandingPage()}{$content[title]} - {/if}{PAGE_TITLE|language} - - {include file='headInclude'} - +{capture assign='headContent'} - +{/capture} - +{capture assign='contentHeader'} + {if $__wcf->isLandingPage()} +
+
+

{PAGE_TITLE|language}

+ {hascontent}

{content}{PAGE_DESCRIPTION|language}{/content}

{/hascontent} +
+ + {hascontent} + + {/hascontent} +
+ {elseif $content[title]} +
+
+

{$content[title]}

+
+ + {hascontent} + + {/hascontent} +
+ {/if} +{/capture} {include file='header'} -{if $__wcf->isLandingPage()} -
-
-

{PAGE_TITLE|language}

- {hascontent}

{content}{PAGE_DESCRIPTION|language}{/content}

{/hascontent} -
- - {hascontent} - - {/hascontent} -
-{elseif $content[title]} -
-
-

{$content[title]}

-
- - {hascontent} - - {/hascontent} -
-{/if} - -{include file='userNotice'} - {if $content[content]} {if $page->pageType == 'text'}
@@ -68,6 +64,3 @@ {include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/deletedContentList.tpl b/com.woltlab.wcf/templates/deletedContentList.tpl index 8b1734f1e6..a5eabd842a 100644 --- a/com.woltlab.wcf/templates/deletedContentList.tpl +++ b/com.woltlab.wcf/templates/deletedContentList.tpl @@ -1,12 +1,4 @@ -{include file='documentHeader'} - - - {lang}wcf.moderation.deletedContent.objectType.{@$objectType}{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='pageTitle'}{lang}wcf.moderation.deletedContent.objectType.{@$objectType}{/lang}{/capture} {capture assign='sidebarLeft'}
@@ -24,23 +16,23 @@
{/capture} -{include file='header'} - -
-
-

{lang}wcf.moderation.deletedContent.{@$objectType}{/lang}

-
- - {hascontent} - - {/hascontent} -
+{capture assign='contentHeader'} +
+
+

{lang}wcf.moderation.deletedContent.{@$objectType}{/lang}

+
+ + {hascontent} + + {/hascontent} +
+{/capture} -{include file='userNotice'} +{include file='header'} {hascontent}
@@ -71,6 +63,3 @@ {include file='footer'} - - - \ No newline at end of file diff --git a/com.woltlab.wcf/templates/disclaimer.tpl b/com.woltlab.wcf/templates/disclaimer.tpl index d3be1292d9..79b011bf4a 100644 --- a/com.woltlab.wcf/templates/disclaimer.tpl +++ b/com.woltlab.wcf/templates/disclaimer.tpl @@ -1,31 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.register.disclaimer{/lang}{/capture} - - {lang}wcf.user.register.disclaimer{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.register.disclaimer{/lang}{/capture} {include file='header' __disableAds=true} -
-
-

{lang}wcf.user.register.disclaimer{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'}
@@ -45,6 +23,3 @@
{include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl index 65ff3ab79d..c6dd004669 100644 --- a/com.woltlab.wcf/templates/editHistory.tpl +++ b/com.woltlab.wcf/templates/editHistory.tpl @@ -1,21 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{$object->getTitle()} - {lang}wcf.edit.versions{/lang}{/capture} - - {$object->getTitle()} - {lang}wcf.edit.versions{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.edit.versions{/lang}: {$object->getTitle()}{/capture} {include file='header'} -
-

{lang}wcf.edit.versions{/lang}: {$object->getTitle()}

-
- -{include file='userNotice'} - {if $diff}
@@ -131,6 +119,3 @@ {include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/emailActivation.tpl b/com.woltlab.wcf/templates/emailActivation.tpl index e100ad43fd..37e6890967 100644 --- a/com.woltlab.wcf/templates/emailActivation.tpl +++ b/com.woltlab.wcf/templates/emailActivation.tpl @@ -1,31 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.emailActivation{/lang}{/capture} - - {lang}wcf.user.emailActivation{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.emailActivation{/lang}{/capture} {include file='header'} -
-
-

{lang}wcf.user.emailActivation{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'}
@@ -67,6 +45,3 @@
{include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/emailNewActivationCode.tpl b/com.woltlab.wcf/templates/emailNewActivationCode.tpl index d89a784732..0758a09827 100644 --- a/com.woltlab.wcf/templates/emailNewActivationCode.tpl +++ b/com.woltlab.wcf/templates/emailNewActivationCode.tpl @@ -1,30 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.newActivationCode{/lang}{/capture} - - {lang}wcf.user.newActivationCode{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.newActivationCode{/lang}{/capture} {include file='header'} -
-
-

{lang}wcf.user.newActivationCode{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'}
@@ -75,6 +54,3 @@
{include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/following.tpl b/com.woltlab.wcf/templates/following.tpl index 07f01f0aaf..81860292da 100644 --- a/com.woltlab.wcf/templates/following.tpl +++ b/com.woltlab.wcf/templates/following.tpl @@ -1,40 +1,11 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.following{/lang} - {lang}wcf.user.usercp{/lang}{/capture} - - {lang}wcf.user.following{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - - - +{capture assign='contentTitle'}{lang}wcf.user.following{/lang} {#$items}{/capture} {include file='userMenuSidebar'} {include file='header'} -
-
-

{lang}wcf.user.following{/lang} {#$items}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {hascontent}
{content}{pages print=true assign=pagesLinks controller='Following' link="pageNo=%d"}{/content} @@ -86,7 +57,12 @@

{lang}wcf.user.following.noUsers{/lang}

{/if} -{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl index e850feb941..dbbdd4a33d 100644 --- a/com.woltlab.wcf/templates/footer.tpl +++ b/com.woltlab.wcf/templates/footer.tpl @@ -90,3 +90,6 @@ {@FOOTER_CODE} + + + diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl index 3864e77913..04c2bbf71d 100644 --- a/com.woltlab.wcf/templates/header.tpl +++ b/com.woltlab.wcf/templates/header.tpl @@ -1,3 +1,17 @@ +{include file='documentHeader'} + + + {if $pageTitle|isset}{@$pageTitle} - {/if}{PAGE_TITLE|language} + + {include file='headInclude'} + + {if !$headContent|empty} + {@$headContent} + {/if} + + + +
@@ -75,6 +89,27 @@
{if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if} + {if !$contentHeader|empty} + {@$contentHeader} + {elseif !$contentTitle|empty} +
+
+

{@$contentTitle}

+ {if !$contentDescription|empty}

{@$contentDescription}

{/if} +
+ + {hascontent} + + {/hascontent} +
+ {/if} + + {include file='userNotice'} + {hascontent}
diff --git a/com.woltlab.wcf/templates/ignoredUsers.tpl b/com.woltlab.wcf/templates/ignoredUsers.tpl index bd9225ef25..cf43c03b55 100644 --- a/com.woltlab.wcf/templates/ignoredUsers.tpl +++ b/com.woltlab.wcf/templates/ignoredUsers.tpl @@ -1,40 +1,11 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.ignoredUsers{/lang} - {lang}wcf.user.usercp{/lang}{/capture} - - {lang}wcf.user.ignoredUsers{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - - - +{capture assign='contentTitle'}{lang}wcf.user.ignoredUsers{/lang} {#$items}{/capture} {include file='userMenuSidebar'} {include file='header'} -
-
-

{lang}wcf.user.ignoredUsers{/lang} {#$items}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {hascontent}
{content}{pages print=true assign=pagesLinks controller='IgnoredUsers' link="pageNo=%d"}{/content} @@ -86,7 +57,12 @@

{lang}wcf.user.ignoredUsers.noUsers{/lang}

{/if} -{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl index 0dcf4ea2d5..d063a44db5 100644 --- a/com.woltlab.wcf/templates/login.tpl +++ b/com.woltlab.wcf/templates/login.tpl @@ -1,36 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.login{/lang}{/capture} - - {lang}wcf.user.login{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.login{/lang}{/capture} - {include file='header' __disableLoginLink=true __disableAds=true} -
-

{lang}wcf.user.login{/lang}

- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {if !$errorField|empty && $errorField == 'cookie'}

{lang}wcf.user.login.error.cookieRequired{/lang}

{else} @@ -150,7 +123,12 @@
-{include file='footer' __disableAds=true} + - - +{include file='footer' __disableAds=true} diff --git a/com.woltlab.wcf/templates/lostPassword.tpl b/com.woltlab.wcf/templates/lostPassword.tpl index ac7bbf4bbe..4069e6480c 100644 --- a/com.woltlab.wcf/templates/lostPassword.tpl +++ b/com.woltlab.wcf/templates/lostPassword.tpl @@ -1,38 +1,9 @@ -{include file="documentHeader"} +{capture assign='pageTitle'}{lang}wcf.user.lostPassword{/lang}{/capture} - - {lang}wcf.user.lostPassword{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - - - +{capture assign='contentTitle'}{lang}wcf.user.lostPassword{/lang}{/capture} {include file='header'} -
-
-

{lang}wcf.user.lostPassword{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} -

{lang}wcf.user.lostPassword.description{/lang}

{include file='formError'} @@ -83,7 +54,12 @@
-{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/mail.tpl b/com.woltlab.wcf/templates/mail.tpl index 5dd62060b0..64a11a3d1e 100644 --- a/com.woltlab.wcf/templates/mail.tpl +++ b/com.woltlab.wcf/templates/mail.tpl @@ -1,30 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.mail.title{/lang}{/capture} - - {lang}wcf.user.mail.title{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - +{capture assign='contentTitle'}{lang}wcf.user.mail.title{/lang}{/capture} - {include file='header'} -
-
-

{lang}wcf.user.mail.title{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'}
@@ -107,6 +86,3 @@
{include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl index 59c10992b4..9627ffdb31 100644 --- a/com.woltlab.wcf/templates/membersList.tpl +++ b/com.woltlab.wcf/templates/membersList.tpl @@ -1,11 +1,10 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture} - - {if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} {if $pageNo > 1}- {lang}wcf.page.pageNo{/lang} {/if}- {PAGE_TITLE|language} - - {include file='headInclude'} - - {capture assign='canonicalURLParameters'}sortField={@$sortField}&sortOrder={@$sortOrder}{if $letter}&letter={@$letter|rawurlencode}{/if}{/capture} +{capture assign='contentTitle'}{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} {#$items}{/capture} + +{capture assign='canonicalURLParameters'}sortField={@$sortField}&sortOrder={@$sortOrder}{if $letter}&letter={@$letter|rawurlencode}{/if}{/capture} + +{capture assign='headContent'} {if $pageNo < $pages} {/if} @@ -13,30 +12,7 @@ {/if} - - - - - +{/capture} {capture assign='sidebarRight'} {assign var=encodedLetter value=$letter|rawurlencode} @@ -104,22 +80,6 @@ {include file='header'} -
-
-

{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} {#$items}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {hascontent}
{content} @@ -160,7 +120,25 @@ {/hascontent} -{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl index 96d0d00f64..050b7a658e 100644 --- a/com.woltlab.wcf/templates/moderationActivation.tpl +++ b/com.woltlab.wcf/templates/moderationActivation.tpl @@ -1,82 +1,55 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.moderation.activation{/lang}: {$queue->getTitle()}{/capture} - - {lang}wcf.moderation.activation{/lang}: {$queue->getTitle()} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - - - - -{include file='header'} - -
-
-

{lang}wcf.moderation.activation{/lang}

- - {if $queue->lastChangeTime} -
-
{lang}wcf.moderation.lastChangeTime{/lang}
-
{@$queue->lastChangeTime|time}
+ {if $queue->lastChangeTime} +
+
{lang}wcf.moderation.lastChangeTime{/lang}
+
{@$queue->lastChangeTime|time}
+
+ {/if} + +
+
{lang}wcf.moderation.assignedUser{/lang}
+
+ + {if $queue->assignedUserID} + {$queue->assignedUsername} + {else} + {lang}wcf.moderation.assignedUser.nobody{/lang} + {/if} + +
- {/if} - -
-
{lang}wcf.moderation.assignedUser{/lang}
-
- - {if $queue->assignedUserID} - {$queue->assignedUsername} - {else} - {lang}wcf.moderation.assignedUser.nobody{/lang} - {/if} - -
-
+ +
+
{lang}wcf.moderation.status{/lang}
+
{$queue->getStatus()}
+
+
-
-
{lang}wcf.moderation.status{/lang}
-
{$queue->getStatus()}
-
-
- - {hascontent} - - {/hascontent} - + {hascontent} + + {/hascontent} + +{/capture} -{include file='userNotice'} +{include file='header'} {include file='formError'} @@ -102,7 +75,23 @@
-{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl index 9c782c795d..83aa2708f9 100644 --- a/com.woltlab.wcf/templates/moderationList.tpl +++ b/com.woltlab.wcf/templates/moderationList.tpl @@ -1,21 +1,6 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.moderation.moderation{/lang}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture} - - {lang}wcf.moderation.moderation{/lang} {if $pageNo > 1}- {lang}wcf.page.pageNo{/lang} {/if}- {PAGE_TITLE|language} - - {include file='headInclude'} - - - - - +{capture assign='contentTitle'}{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} {#$items}{/capture} {capture assign='sidebarLeft'}
@@ -68,22 +53,6 @@ {include file='header'} -
-
-

{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} {#$items}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {hascontent}
{content}{pages print=true assign=pagesLinks controller='ModerationList' link="definitionID=$definitionID&assignedUserID=$assignedUserID&status=$status&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content} @@ -156,7 +125,13 @@

{lang}wcf.global.noItems{/lang}

{/if} -{include file='footer'} + - - \ No newline at end of file +{include file='footer'} diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl index 2579e280b1..2fe86cd73e 100644 --- a/com.woltlab.wcf/templates/moderationReport.tpl +++ b/com.woltlab.wcf/templates/moderationReport.tpl @@ -1,82 +1,54 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.moderation.report{/lang}: {$queue->getTitle()}{/capture} - - {lang}wcf.moderation.report{/lang}: {$queue->getTitle()} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - - - - -{include file='header'} - -
-
-

{lang}wcf.moderation.report{/lang}

- - {if $queue->lastChangeTime} -
-
{lang}wcf.moderation.lastChangeTime{/lang}
-
{@$queue->lastChangeTime|time}
+ {if $queue->lastChangeTime} +
+
{lang}wcf.moderation.lastChangeTime{/lang}
+
{@$queue->lastChangeTime|time}
+
+ {/if} + +
+
{lang}wcf.moderation.assignedUser{/lang}
+
+ + {if $queue->assignedUserID} + {$queue->assignedUsername} + {else} + {lang}wcf.moderation.assignedUser.nobody{/lang} + {/if} + +
- {/if} - -
-
{lang}wcf.moderation.assignedUser{/lang}
-
- - {if $queue->assignedUserID} - {$queue->assignedUsername} - {else} - {lang}wcf.moderation.assignedUser.nobody{/lang} - {/if} - -
-
+ +
+
{lang}wcf.moderation.status{/lang}
+
{$queue->getStatus()}
+
+
-
-
{lang}wcf.moderation.status{/lang}
-
{$queue->getStatus()}
-
-
- - {hascontent} - + {/hascontent} + +{/capture} -{include file='userNotice'} +{include file='header'} {include file='formError'} @@ -132,7 +104,24 @@
-{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/newPassword.tpl b/com.woltlab.wcf/templates/newPassword.tpl index fbad48f339..4995bc5727 100644 --- a/com.woltlab.wcf/templates/newPassword.tpl +++ b/com.woltlab.wcf/templates/newPassword.tpl @@ -1,30 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.newPassword{/lang}{/capture} - - {lang}wcf.user.newPassword{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.newPassword{/lang}{/capture} {include file='header'} -
-
-

{lang}wcf.user.newPassword{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'}
@@ -73,6 +52,3 @@
{include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl index 4526e0bf53..d342195906 100644 --- a/com.woltlab.wcf/templates/notificationList.tpl +++ b/com.woltlab.wcf/templates/notificationList.tpl @@ -1,48 +1,28 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.usercp{/lang}{/capture} - - {lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - - - +{capture assign='contentHeader'} +
+
+

{lang}wcf.user.notification.notifications{/lang} {#$__wcf->getUserNotificationHandler()->countAllNotifications()}

+
+ + {hascontent} + + {/hascontent} +
+{/capture} {include file='userMenuSidebar'} {include file='header'} -
-
-

{lang}wcf.user.notification.notifications{/lang} {#$__wcf->getUserNotificationHandler()->countAllNotifications()}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {hascontent}
{content}{pages print=true assign=pagesLinks controller='NotificationList' link="pageNo=%d"}{/content} @@ -125,7 +105,17 @@

{lang}wcf.user.notification.noNotifications{/lang}

{/if} -{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/notificationSettings.tpl b/com.woltlab.wcf/templates/notificationSettings.tpl index 818b33dd48..566d6a8b81 100644 --- a/com.woltlab.wcf/templates/notificationSettings.tpl +++ b/com.woltlab.wcf/templates/notificationSettings.tpl @@ -1,46 +1,13 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.menu.settings{/lang}{/capture} - - {lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.menu.settings{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang}{/capture} - +{capture assign='contentDescription'}{lang}wcf.user.notification.notifications.description{/lang}{/capture} {include file='userMenuSidebar'} {include file='header'} -
-
-

{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang}

-

{lang}wcf.user.notification.notifications.description{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'} {if $success|isset} @@ -98,7 +65,16 @@
-{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/offline.tpl b/com.woltlab.wcf/templates/offline.tpl index c5a5e02729..bd4a046d97 100644 --- a/com.woltlab.wcf/templates/offline.tpl +++ b/com.woltlab.wcf/templates/offline.tpl @@ -1,13 +1,3 @@ -{include file='documentHeader'} - - - {PAGE_TITLE|language} - - {include file='headInclude'} - - - - {include file='header' skipBreadcrumbs=true}
@@ -16,6 +6,3 @@
{include file='footer'} - - - \ No newline at end of file diff --git a/com.woltlab.wcf/templates/paidSubscriptionList.tpl b/com.woltlab.wcf/templates/paidSubscriptionList.tpl index ea282297b7..b26a8a017f 100644 --- a/com.woltlab.wcf/templates/paidSubscriptionList.tpl +++ b/com.woltlab.wcf/templates/paidSubscriptionList.tpl @@ -1,10 +1,8 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.menu.settings.paidSubscription{/lang} - {lang}wcf.user.menu.settings{/lang}{/capture} - - {lang}wcf.user.menu.settings.paidSubscription{/lang} - {lang}wcf.user.menu.settings{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - +{capture assign='contentTitle'}{lang}wcf.user.menu.settings.paidSubscription{/lang}{/capture} + +{capture assign='headContent'} {if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION} - +{capture assign='contentTitle'}{lang}wcf.user.recentActivity{/lang}{/capture} - +{capture assign='headContent'} + +{/capture} {include file='header'} -
-
-

{lang}wcf.user.recentActivity{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {if $eventList|count}
{include file='footer' __disableAds=true} - - - diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl index e16a101c75..a8ca146dac 100644 --- a/com.woltlab.wcf/templates/register.tpl +++ b/com.woltlab.wcf/templates/register.tpl @@ -1,59 +1,17 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.register{/lang}{/capture} - - {lang}wcf.user.register{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.register{/lang}{/capture} + +{capture assign='headContent'} - +{/capture} - {include file='header' __disableLoginLink=true __disableAds=true} -
-
-

{lang}wcf.user.register{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {if $isExternalAuthentication}

{lang}wcf.user.3rdparty.{$__wcf->session->getVar('__3rdPartyProvider')}.register{/lang}

{/if} @@ -236,7 +194,28 @@ -{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/registerActivation.tpl b/com.woltlab.wcf/templates/registerActivation.tpl index 7c33ae05f5..d491ff20ad 100644 --- a/com.woltlab.wcf/templates/registerActivation.tpl +++ b/com.woltlab.wcf/templates/registerActivation.tpl @@ -1,30 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.registerActivation{/lang}{/capture} - - {lang}wcf.user.registerActivation{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.registerActivation{/lang}{/capture} {include file='header'} -
-
-

{lang}wcf.user.registerActivation{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {if $__wcf->user->userID && $__wcf->user->activationCode}

{lang}wcf.user.registerActivation.info{/lang}

{/if} {include file='formError'} @@ -68,5 +47,3 @@ {include file='footer'} - - diff --git a/com.woltlab.wcf/templates/registerNewActivationCode.tpl b/com.woltlab.wcf/templates/registerNewActivationCode.tpl index 38a307bf9a..496dd4b132 100644 --- a/com.woltlab.wcf/templates/registerNewActivationCode.tpl +++ b/com.woltlab.wcf/templates/registerNewActivationCode.tpl @@ -1,30 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.newActivationCode{/lang}{/capture} - - {lang}wcf.user.newActivationCode{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.user.newActivationCode{/lang}{/capture} {include file='header'} -
-
-

{lang}wcf.user.newActivationCode{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'}
@@ -88,6 +67,3 @@
{include file='footer'} - - - diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl index 9191e57009..9388be48d2 100644 --- a/com.woltlab.wcf/templates/search.tpl +++ b/com.woltlab.wcf/templates/search.tpl @@ -1,21 +1,9 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.search.title{/lang}{/capture} - - {lang}wcf.search.title{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentTitle'}{lang}wcf.search.title{/lang}{/capture} {include file='header'} -
-

{lang}wcf.search.title{/lang}

-
- -{include file='userNotice'} - {include file='formError'} {if $errorMessage|isset} @@ -131,8 +119,6 @@ -{include file='footer'} - - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/searchResult.tpl b/com.woltlab.wcf/templates/searchResult.tpl index f603ee48db..d77769d110 100644 --- a/com.woltlab.wcf/templates/searchResult.tpl +++ b/com.woltlab.wcf/templates/searchResult.tpl @@ -1,37 +1,29 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.search.results{/lang}{/capture} - - {lang}wcf.search.results{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - +{capture assign='contentHeader'} +
+
+

{if $query}{lang}wcf.search.results{/lang}{else}{lang}wcf.search.results{/lang}{/if}

+

{lang}wcf.search.results.description{/lang}

+
+ + {hascontent} + + {/hascontent} +
+{/capture} {include file='header'} -
-
-

{if $query}{lang}wcf.search.results{/lang}{else}{lang}wcf.search.results{/lang}{/if}

-

{lang}wcf.search.results.description{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {hascontent}
{content} @@ -65,6 +57,3 @@ {include file='footer'} - - - \ No newline at end of file diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl index f10c3760d4..220f59fc90 100644 --- a/com.woltlab.wcf/templates/settings.tpl +++ b/com.woltlab.wcf/templates/settings.tpl @@ -1,40 +1,11 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.option.category.settings.{$category}{/lang} - {lang}wcf.user.menu.settings{/lang}{/capture} - - {lang}wcf.user.option.category.settings.{$category}{/lang} - {lang}wcf.user.menu.settings{/lang} - {PAGE_TITLE|language} - {include file='headInclude'} - - - - - +{capture assign='contentTitle'}{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.option.category.settings.{$category}{/lang}{/capture} {include file='userMenuSidebar'} {include file='header'} -
-
-

{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.option.category.settings.{$category}{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'} {if $success|isset} @@ -134,7 +105,12 @@
-{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl index 8b8d4877f9..bc79d052bd 100644 --- a/com.woltlab.wcf/templates/signatureEdit.tpl +++ b/com.woltlab.wcf/templates/signatureEdit.tpl @@ -1,45 +1,11 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.signature.edit{/lang}{/capture} - - {lang}wcf.user.signature.edit{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - - - +{capture assign='contentTitle'}{lang}wcf.user.signature.edit{/lang}{/capture} {include file='userMenuSidebar'} {include file='header'} -
-
-

{lang}wcf.user.signature.edit{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {include file='formError'} {if $success|isset} @@ -102,8 +68,17 @@ {/if} -{include file='footer'} -{include file='wysiwyg'} + - - \ No newline at end of file +{include file='wysiwyg'} +{include file='footer'} diff --git a/com.woltlab.wcf/templates/tagged.tpl b/com.woltlab.wcf/templates/tagged.tpl index 657fdad9f3..2460e62822 100644 --- a/com.woltlab.wcf/templates/tagged.tpl +++ b/com.woltlab.wcf/templates/tagged.tpl @@ -1,10 +1,8 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang}{/capture} - - {lang}wcf.tagging.taggedObjects.{@$objectType}{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - +{capture assign='contentTitle'}{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang}{/capture} + +{capture assign='headContent'} {if $pageNo < $pages} {/if} @@ -12,9 +10,7 @@ {/if} - - - +{/capture} {capture assign='sidebarLeft'}
@@ -40,22 +36,6 @@ {include file='header'} -
-
-

{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {hascontent}
{content}{pages print=true assign=pagesLinks controller='Tagged' object=$tag link="objectType=$objectType&pageNo=%d"}{/content} @@ -85,6 +65,3 @@ {include file='footer'} - - - \ No newline at end of file diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl index 8ef578f87b..a12a02fa83 100644 --- a/com.woltlab.wcf/templates/team.tpl +++ b/com.woltlab.wcf/templates/team.tpl @@ -1,49 +1,13 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.team{/lang}{/capture} - - {lang}wcf.user.team{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - - - - - +{capture assign='contentTitle'}{lang}wcf.user.team{/lang}{/capture} - +{capture assign='headContent'} + +{/capture} {include file='header'} -
-
-

{lang}wcf.user.team{/lang}

-
- - {hascontent} - - {/hascontent} -
- -{include file='userNotice'} - {foreach from=$objects->getTeams() item=team}
@@ -69,7 +33,20 @@ {/hascontent} -{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl index 96f7fc297c..66811a5a04 100644 --- a/com.woltlab.wcf/templates/user.tpl +++ b/com.woltlab.wcf/templates/user.tpl @@ -1,10 +1,6 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{$user->username} - {lang}wcf.user.members{/lang}{/capture} - - {$user->username} - {lang}wcf.user.members{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - +{capture assign='headContent'} {event name='javascriptInclude'} @@ -38,7 +34,7 @@ {if $user->canEdit() || ($__wcf->getUser()->userID == $user->userID && $user->canEditOwnProfile())} WCF.Language.addObject({ - 'wcf.user.editProfile': '{lang}wcf.user.editProfile{/lang}', + 'wcf.user.editProfile': '{lang}wcf.user.editProfile{/lang}' }); new WCF.User.Profile.Editor({@$user->userID}, {if $editOnInit}true{else}false{/if}); @@ -135,9 +131,7 @@ } - - - +{/capture} {include file='userHeader' assign='boxesTop'} @@ -145,8 +139,6 @@ {include file='header'} -{include file='userNotice'} - {if !$user->isProtected()}
-{include file='footer'} + - - +{include file='footer'} diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl index 9380ef411c..3e43af0b26 100644 --- a/com.woltlab.wcf/templates/usersOnlineList.tpl +++ b/com.woltlab.wcf/templates/usersOnlineList.tpl @@ -1,34 +1,14 @@ -{include file='documentHeader'} +{capture assign='pageTitle'}{lang}wcf.user.usersOnline{/lang}{/capture} - - {lang}wcf.user.usersOnline{/lang} - {PAGE_TITLE|language} - - {include file='headInclude'} - +{capture assign='contentTitle'}{lang}wcf.user.usersOnline{/lang}{/capture} + +{capture assign='contentHeader'} - - - + {if USERS_ONLINE_PAGE_REFRESH > 0} {/if} - - - +{/capture} {capture assign='sidebarRight'}
@@ -92,22 +72,6 @@ {include file='header'} -{include file='userNotice'} - -
-
-

{lang}wcf.user.usersOnline{/lang}

-
- - {hascontent} - - {/hascontent} -
- {assign var=usersOnlineList value=''} {assign var=usersOnline value=0} {assign var=robotsOnlineList value=''} @@ -249,7 +213,20 @@ {/hascontent} -{include file='footer'} + - - +{include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/attachmentList.tpl b/wcfsetup/install/files/acp/templates/attachmentList.tpl index 576c952126..0e03c09125 100644 --- a/wcfsetup/install/files/acp/templates/attachmentList.tpl +++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl @@ -32,39 +32,41 @@

{lang}wcf.global.filter{/lang}

-
+
-
+
- +
-
+
- +
-
-
-
- -
-
+ {if $availableFileTypes|count > 1} +
+
+
+ +
+
+ {/if} {event name='filterFields'} -
+
+ +
+ + {@SECURITY_TOKEN_INPUT_TAG} +
- -
- - {@SECURITY_TOKEN_INPUT_TAG} -
{hascontent} diff --git a/wcfsetup/install/files/acp/templates/boxList.tpl b/wcfsetup/install/files/acp/templates/boxList.tpl index 11c2ac2ee2..51edbbe122 100644 --- a/wcfsetup/install/files/acp/templates/boxList.tpl +++ b/wcfsetup/install/files/acp/templates/boxList.tpl @@ -23,21 +23,6 @@
-{hascontent} -
- {content} - {assign var='linkParameters' value=''} - {if $name}{capture append=linkParameters}&name={@$name|rawurlencode}{/capture}{/if} - {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if} - {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if} - {if $position}{capture append=linkParameters}&position={@$position}{/capture}{/if} - {if $boxType}{capture append=linkParameters}&boxType={@$boxType|rawurlencode}{/capture}{/if} - - {pages print=true assign=pagesLinks controller="BoxList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"} - {/content} -
-{/hascontent} -

{lang}wcf.global.filter{/lang}

@@ -101,6 +86,21 @@
+{hascontent} +
+ {content} + {assign var='linkParameters' value=''} + {if $name}{capture append=linkParameters}&name={@$name|rawurlencode}{/capture}{/if} + {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if} + {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if} + {if $position}{capture append=linkParameters}&position={@$position}{/capture}{/if} + {if $boxType}{capture append=linkParameters}&boxType={@$boxType|rawurlencode}{/capture}{/if} + + {pages print=true assign=pagesLinks controller="BoxList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"} + {/content} +
+{/hascontent} + {if $objects|count}
diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl index 7fbe0a952d..e1c8169255 100644 --- a/wcfsetup/install/files/acp/templates/languageItemList.tpl +++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl @@ -29,11 +29,12 @@

{lang}wcf.global.filter{/lang}

-
+
-
+
- + {foreach from=$availableLanguageCategories item=availableLanguageCategory} {/foreach} @@ -54,28 +55,28 @@
-
+
- +
-
+
- +
{event name='filterFields'}
+ +
+ + {@SECURITY_TOKEN_INPUT_TAG} +
- -
- - {@SECURITY_TOKEN_INPUT_TAG} -
{if $objects|count} diff --git a/wcfsetup/install/files/acp/templates/mediaList.tpl b/wcfsetup/install/files/acp/templates/mediaList.tpl index f988b46454..8f0b5dad98 100644 --- a/wcfsetup/install/files/acp/templates/mediaList.tpl +++ b/wcfsetup/install/files/acp/templates/mediaList.tpl @@ -64,9 +64,9 @@

{lang}wcf.global.filter{/lang}

-
+
-
+
-
+
- +
{event name='filterFields'} -
+
+ +
+ + {@SECURITY_TOKEN_INPUT_TAG} +
- - {event name='sections'} - -
- - {@SECURITY_TOKEN_INPUT_TAG} -
{hascontent} diff --git a/wcfsetup/install/files/acp/templates/pageList.tpl b/wcfsetup/install/files/acp/templates/pageList.tpl index 3b6c80afe4..796423c320 100644 --- a/wcfsetup/install/files/acp/templates/pageList.tpl +++ b/wcfsetup/install/files/acp/templates/pageList.tpl @@ -25,21 +25,6 @@ -{hascontent} -
- {content} - {assign var='linkParameters' value=''} - {if $name}{capture append=linkParameters}&name={@$name|rawurlencode}{/capture}{/if} - {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if} - {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if} - {if $applicationPackageID}{capture append=linkParameters}&applicationPackageID={@$applicationPackageID}{/capture}{/if} - {if $pageType}{capture append=linkParameters}&pageType={@$pageType|rawurlencode}{/capture}{/if} - - {pages print=true assign=pagesLinks controller="PageList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"} - {/content} -
-{/hascontent} -

{lang}wcf.global.filter{/lang}

@@ -103,6 +88,21 @@
+{hascontent} +
+ {content} + {assign var='linkParameters' value=''} + {if $name}{capture append=linkParameters}&name={@$name|rawurlencode}{/capture}{/if} + {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if} + {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if} + {if $applicationPackageID}{capture append=linkParameters}&applicationPackageID={@$applicationPackageID}{/capture}{/if} + {if $pageType}{capture append=linkParameters}&pageType={@$pageType|rawurlencode}{/capture}{/if} + + {pages print=true assign=pagesLinks controller="PageList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"} + {/content} +
+{/hascontent} + {if $objects|count}
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl index e2f50e98fa..7cd99769f7 100644 --- a/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl @@ -27,27 +27,27 @@

{lang}wcf.global.filter{/lang}

-
+
-
+
- +
-
+
- +
- {if $availableSubscriptions|count} + {if $availableSubscriptions|count > 1}
-
+
+ {@SECURITY_TOKEN_INPUT_TAG} +
- -
- - {@SECURITY_TOKEN_INPUT_TAG} -
{hascontent} diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl index 50e68636ff..a1b97b18d5 100644 --- a/wcfsetup/install/files/acp/templates/templateList.tpl +++ b/wcfsetup/install/files/acp/templates/templateList.tpl @@ -40,44 +40,48 @@

{lang}wcf.global.filter{/lang}

-
-
-
-
- -
-
+
+ {if $availableTemplateGroups|count} +
+
+
+ +
+
+ {/if} -
-
-
- -
-
+ {if $availableApplications|count > 1} +
+
+
+ +
+
+ {/if}
-
+
- +
{event name='filterFields'}
+ +
+ + {@SECURITY_TOKEN_INPUT_TAG} +
- -
- - {@SECURITY_TOKEN_INPUT_TAG} -
{hascontent} diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 4797657fc3..842b975d99 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -1512,7 +1512,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 96e6b176b6..190d55d411 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1517,7 +1517,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> -