Added template events
authorMarcel Werk <burntime@woltlab.com>
Wed, 3 Apr 2013 19:37:24 +0000 (21:37 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 3 Apr 2013 19:37:24 +0000 (21:37 +0200)
24 files changed:
com.woltlab.wcf/template/breadcrumbs.tpl
com.woltlab.wcf/template/documentHeader.tpl
com.woltlab.wcf/template/footer.tpl
com.woltlab.wcf/template/headInclude.tpl
com.woltlab.wcf/template/header.tpl
com.woltlab.wcf/template/mainMenu.tpl
com.woltlab.wcf/template/mainMenuSubMenu.tpl
com.woltlab.wcf/template/redirect.tpl
wcfsetup/install/files/acp/templates/applicationManagement.tpl
wcfsetup/install/files/acp/templates/categoryAdd.tpl
wcfsetup/install/files/acp/templates/categoryList.tpl
wcfsetup/install/files/acp/templates/languageAdd.tpl
wcfsetup/install/files/acp/templates/languageExport.tpl
wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
wcfsetup/install/files/acp/templates/languageServerAdd.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/optionImport.tpl
wcfsetup/install/files/acp/templates/package.tpl
wcfsetup/install/files/acp/templates/styleAdd.tpl
wcfsetup/install/files/acp/templates/styleImport.tpl
wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
wcfsetup/install/files/acp/templates/userGroupOption.tpl
wcfsetup/install/files/acp/templates/usersMassProcessing.tpl

index ac669125180ac8ef4e48cc8d522542fe5a4f309b..7dedaf8bebb5742af03902102ea7ec617e70f4fb 100644 (file)
@@ -1,12 +1,16 @@
 {if !$__microdata|isset}{assign var=__microdata value=true}{/if}
-{if $__wcf->getBreadcrumbs()|count}
-<nav class="breadcrumbs marginTop">
-       <ul>
-               {foreach from=$__wcf->getBreadcrumbs() item=$breadcrumb}
-                       <li title="{$breadcrumb->getLabel()}"{if $__microdata} itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"{/if}>
-                               <a href="{$breadcrumb->getURL()}"{if $__microdata} itemprop="url"{/if}><span{if $__microdata} itemprop="title"{/if}>{$breadcrumb->getLabel()}</span></a> <span class="pointer"><span>&raquo;</span></span>
-                       </li>
-               {/foreach}
-       </ul>
-</nav>
-{/if}
+{hascontent}
+       <nav class="breadcrumbs marginTop">
+               <ul>
+                       {content}
+                               {foreach from=$__wcf->getBreadcrumbs() item=$breadcrumb}
+                                       <li title="{$breadcrumb->getLabel()}"{if $__microdata} itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"{/if}>
+                                               <a href="{$breadcrumb->getURL()}"{if $__microdata} itemprop="url"{/if}><span{if $__microdata} itemprop="title"{/if}>{$breadcrumb->getLabel()}</span></a> <span class="pointer"><span>&raquo;</span></span>
+                                       </li>
+                               {/foreach}
+                               
+                               {event name='breadcrumbs'}
+                       {/content}
+               </ul>
+       </nav>
+{/hascontent}
index 2c789893b71a27091fa785e55e45b97f93f8a080..786b3a288fb129ecf459b681423e1cce9457df93 100644 (file)
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<html dir="{lang}wcf.global.pageDirection{/lang}" lang="{@$__wcf->language->getFixedLanguageCode()}" xmlns:og="http://ogp.me/ns#" xmlns:profile="http://ogp.me/ns/profile#" xmlns:fb="http://www.facebook.com/2008/fbml" xmlns:woltlab="http://www.woltlab.com/ns#">
+<html dir="{lang}wcf.global.pageDirection{/lang}" lang="{@$__wcf->language->getFixedLanguageCode()}" xmlns:og="http://ogp.me/ns#" xmlns:profile="http://ogp.me/ns/profile#" xmlns:fb="http://www.facebook.com/2008/fbml" xmlns:woltlab="http://www.woltlab.com/ns#"{event name='namespaces'}>
index 01cd9034c977d424af2c8e4de632621e433c619c..e7d1bc4b16315382371d869e7215a3edd64295ac 100644 (file)
@@ -1,3 +1,5 @@
+                       {event name='contents'}
+                       
                        {if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if}
                        
                </section>
@@ -23,6 +25,8 @@
                </nav>
                
                <div class="footerContent">
+                       {event name='footerContents'}
+                       
                        {if ENABLE_BENCHMARK}{include file='benchmark'}{/if}
                
                        {event name='copyright'}
@@ -30,4 +34,6 @@
        </div>
 </footer>
 
+{event name='footer'}
+
 <a id="bottom"></a>
index 49ea5402dc2b25534ef32391b5debf592f90c900..0bc1b37ee4246c59ddd0f3a6c0c48dde29b4c66d 100644 (file)
@@ -3,6 +3,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1" />
 <meta name="format-detection" content="telephone=no" />
 {implode from=$__wcf->getMetaTagHandler() item=__metaTag glue="\n"}{@$__metaTag}{/implode}
+{event name='metaTags'}
 
 <script type="text/javascript">
        //<![CDATA[
@@ -27,6 +28,7 @@
 
 <!-- Stylesheets -->
 {@$__wcf->getStyleHandler()->getStylesheet()}
+{event name='stylesheets'}
 
 <noscript>
        <style type="text/css">
index 4e2ca15b17359a0726a9ae373d6f906030e2b508..86c1ad929b1a8c8b6121bdcc7104974045327948 100644 (file)
                <div id="logo" class="logo">
                        <a href="{link}{/link}">
                                <img src="{@$__wcf->getPath('wbb')}images/wbbLogo2.svg" alt="" style="height: 90px; width: 246px;" />
-                               {*event name='headerLogo'*}
+                               {event name='headerLogo'}
                        </a>
                </div>
                
+               {event name='headerContents'}
+               
                {include file='mainMenu'}
                
                <nav class="navigation navigationHeader clearfix">
                {if $sidebar|isset}
                        <aside class="sidebar"{if $sidebarOrientation|isset && $sidebarOrientation == 'right'} data-is-open="{if $sidebarCollapsed}false{else}true{/if}" data-sidebar-name="{$sidebarName}"{/if}>
                                <div>
+                                       {event name='sidebarBoxesTop'}
+                                       
                                        {@$sidebar}
+                                       
+                                       {event name='sidebarBoxesBottom'}
                                </div>
                        </aside>
                        
@@ -58,5 +64,7 @@
                                
                <section id="content" class="content clearfix">
                        
+                       {event name='contents'}
+                       
                        {if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if}
                        
\ No newline at end of file
index 39442240bab10611868cd9070466a891b84ff0bc..64e611f672ab092411e8be3256b8ffe58723d1eb 100644 (file)
@@ -7,6 +7,6 @@
                                *}{foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}{*
                                        *}<li{if $__wcf->getPageMenu()->getActiveMenuItem(1) == $subMenuItem->menuItem} class="active"{/if}><a href="{$subMenuItem->getProcessor()->getLink()}"><span>{lang}{$subMenuItem->menuItem}{/lang}</span></a>{if $subMenuItem->getProcessor()->getNotifications()} <span class="badge badgeUpdate">{#$subMenuItem->getProcessor()->getNotifications()}</span>{/if}</li>{*
                                *}{/foreach}{*
-               *}</ul>{/if}</li>{/foreach}</ul>
+               *}{event name='items'}</ul>{/if}</li>{/foreach}</ul>
        </nav>
 {/if}
index 2dfabeb3ee33a7b40870d54fbbcd50e95b179088..afe520a9dca8016edcfd5636442600adbcff1165 100644 (file)
@@ -4,6 +4,7 @@
                        {foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
                                <li{if $__wcf->getPageMenu()->getActiveMenuItem(1) == $subMenuItem->menuItem} class="active"{/if}><a href="{$subMenuItem->getProcessor()->getLink()}"><span>{lang}{$subMenuItem->menuItem}{/lang}</span></a>{if $subMenuItem->getProcessor()->getNotifications()} <span class="badge badgeUpdate">{#$subMenuItem->getProcessor()->getNotifications()}</span>{/if}</li>
                        {/foreach}
+                       {event name='items'}
                </ul>
        {/if}
 {/foreach}
\ No newline at end of file
index 93237826c41aa67703d6fb308987d1a79284fc9a..4827f3cd58a376979b7382f12a9d55f16ab96d1c 100644 (file)
 
 {include file='header'}
 
-{event name='boxesTop'}
 <div class="{if !$status|empty}{@$status}{else}success{/if}">
        <p>{@$message}</p>
        <a href="{$url}">{lang}wcf.global.redirect.url{/lang}</a>
 </div>
-{event name='boxesBottom'}
 
 {include file='footer'}
 
index 159b0c23e905adb5bbdde8397abdea4e838afbaf..bade874355858d2e6aeba37c530b33127909593e 100644 (file)
@@ -6,8 +6,8 @@
        </hgroup>
 </header>
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -15,8 +15,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <div class="tabularBox tabularBoxTitle marginTop">
        <hgroup>
@@ -64,8 +64,8 @@
        </table>
 </div>
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -73,8 +73,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 
 {include file='footer'}
index 6d5d9fbc8ff84eced6ad1a36e6f9f901f2027852..4886fcd1ea48bda7333f775af62542165b9750b1 100644 (file)
@@ -29,8 +29,8 @@
        <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -42,8 +42,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{if $action == 'add'}{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}{else}{link controller=$editController application=$objectType->getProcessor()->getApplication() object=$category}{/link}{/if}">
        <div class="container containerPadding marginTop">
index 924118f9c1f5bd564739b61995bb5ac11ab9bf01..4484e66916ad7b33cbe947554f77a1fc7de42b19 100644 (file)
@@ -73,8 +73,8 @@
        </hgroup>
 </header>
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -86,8 +86,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 {if $categoryNodeList|count}
        <section id="categoryList" class="container containerPadding marginTop{if $objectType->getProcessor()->canEditCategory() && $categoryNodeList|count > 1} sortableListContainer{/if}">
                {/if}
        </section>
        
-       {hascontent}
-               <div class="contentNavigation">
+       <div class="contentNavigation">
+               {hascontent}
                        <nav>
                                <ul>
                                        {content}
                                        {/content}
                                </ul>
                        </nav>
-               </div>
-       {/hascontent}
+               {/hascontent}
+       </div>
 {else}
        <p class="info">{@$objectType->getProcessor()->getLanguageVariable('noneAvailable')}</p>
 {/if}
index 40e57c15245476f515e4709b5ab58aca18520d58..8cf17205771625196335a50ea05948e3015fa170 100644 (file)
@@ -23,8 +23,8 @@
        <p class="success">{lang}wcf.global.success.add{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -36,8 +36,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageAdd'}{/link}">
        <div class="container containerPadding marginTop">
index 885947a9fdde4fc47065c405b71ac2e27273b08d..3cb0b50b87f64f55d8e9c508b7dc50b44caefad6 100644 (file)
@@ -14,8 +14,8 @@
        <p class="success">{lang}wcf.acp.language.add.success{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -27,8 +27,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageExport' id=$languageID}{/link}">
        <div class="container containerPadding marginTop">
index 51138b9df5ea148a0e02e660bd607df55afde2d0..41d1f3e8ece4edf009962b0685de237127669264 100644 (file)
@@ -24,8 +24,8 @@
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -33,8 +33,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageMultilingualism'}{/link}">
        <div class="container containerPadding marginTop">
index 14448ede54d44279c84ea48100b8b6ae13ed20de..940867fdba63a4676bb7b5af13cd20698f281775 100644 (file)
@@ -14,8 +14,8 @@
        <p class="success">{lang}wcf.acp.languageServer.{$action}.success{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -27,8 +27,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{if $action == 'add'}{link controller='LanguageServerAdd'}{/link}{else}{link controller='LanguageServerEdit' id=$languageServerID}{/link}{/if}">
        <div class="container containerPadding marginTop">
index 9abc94240bea94df4a720f03e1f9271785c69f36..369fba256ed160619a96bd7bbdd9d6f3a30c0f8f 100644 (file)
@@ -35,8 +35,8 @@
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -44,8 +44,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{link controller='Option' id=$category->categoryID}{/link}">
        <div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
index fcaf20aaf84ca192ab9eb744afed7745ff47e4c6..96f786e2c43f7fa2c5e1ba468edbeca87b732755 100644 (file)
@@ -14,8 +14,8 @@
        <p class="success">{lang}wcf.acp.option.import.success{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -23,8 +23,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{link controller='OptionImport'}{/link}" enctype="multipart/form-data">
        <div class="container containerPadding marginTop">
index eb129cb7efd9388f25833838e97e737554c60c1e..d8a6e0dc224cbbad0605afd600ce5c47d1e0efdf 100644 (file)
@@ -17,8 +17,8 @@
        </hgroup>
 </header>
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -26,8 +26,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <div class="tabMenuContainer">
        <nav class="tabMenu">
index b703ddc4f99c61258efa17a37b49cd5761b8675d..056ce81eb0e10fa111e9778bd1daa63245121a39 100644 (file)
@@ -56,8 +56,8 @@
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -74,8 +74,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{if $action == 'add'}{link controller='StyleAdd'}{/link}{else}{link controller='StyleEdit' id=$styleID}{/link}{/if}">
        <div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
index d89f0b65ea3bf89b697425aa34318343e22d246f..000518e7e8a8418e70913f1a3d5c66d2050187c1 100644 (file)
@@ -10,8 +10,8 @@
        <p class="success">{lang}wcf.global.success.add{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -23,8 +23,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{link controller='StyleImport'}{/link}" enctype="multipart/form-data">
        <div class="container containerPadding marginTop">
index 66b470e6ed254355f831dd6be9a5d17eccfa19e1..40f135371dc006c7a1da394a860bb0e47b50c1bc 100644 (file)
@@ -10,8 +10,8 @@
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -19,8 +19,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{link controller='UserAssignToGroup'}{/link}">
        <div class="container containerPadding marginTop">
index 9b44aa9f1231118ce59c0d872c24c7a99dca46da..2d695835568da1b9c4f43cc5f9b8b74d6842089a 100644 (file)
@@ -14,8 +14,8 @@
        </hgroup>
 </header>
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -23,8 +23,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{link controller='UserEmailAddressExport'}{/link}">
        <div class="container containerPadding marginTop">
index 5429729da1d31f7dce90ec952a826f7cc7428282..7f9dc563f8a43fbe4364b318f1944ae0b1bdca4a 100644 (file)
        </hgroup>
 </header>
 
-{hascontent}
-       <div class="contentNavigation">
+<p class="info marginTop">{lang}wcf.acp.group.option.hint{/lang}</p>
+
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
-                                       {event name='contentNavigationButtons'}
+                                       {event name='contentNavigationButtonsTop'}
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
-
-<p class="info marginTop">{lang}wcf.acp.group.option.hint{/lang}</p>
+       {/hascontent}
+</div>
 
 <form method="post" action="{link controller='UserGroupOption'}{/link}" class="marginTop">
        <fieldset id="defaultValueContainer">
        </div>
 </form>
 
-<div class="contentNavigation"></div>
+<div class="contentNavigation">
+       {hascontent}
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtonsBottom'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
+</div>
 
 {include file='footer'}
index 257c9654579a9fb6e8f691e74a2568730ace1781..06774de0cf8b01818ffc2e4e06412346fb3103be 100644 (file)
@@ -76,8 +76,8 @@
        <p class="success">{lang}wcf.acp.user.massProcessing.success{/lang}</p>
 {/if}
 
-{hascontent}
-       <div class="contentNavigation">
+<div class="contentNavigation">
+       {hascontent}
                <nav>
                        <ul>
                                {content}
@@ -85,8 +85,8 @@
                                {/content}
                        </ul>
                </nav>
-       </div>
-{/hascontent}
+       {/hascontent}
+</div>
 
 <form method="post" action="{link controller='UsersMassProcessing'}{/link}">
        <div class="container containerPadding marginTop">