From e3ec1a9d72ecb8894cdb128b0a006d7e495aee04 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 23 Jun 2016 21:40:59 +0200 Subject: [PATCH] Added option to disable the generic content header --- com.woltlab.wcf/templates/header.tpl | 64 ++++++++++--------- .../templates/permissionDenied.tpl | 2 +- com.woltlab.wcf/templates/userException.tpl | 2 +- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl index 1acf6bf1da..df66bc2182 100644 --- a/com.woltlab.wcf/templates/header.tpl +++ b/com.woltlab.wcf/templates/header.tpl @@ -100,37 +100,39 @@
{if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if} - {if !$contentHeader|empty} - {@$contentHeader} - {else} - {if $contentTitle|empty} - {if $__wcf->isLandingPage()} - {capture assign='contentTitle'}{PAGE_TITLE|language}{/capture} - {capture assign='contentDescription'}{PAGE_DESCRIPTION|language}{/capture} - {elseif $__wcf->getActivePage() != null && $__wcf->getActivePage()->getTitle()} - {capture assign='contentTitle'}{$__wcf->getActivePage()->getTitle()}{/capture} - {/if} - {/if} - - {if !$contentTitle|empty} -
-
-

{@$contentTitle}

- {if !$contentDescription|empty}

{@$contentDescription}

{/if} -
- - {hascontent} - - {/hascontent} -
+ {if $__disableContentHeader|empty} + {if !$contentHeader|empty} + {@$contentHeader} + {else} + {if $contentTitle|empty} + {if $__wcf->isLandingPage()} + {capture assign='contentTitle'}{PAGE_TITLE|language}{/capture} + {capture assign='contentDescription'}{PAGE_DESCRIPTION|language}{/capture} + {elseif $__wcf->getActivePage() != null && $__wcf->getActivePage()->getTitle()} + {capture assign='contentTitle'}{$__wcf->getActivePage()->getTitle()}{/capture} + {/if} + {/if} + + {if !$contentTitle|empty} +
+
+

{@$contentTitle}

+ {if !$contentDescription|empty}

{@$contentDescription}

{/if} +
+ + {hascontent} + + {/hascontent} +
+ {/if} {/if} {/if} diff --git a/com.woltlab.wcf/templates/permissionDenied.tpl b/com.woltlab.wcf/templates/permissionDenied.tpl index 764c704a8a..c80fdf37a0 100644 --- a/com.woltlab.wcf/templates/permissionDenied.tpl +++ b/com.woltlab.wcf/templates/permissionDenied.tpl @@ -1,6 +1,6 @@ {capture assign='pageTitle'}{lang}wcf.global.error.permissionDenied.title{/lang}{/capture} -{include file='header' __disableAds=true} +{include file='header' __disableAds=true __disableContentHeader=true}

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

diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl index f8bb4d4987..66b2f430e5 100644 --- a/com.woltlab.wcf/templates/userException.tpl +++ b/com.woltlab.wcf/templates/userException.tpl @@ -1,6 +1,6 @@ {capture assign='pageTitle'}{lang}wcf.global.error.title{/lang}{/capture} -{include file='header' __disableAds=true} +{include file='header' __disableAds=true __disableContentHeader=true}

{@$message} -- 2.20.1