From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 23 Jun 2016 19:40:59 +0000 (+0200)
Subject: Added option to disable the generic content header
X-Git-Tag: 3.0.0_Beta_1~1366
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e3ec1a9d72ecb8894cdb128b0a006d7e495aee04;p=GitHub%2FWoltLab%2FWCF.git

Added option to disable the generic content header
---

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 @@
 			<div id="content" class="content">
 				{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}
-						<header class="contentHeader">
-							<div class="contentHeaderTitle">
-								<h1 class="contentTitle">{@$contentTitle}</h1>
-								{if !$contentDescription|empty}<p class="contentHeaderDescription">{@$contentDescription}</p>{/if}
-							</div>
-							
-							{hascontent}
-								<nav class="contentHeaderNavigation">
-									<ul>
-										{content}
-											{if !$contentHeaderNavigation|empty}{@$contentHeaderNavigation}{/if}
-											
-											{event name='contentHeaderNavigation'}
-										{/content}
-									</ul>
-								</nav>
-							{/hascontent}
-						</header>
+				{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}
+							<header class="contentHeader">
+								<div class="contentHeaderTitle">
+									<h1 class="contentTitle">{@$contentTitle}</h1>
+									{if !$contentDescription|empty}<p class="contentHeaderDescription">{@$contentDescription}</p>{/if}
+								</div>
+								
+								{hascontent}
+									<nav class="contentHeaderNavigation">
+										<ul>
+											{content}
+												{if !$contentHeaderNavigation|empty}{@$contentHeaderNavigation}{/if}
+												
+												{event name='contentHeaderNavigation'}
+											{/content}
+										</ul>
+									</nav>
+								{/hascontent}
+							</header>
+						{/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}
 
 <p class="error">{lang}wcf.global.error.permissionDenied{/lang}</p>
 
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}
 	
 <p id="errorMessage" class="error">
 	{@$message}