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 1acf6bf1daee1e299a7a586eb0a04c327c193f2f..df66bc218296390be9793d66582ee36db8045eaa 100644 (file)
--- 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 764c704a8ac1a9cd54ed99b95a4bc0cfdbdb8479..c80fdf37a025b2f4aa2ef936b83f3ecaeca34688 100644 (file)
--- 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 f8bb4d4987d932d3615d0aa02ac2c8fb45a27038..66b2f430e59dd6e8ec2b1d1f2eb47ad3dfa8c2d5 100644 (file)
--- 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}