Overhauled ACP templates
authorAlexander Ebert <ebert@woltlab.com>
Thu, 7 Apr 2016 16:55:38 +0000 (18:55 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 7 Apr 2016 16:55:38 +0000 (18:55 +0200)
97 files changed:
wcfsetup/install/files/acp/templates/acpSessionLog.tpl
wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
wcfsetup/install/files/acp/templates/adAdd.tpl
wcfsetup/install/files/acp/templates/adList.tpl
wcfsetup/install/files/acp/templates/applicationEdit.tpl
wcfsetup/install/files/acp/templates/applicationManagement.tpl
wcfsetup/install/files/acp/templates/attachmentList.tpl
wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
wcfsetup/install/files/acp/templates/bbcodeList.tpl
wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
wcfsetup/install/files/acp/templates/boxAdd.tpl
wcfsetup/install/files/acp/templates/boxList.tpl
wcfsetup/install/files/acp/templates/cacheList.tpl
wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
wcfsetup/install/files/acp/templates/categoryAdd.tpl
wcfsetup/install/files/acp/templates/categoryList.tpl
wcfsetup/install/files/acp/templates/cronjobAdd.tpl
wcfsetup/install/files/acp/templates/cronjobList.tpl
wcfsetup/install/files/acp/templates/cronjobLogList.tpl
wcfsetup/install/files/acp/templates/dashboardList.tpl
wcfsetup/install/files/acp/templates/dashboardOption.tpl
wcfsetup/install/files/acp/templates/dataImport.tpl
wcfsetup/install/files/acp/templates/exceptionLogView.tpl
wcfsetup/install/files/acp/templates/labelAdd.tpl
wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
wcfsetup/install/files/acp/templates/labelGroupList.tpl
wcfsetup/install/files/acp/templates/labelList.tpl
wcfsetup/install/files/acp/templates/languageAdd.tpl
wcfsetup/install/files/acp/templates/languageExport.tpl
wcfsetup/install/files/acp/templates/languageImport.tpl
wcfsetup/install/files/acp/templates/languageItemList.tpl
wcfsetup/install/files/acp/templates/languageList.tpl
wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
wcfsetup/install/files/acp/templates/languageServerAdd.tpl
wcfsetup/install/files/acp/templates/languageServerList.tpl
wcfsetup/install/files/acp/templates/mediaAdd.tpl
wcfsetup/install/files/acp/templates/mediaList.tpl
wcfsetup/install/files/acp/templates/mediaManager.tpl
wcfsetup/install/files/acp/templates/menuAdd.tpl
wcfsetup/install/files/acp/templates/menuItemAdd.tpl
wcfsetup/install/files/acp/templates/menuItemList.tpl
wcfsetup/install/files/acp/templates/menuList.tpl
wcfsetup/install/files/acp/templates/noticeAdd.tpl
wcfsetup/install/files/acp/templates/noticeList.tpl
wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/package.tpl
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/files/acp/templates/packageStartInstall.tpl
wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
wcfsetup/install/files/acp/templates/pageAdd.tpl
wcfsetup/install/files/acp/templates/pageList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLog.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
wcfsetup/install/files/acp/templates/rebuildData.tpl
wcfsetup/install/files/acp/templates/smileyAdd.tpl
wcfsetup/install/files/acp/templates/smileyList.tpl
wcfsetup/install/files/acp/templates/styleAdd.tpl
wcfsetup/install/files/acp/templates/styleExport.tpl
wcfsetup/install/files/acp/templates/styleImport.tpl
wcfsetup/install/files/acp/templates/styleList.tpl
wcfsetup/install/files/acp/templates/tagAdd.tpl
wcfsetup/install/files/acp/templates/tagList.tpl
wcfsetup/install/files/acp/templates/templateAdd.tpl
wcfsetup/install/files/acp/templates/templateDiff.tpl
wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
wcfsetup/install/files/acp/templates/templateGroupList.tpl
wcfsetup/install/files/acp/templates/templateList.tpl
wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
wcfsetup/install/files/acp/templates/userAuthenticationFailureList.tpl
wcfsetup/install/files/acp/templates/userContentRevertChanges.tpl
wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userGroupOption.tpl
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/files/acp/templates/userMail.tpl
wcfsetup/install/files/acp/templates/userMerge.tpl
wcfsetup/install/files/acp/templates/userOptionAdd.tpl
wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
wcfsetup/install/files/acp/templates/userOptionList.tpl
wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
wcfsetup/install/files/acp/templates/userRankAdd.tpl
wcfsetup/install/files/acp/templates/userRankList.tpl
wcfsetup/install/files/acp/templates/userSearch.tpl

index 035957290176595ccc37efe0902f392cc8edceb7..15bd11fb100c261c85844b9e0d6e42f9db258dfe 100644 (file)
@@ -1,20 +1,24 @@
 {include file='header' pageTitle='wcf.acp.sessionLog.access.list'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.sessionLog.access.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller='ACPSessionLog' id=$sessionLogID link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.sessionLog.access.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='ACPSessionLogList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller='ACPSessionLog' id=$sessionLogID link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {hascontent}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='ACPSessionLogList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {/hascontent}
 
 {include file='footer'}
index 949c7147037ae80cf2bf808b067f3b5ec21ccd5c..8360eb786c4e46163d4e077c32c970cb11e25b8e 100644 (file)
@@ -1,22 +1,23 @@
 {include file='header' pageTitle='wcf.acp.sessionLog.list'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.sessionLog.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="ACPSessionLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.sessionLog.list{/lang}</h1>
+       </div>
        
        {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       {content}{event name='contentHeaderNavigation'}{/content}
+               </ul>
+       </nav>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="ACPSessionLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
                {hascontent}
-                       <nav>
+                       <nav class="contentFooterNavigation">
                                <ul>
-                                       {content}
-                                               {event name='contentNavigationButtonsBottom'}
-                                       {/content}
+                                       {content}{event name='contentFooterNavigation'}{/content}
                                </ul>
                        </nav>
                {/hascontent}
-       </div>
+       </footer>
 {/if}
 
 {include file='footer'}
index 4db797474b67170f898a41821ea64b3de0fcd97e..dfe55c0d47e4a19ec813559d09dc171ee748fcbb 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.ad.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.ad.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='AdList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.ad.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='AdList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.ad.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form id="adForm" method="post" action="{if $action == 'add'}{link controller='AdAdd'}{/link}{else}{link controller='AdEdit' object=$adObject}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'adName'} class="formError"{/if}>
index a7d576889cb940d64aff211a3717c703b5e33fa9..e79ba6c112c33ea66e3eec1dcc5806a187be29a2 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.ad.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="AdList" link="pageNo=%d"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.ad.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='AdAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.ad.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="AdList" link="pageNo=%d"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section sortableListContainer" id="adList">
                </div>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='AdAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.ad.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 8825dec07354aea5b8f1de3619c158ca1d7b8d76..5f56f6a64f5a14d9e71caa0a57dce246a2aca28c 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.application.edit'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.application.edit.title{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.application.edit.title{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='ApplicationManagement'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.application.management{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='ApplicationManagement'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.application.management{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{link controller='ApplicationEdit' id=$application->packageID}{/link}">
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.acp.application.domain{/lang}</h2>
index 922341b925224a78f4f1015cf695f65d6045d7ae..ea86d3f83852b3c7c250c86fad320aa0e9fac683 100644 (file)
@@ -1,20 +1,18 @@
 {include file='header' pageTitle='wcf.acp.application.list'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.application.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.application.list{/lang}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
 
 <div class="section tabularBox">
        <table class="table">
        </table>
 </div>
 
-<div class="contentNavigation">
+<footer class="contentFooter">
        {hascontent}
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsBottom'}
-                               {/content}
+                               {content}{event name='contentFooterNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</footer>
 
 {include file='footer'}
index 150a19e5034fdf39863d4a1c45e311c61926223c..576c952126b5f1893a721f3d8f7f4ea9f77d8127 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.attachment.list{/lang}</h1>
-       <p class="contentHeaderDescription">{lang}wcf.acp.attachment.stats{/lang}</p>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.attachment.list{/lang}</h1>
+               <p class="contentHeaderDescription">{lang}wcf.acp.attachment.stats{/lang}</p>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
        </div>
 </form>
 
-<div class="contentNavigation">
-       {assign var='linkParameters' value=''}
-       {if $username}{capture append=linkParameters}&username={@$username|rawurlencode}{/capture}{/if}
-       {if $filename}{capture append=linkParameters}&filename={@$filename|rawurlencode}{/capture}{/if}
-       {if $fileType}{capture append=linkParameters}&fileType={@$fileType|rawurlencode}{/capture}{/if}
-       
-       {pages print=true assign=pagesLinks controller="AttachmentList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
-       
-       {hascontent}
-               <nav>
-                       {content}
-                               <ul>
-                                       {event name='contentNavigationButtonsTop'}
-                               </ul>
-                       {/content}
-               </nav>
-       {/hascontent}
-</div>
+{hascontent}
+       <div class="paginationTop">
+               {content}
+                       {assign var='linkParameters' value=''}
+                       {if $username}{capture append=linkParameters}&username={@$username|rawurlencode}{/capture}{/if}
+                       {if $filename}{capture append=linkParameters}&filename={@$filename|rawurlencode}{/capture}{/if}
+                       {if $fileType}{capture append=linkParameters}&fileType={@$fileType|rawurlencode}{/capture}{/if}
+                       
+                       {pages print=true assign=pagesLinks controller="AttachmentList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
+               {/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
                {hascontent}
-                       <nav>
-                               {content}
-                                       <ul>
-                                               {event name='contentNavigationButtonsBottom'}
-                                       </ul>
-                               {/content}
+                       <nav class="contentFooterNavigation">
+                               <ul>
+                                       {content}{event name='contentFooterNavigation'}{/content}
+                               </ul>
                        </nav>
                {/hascontent}
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 7ffbe33e70285b3024cc9f460d9446665248d8ce..99bc608606ac252a75af009634c383959b25184e 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.bbcode.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.bbcode.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='BBCodeList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.bbcode.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {if $action == 'add'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='BBCodeList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.bbcode.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='BBCodeAdd'}{/link}{else}{link controller='BBCodeEdit' object=$bbcode}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'bbcodeTag'} class="formError"{/if}>
index 3e43e0c775c1dd83373a8aaf234cabd53b80c764..24d39b6aaa5b3cb174ab899c54c2c9a9312be5ab 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.bbcode.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="BBCodeList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.bbcode.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='BBCodeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.bbcode.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="BBCodeList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='BBCodeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.bbcode.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index f5837ebf29b056b28b6fc078ee3778ec1fc5fc90..3bf309f34fa6e51d91802373f19872c9355c51b6 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.bbcode.mediaProvider.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.bbcode.mediaProvider.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.bbcode.mediaProvider.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='BBCodeMediaProviderList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.bbcode.mediaProvider.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='BBCodeMediaProviderList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.bbcode.mediaProvider.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='BBCodeMediaProviderAdd'}{/link}{else}{link controller='BBCodeMediaProviderEdit' object=$mediaProvider}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'title'} class="formError"{/if}>
index 2ce97ce76d92f80471cd00adc17addef0ea7c71f..c45f66d13b486879fc9def866485fef8b7e4e1fc 100644 (file)
@@ -9,20 +9,24 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.bbcode.mediaProvider.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="BBCodeMediaProviderList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.bbcode.mediaProvider.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='BBCodeMediaProviderAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.bbcode.mediaProvider.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="BBCodeMediaProviderList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='BBCodeMediaProviderAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.bbcode.mediaProvider.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 358b94ffbd6c04e7dfb8dea47b4861aace9eda3b..75578026fdda59a45befb5acbcc22318be99a2d9 100644 (file)
 {/if}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{if $action == 'add'}{if $isMultilingual}{lang}wcf.acp.box.addMultilingual{/lang}{else}{lang}wcf.acp.box.add{/lang}{/if}{else}{lang}wcf.acp.box.edit{/lang}{/if}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{if $action == 'add'}{if $isMultilingual}{lang}wcf.acp.box.addMultilingual{/lang}{else}{lang}wcf.acp.box.add{/lang}{/if}{else}{lang}wcf.acp.box.edit{/lang}{/if}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='BoxList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cms.box.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='BoxList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cms.box.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='BoxAdd'}{/link}{else}{link controller='BoxEdit' id=$boxID}{/link}{/if}">
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.global.form.data{/lang}</h2>
index dad2a7aa4376321f00dea536428b91edb3eac905..bd1a000887bf87631a2f9cc9f1d9389f6486b4f0 100644 (file)
@@ -9,21 +9,25 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.box.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="BoxList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.box.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='BoxAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
                        <li><a href="{link controller='BoxAdd'}isMultilingual=1{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.box.addMultilingual{/lang}</span></a></li>
-               
-                       {event name='contentNavigationButtonsTop'}
+                       
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="BoxList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
-                               
-               <nav>
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
+               
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='BoxAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
                                <li><a href="{link controller='BoxAdd'}isMultilingual=1{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.box.addMultilingual{/lang}</span></a></li>
-               
-                               {event name='contentNavigationButtonsBottom'}
+                               
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index ff9f6f44ad79049e80949287de4eed9eaf4e3817..1ce523cf41d39d9fb6778d8f4466298c47d70767 100644 (file)
@@ -9,7 +9,23 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.cache.list{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.cache.list{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}
+                                       {if $cacheData.files}
+                                               <li><a onclick="WCF.System.Confirmation.show('{lang}wcf.acp.cache.clear.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                                       {/if}
+                                       
+                                       {event name='contentHeaderNavigation'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 <section class="section">
        {event name='dataFields'}
 </section>
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       {if $cacheData.files}
-                               <li><a onclick="WCF.System.Confirmation.show('{lang}wcf.acp.cache.clear.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
-                       {/if}
-                       
-                       {event name='contentNavigationButtonsTop'}
-               </ul>
-       </nav>
-</div>
-
 {foreach from=$caches key='cacheType' item='cacheTypeCaches'}
        {foreach from=$cacheTypeCaches key='cache' item='files'}
                {counter name=cacheIndex assign=cacheIndex print=false start=0}
        {/foreach}
 {/foreach}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       {if $cacheData.files}
-                               <li><a onclick="WCF.System.Confirmation.show('{lang}wcf.acp.cache.clear.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
-                       {/if}
-                       
-                       {event name='contentNavigationButtonsBottom'}
-               </ul>
-       </nav>
-</div>
+<footer class="contentFooter">
+       {hascontent}
+               <div class="paginationBottom">
+                       {content}{@$pagesLinks}{/content}
+               </div>
+       {/hascontent}
+       
+       {hascontent}
+               <nav class="contentFooterNavigation">
+                       <ul>
+                               {content}
+                                       {if $cacheData.files}
+                                               <li><a onclick="WCF.System.Confirmation.show('{lang}wcf.acp.cache.clear.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                                       {/if}
+                                       
+                                       {event name='contentFooterNavigation'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
+</footer>
 
 {include file='footer'}
index a593c4ac2937cea80ee0e52f7f595f88bae15e62..a45194a9763efb4b357206f5dbcab06170da95d1 100644 (file)
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='CaptchaQuestionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.captcha.question.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
+<div class="contentHeaderTitle">
+
 </div>
 
+<nav class="contentHeaderNavigation">
+       <ul>
+               <li><a href="{link controller='CaptchaQuestionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.captcha.question.list{/lang}</span></a></li>
+               
+               {event name='contentHeaderNavigation'}
+       </ul>
+</nav>
+
 <form id="adForm" method="post" action="{if $action == 'add'}{link controller='CaptchaQuestionAdd'}{/link}{else}{link controller='CaptchaQuestionEdit' id=$captchaQuestion->questionID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'question'} class="formError"{/if}>
index 602b47d80bdfe80ad82e9ccc19338119fdf114ab..13ac8ceca905d7dc4fb1eaed9c3943f20c968172 100644 (file)
@@ -1,9 +1,5 @@
 {include file='header' pageTitle='wcf.acp.captcha.question.list'}
 
-<header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.captcha.question.list{/lang}</h1>
-</header>
-
 <script data-relocate="true">
        //<![CDATA[
        $(function() {
                
                var options = { };
                {if $pages > 1}
-                       options.refreshPage = true;
-                       {if $pages == $pageNo}
-                               options.updatePageNumber = -1;
-                       {/if}
+               options.refreshPage = true;
+               {if $pages == $pageNo}
+               options.updatePageNumber = -1;
+               {/if}
                {else}
-                       options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+               options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
                {/if}
                
                new WCF.Table.EmptyTableHandler($('#captchaQuestionTabelContainer'), 'jsQuestionRow', options);
        //]]>
 </script>
 
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="CaptchaQuestionList" link="pageNo=%d"}
+<header class="contentHeader">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.captcha.question.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='CaptchaQuestionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.captcha.question.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="CaptchaQuestionList" link="pageNo=%d"}{/content}
+       </div>
+{/hascontent}
 
 {hascontent}
        <div id="captchaQuestionTabelContainer" class="section tabularBox">
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/hascontent}
 
-<div class="contentNavigation">
-       {@$pagesLinks}
+<footer class="contentFooter">
+       {hascontent}
+               <div class="paginationBottom">
+                       {content}{@$pagesLinks}{/content}
+               </div>
+       {/hascontent}
        
-       <nav>
+       <nav class="contentFooterNavigation">
                <ul>
                        <li><a href="{link controller='CaptchaQuestionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.captcha.question.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsBottom'}
+                       {event name='contentFooterNavigation'}
                </ul>
        </nav>
-</div>
+</footer>
 
 {include file='footer'}
  
\ No newline at end of file
index 4aca0482ba0df501774760e4ac83fddf8c81af16..c041e1f64c42c76159b6470a2eb420daf3d3567a 100644 (file)
 {/if}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
-</header>
-
-{include file='formError'}
-
-{if $success|isset}
-       <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
-{/if}
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
                                {content}
                                        {if $action == 'edit' && $availableCategories->hasChildren()}
                                                <li><a href="{link controller=$listController application=$objectType->getProcessor()->getApplication()}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{@$objectType->getProcessor()->getLanguageVariable('button.list')}</span></a></li>
                                        {/if}
                                        
-                                       {event name='contentNavigationButtons'}
+                                       {event name='contentHeaderNavigation'}
                                {/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{include file='formError'}
+
+{if $success|isset}
+       <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
+{/if}
 
 <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}">
        {event name='beforeSections'}
index 94f4e9223323cbdd6363e89b8373976642838f1c..3dee7d174ea222eaa4e0752a3122eea6bd7c593f 100644 (file)
 {/if}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable('list')}</h1>
-</header>
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable('list')}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
                                {content}
                                        {if $objectType->getProcessor()->canAddCategory()}
                                                <li><a href="{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
                                        {/if}
-                                       
-                                       {event name='contentNavigationButtons'}
+                                               
+                                       {event name='contentHeaderNavigation'}
                                {/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
 
 {hascontent}
        <div id="categoryList" class="section{if $objectType->getProcessor()->canEditCategory()} sortableListContainer{/if}">
index f4e3fa3536b5db988e8c468503b4a2ea3210d129..2b9b923e8413d161e0f44502ef99726f197f8f54 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.cronjob.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='CronjobList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='CronjobList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='CronjobAdd'}{/link}{else}{link controller='CronjobEdit' id=$cronjobID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'className'} class="formError"{/if}>
index 3bda083ea7686a597958ca3a00ec925a3c469519..7e0f49d7e0e038b361add20dd0ddaf96ecbe8267 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.cronjob.list{/lang}</h1>
-       <p class="contentHeaderDescription">{lang}wcf.acp.cronjob.subtitle{/lang}</p>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="CronjobList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.cronjob.list{/lang}</h1>
+               <p class="contentHeaderDescription">{lang}wcf.acp.cronjob.subtitle{/lang}</p>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='CronjobAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="CronjobList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {hascontent}
        <div class="section tabularBox">
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/hascontent}
 
-<div class="contentNavigation">
-       {@$pagesLinks}
+<footer class="contentFooter">
+       {hascontent}
+               <div class="paginationBottom">
+                       {content}{@$pagesLinks}{/content}
+               </div>
+       {/hascontent}
        
-       <nav>
+       <nav class="contentFooterNavigation">
                <ul>
                        <li><a href="{link controller='CronjobAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsBottom'}
+                       {event name='contentFooterNavigation'}
                </ul>
        </nav>
-</div>
+</footer>
 
 {include file='footer'}
index e6d6abeea36ecd91c18a0b3725a6306505b4cd8e..797a72f48ddaaf8adefc18687af7308babb436de 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.cronjob.log{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="CronjobLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.cronjob.log{/lang}</h1>
+       </div>
        
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
                                {content}
                                        {if $objects|count}
                                                <li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
                                        {/if}
                                        
-                                       {event name='contentNavigationButtonsTop'}
+                                       {event name='contentHeaderNavigation'}
                                {/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="CronjobLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {hascontent}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
-                       <ul>
-                               <li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
-                               
-                               {event name='contentNavigationButtonsBottom'}
-                       </ul>
-               </nav>
-       </div>
+               {hascontent}
+                       <nav class="contentFooterNavigation">
+                               <ul>
+                                       {content}
+                                               {if $objects|count}
+                                                       <li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
+                                               {/if}
+                                               
+                                               {event name='contentFooterNavigation'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
+       </footer>
 {hascontentelse}
        <p class="info">{lang}wcf.acp.cronjob.log.noEntries{/lang}</p>
 {/hascontent}
index d393156c0b7667339d579bed3e21163c9a6b8099..9f67b0ba8fef82867baff8c2173fb8f7dabbd6ec 100644 (file)
@@ -1,20 +1,18 @@
 {include file='header' pageTitle='wcf.acp.dashboard.list'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.dashboard.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.dashboard.list{/lang}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
 
 <div class="section tabularBox">
        <table class="table">
        </table>
 </div>
 
-<div class="contentNavigation">
+<footer class="contentFooter">
        {hascontent}
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsBottom'}
-                               {/content}
+                               {content}{event name='contentFooterNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</footer>
 
 {include file='footer'}
\ No newline at end of file
index 699ab7e18c801998aba9bdcac7d30b4a75607da5..e8b692a33adb1c4c0761b077fa57fcfcffd991a4 100644 (file)
@@ -9,21 +9,21 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.dashboard.option{/lang}</h1>
-       <p class="contentHeaderDescription">{lang}wcf.dashboard.objectType.{$objectType->objectType}{/lang}</p>
-</header>
-
-<p class="info">{lang}wcf.acp.dashboard.box.sort{/lang}</p>
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.dashboard.option{/lang}</h1>
+               <p class="contentHeaderDescription">{lang}wcf.dashboard.objectType.{$objectType->objectType}{/lang}</p>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='DashboardList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.dashboard.list{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtons'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+<p class="info">{lang}wcf.acp.dashboard.box.sort{/lang}</p>
 
 <div class="section tabMenuContainer">
        <nav class="tabMenu">
index 2abb1f9f030ede7f67236d692fd20f3c09d60c17..2b7d3d23058b2ebbddec55e9df3a305d84df9312 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.dataImport{/lang}</h1>
-       {if $exporterName}
-               <p class="contentHeaderDescription">{lang}wcf.acp.dataImport.exporter.{@$exporterName}{/lang}</p>
-       {/if}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.dataImport{/lang}</h1>
+               {if $exporterName}
+                       <p class="contentHeaderDescription">{lang}wcf.acp.dataImport.exporter.{@$exporterName}{/lang}</p>
+               {/if}
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
        <p class="warning">{lang}wcf.acp.index.innoDBWarning{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
 {if !$exporterName}
        {if !$availableExporters|count}
                <p class="info">{lang}wcf.acp.dataImport.selectExporter.noExporters{/lang}</p>
index 7753dc49877e247004effd8cccd89656e5a3bee6..1244022b8a34be1bb880ce0e9a3a92a14e5036d2 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.exceptionLog{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.exceptionLog{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
        </form>
 {/if}
 
-<div class="contentNavigation">
-       {pages print=true controller="ExceptionLogView" link="pageNo=%d&logFile=$logFile"}
-       
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true controller="ExceptionLogView" link="pageNo=%d&logFile=$logFile"}{/content}
+       </div>
+{/hascontent}
 
 {if !$logFiles|empty}
        {if $logFile}
index 5349f556c42381be702a79fb136953c942c38964..e63e36e5a6905ec070810b9cdc0d78ccbf831609 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.label.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.label.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='LabelList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.label.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='LabelList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.label.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 {if $labelGroupList|count}
        <form method="post" action="{if $action == 'add'}{link controller='LabelAdd'}{/link}{else}{link controller='LabelEdit' object=$label}{/link}{/if}">
                <div class="section">
index 5efe210d4daa8bf3666c69d219eedf213ce630c7..6fadd116c38ace3d1b19b57604fb7fd687e989f6 100644 (file)
 {assign var=labelForceSelection value=$forceSelection}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.label.group.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.label.group.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='LabelGroupList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.label.group.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='LabelGroupList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.label.group.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='LabelGroupAdd'}{/link}{else}{link controller='LabelGroupEdit' object=$labelGroup}{/link}{/if}">
        <div class="section tabMenuContainer">
                <nav class="tabMenu">
index d3e7e4042741227dd4f9734f03ba340fe8c2b982..d333322f98cf9609eac899541e1250e7491717df 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.label.group.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="LabelGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.label.group.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='LabelGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.group.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="LabelGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div id="labelGroupTableContainer" class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='LabelGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.group.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index b50422257705d93b098c2aed98ff34c2e6103463..06b4aaccfe6b45730edd92c0dda6a35f2f9afbb7 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.label.list{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.label.list{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='LabelAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {if $items || $labelSearch || $labelGroup || $cssClassName}
        </form>
 {/if}
 
-<div class="contentNavigation">
-       {assign var='linkParameters' value=''}
-       {if $labelSearch}
-               {append var='linkParameters' value='&label='}
-               {append var='linkParameters' value=$labelSearch|rawurlencode}
-       {/if}
-       {if $cssClassName}
-               {append var='linkParameters' value='&cssClassName='}
-               {append var='linkParameters' value=$cssClassName|rawurlencode}
-       {/if}
-       {pages print=true assign=pagesLinks controller="LabelList" object=$labelGroup link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
-       
-       <nav>
-               <ul>
-                       <li><a href="{link controller='LabelAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
+{hascontent}
+       <div class="paginationTop">
+               {content}
+                       {assign var='linkParameters' value=''}
+                       {if $labelSearch}
+                               {append var='linkParameters' value='&label='}
+                               {append var='linkParameters' value=$labelSearch|rawurlencode}
+                       {/if}
+                       {if $cssClassName}
+                               {append var='linkParameters' value='&cssClassName='}
+                               {append var='linkParameters' value=$cssClassName|rawurlencode}
+                       {/if}
                        
-                       {event name='contentNavigationButtonsTop'}
-               </ul>
-       </nav>
-</div>
+                       {pages print=true assign=pagesLinks controller="LabelList" object=$labelGroup link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
+               {/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div id="labelTableContainer" class="section tabularBox{if $labelGroup && !$labelSearch && !$cssClassName && $items > 1} sortableListContainer{/if}">
                </div>
        {/if}
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='LabelAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.label.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 4ffa6b46ebd3bde374dfda54f212a9ff61993236..64042b30c53277268f119494dfa980c8d3ca7a27 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle="wcf.acp.language.$action"}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.language.{@$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.language.{@$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='LanguageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='LanguageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'edit'}{link controller='LanguageEdit' id=$languageID}{/link}{else}{link controller='LanguageAdd'}{/link}{/if}">
        <section class="section">
                <dl{if $errorField == 'languageName'} class="formError"{/if}>
index 1ad295723568d5d7cdb0af5e099ccc9114405f68..d94bcf9d70d0508ea83757d58c72d600796da223 100644 (file)
@@ -1,20 +1,20 @@
 {include file='header' pageTitle='wcf.acp.language.export'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.language.export{/lang}</h1>
-</header>
-
-{include file='formError'}
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.language.export{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='LanguageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtons'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{include file='formError'}
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageExport'}{/link}">
        <div class="section">
index 06751fed8ce2fac93e8d91475198cccbe67c929e..89dc5e7b2722aada9f55f1252dd71b7545567ee4 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.language.import'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.language.import{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.language.import{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='LanguageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.add{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='LanguageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageImport'}{/link}">
        <div class="section">
                <dl{if $errorField == 'languageFile'} class="formError"{/if}>
index cf1c1d1649de3d6445cb8a14929f0e41103dac47..7fbe0a952d4934739e5d200bbc10c36fa0fb348b 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.language.item.list{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.language.item.list{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
        </div>
 </form>
 
-<div class="contentNavigation">
-       {hascontent}
-               <nav>
-                       {content}
-                               <ul>
-                                       {event name='contentNavigationButtonsTop'}
-                               </ul>
-                       {/content}
-               </nav>
-       {/hascontent}
-</div>
-
 {if $objects|count}
        <div class="section sectionContainerList">
                <ol class="containerList">
                </ol>
        </div>
        
-       <div class="contentNavigation">
+       <footer class="contentFooter">
                {hascontent}
-                       <nav>
-                               {content}
-                                       <ul>
-                                               {event name='contentNavigationButtonsBottom'}
-                                       </ul>
-                               {/content}
+                       <nav class="contentFooterNavigation">
+                               <ul>
+                                       {content}
+                                       
+                                       
+                                       {event name='contentFooterNavigation'}
+                                       {/content}
+                               </ul>
                        </nav>
                {/hascontent}
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 06c9f9994ec8473f0476834f3f614914212d6d87..b0a637c385f79b4967e0572c75c909f5fb056a96 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.language.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller='LanguageList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.language.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='LanguageAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
                        <li><a href="{link controller='LanguageImport'}{/link}" class="button"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.language.import{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller='LanguageList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div id="userTableContainer" class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='LanguageAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
                                <li><a href="{link controller='LanguageImport'}{/link}" class="button"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.language.import{/lang}</span></a></li>
-                                       
-                               {event name='contentNavigationButtonsBottom'}
+                               
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {/if}
 
 {include file='footer'}
index edf9b55635bfddf2bf22a2cf123ee311f93375e5..50be6abd836d3a03ee7c3756380f3f648dddd30c 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.language.multilingualism{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.language.multilingualism{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageMultilingualism'}{/link}">
        <section class="section">
                <header class="sectionHeader">
index a6ea7722145e8a044f56c6ecb7c5978b4dd835ce..08aeac7e58a95c47283fc149dd99de32765b73c5 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.languageServer.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.languageServer.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.languageServer.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='LanguageServerList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.server.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.acp.languageServer.{$action}.success{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='LanguageServerList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.language.server.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='LanguageServerAdd'}{/link}{else}{link controller='LanguageServerEdit' id=$languageServerID}{/link}{/if}">
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.acp.languageServer.data{/lang}</h2>
index 6f838b54fe1957e254ebeefa83f3540cd1777218..3b864d5b0c9492b9cc4fb7258626e3dd65ca8231 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.languageServer.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller='LanguageServerList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.languageServer.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='LanguageServerAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller='LanguageServerList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if !$languageServers|count}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='LanguageServerAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {/if}
 
 {include file='footer'}
index 6604ce8eb3081c7190aef165e0dffb776362c1ed..2bbd63d2bf82ffade23d0b66d16d05b030a53e5e 100644 (file)
 {/if}
 
 <header class="contentHeader">
-       <h1 id="mediaActionTitle" class="contentTitle">{lang}wcf.acp.media.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 id="mediaActionTitle" class="contentTitle">{lang}wcf.acp.media.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='MediaList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.media.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {if $action == 'edit'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='MediaList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.media.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 {if $action == 'add'}
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.media.file{/lang}</h2>
index 1a21f4067ca7e8a13941d702034496ebf0cc08e3..f988b46454207221eb6e26fba4265b6bff9ffa55 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.media.list{/lang}</h1>
-       <p class="contentHeaderDescription">{lang}wcf.acp.media.stats{/lang}</p>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.media.list{/lang}</h1>
+               <p class="contentHeaderDescription">{lang}wcf.acp.media.stats{/lang}</p>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='MediaAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.media.add{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        </div>
 </form>
 
-<div class="contentNavigation">
-       {assign var='linkParameters' value=''}
-       
-       {if $username}{capture append=linkParameters}&username={@$username|rawurlencode}{/capture}{/if}
-       {if $filename}{capture append=linkParameters}&filename={@$filename|rawurlencode}{/capture}{/if}
-       {if $fileType}{capture append=linkParameters}&fileType={@$fileType|rawurlencode}{/capture}{/if}
-       
-       {pages print=true assign=pagesLinks controller="MediaList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
-       
-       <nav>
-               <ul>
-                       <li><a href="{link controller='MediaAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.media.add{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtonsTop'}
-               </ul>
-       </nav>
-</div>
+{hascontent}
+       <div class="paginationTop">
+               {content}
+                       {assign var='linkParameters' value=''}
+                       {if $username}{capture append=linkParameters}&username={@$username|rawurlencode}{/capture}{/if}
+                       {if $filename}{capture append=linkParameters}&filename={@$filename|rawurlencode}{/capture}{/if}
+                       {if $fileType}{capture append=linkParameters}&fileType={@$fileType|rawurlencode}{/capture}{/if}
+                               
+                       {pages print=true assign=pagesLinks controller="MediaList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
+               {/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='MediaAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.media.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-
-               <nav class="jsClipboardEditor" data-types="[ 'com.woltlab.wcf.media' ]"></nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 52041ef4c355963d61b484bdc01257de54495d85..b63d80bbe96b6ffd02892509098ff5439f4415a0 100644 (file)
@@ -14,7 +14,7 @@
                        <li data-file-type="all"><span>{lang}wcf.media.search.filetype.all{/lang}</span></li>
                </ul>
        {/if}
-       <input type="text" id="mediaManagerSearchField" placeholder="{lang}wcf.media.search.placeholder{/lang}" />
+       <input type="text" id="mediaManagerSearchField" placeholder="{lang}wcf.media.search.placeholder{/lang}">
        <span class="inputSuffix">
                <span id="mediaManagerSearchCancelButton" class="icon icon16 fa-times pointer jsTooltip" title="{lang}wcf.media.search.cancel{/lang}"></span>
        </span>
 {/if}
 
 <div class="jsClipboardContainer" data-type="com.woltlab.wcf.media">
-       <input type="checkbox" class="jsClipboardMarkAll" style="display: none;" />
+       <input type="checkbox" class="jsClipboardMarkAll" style="display: none;">
        <ul id="mediaManagerMediaList">
                {include file='mediaListItems'}
        </ul>
-
-       <div class="contentNavigation">
-               <nav class="jsClipboardEditor" data-types="[ 'com.woltlab.wcf.media' ]"></nav>
-       </div>
 </div>
index ed1fbf900bc2a15dad6b127adb9115025811d612..835015a4051f5d35e739e3242bf00d5856ad5380 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.menu.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.menu.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.menu.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='MenuList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='MenuList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='MenuAdd'}{/link}{else}{link controller='MenuEdit' id=$menuID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'title'} class="formError"{/if}>
index fb6552e8d90bf130604e26b26d8c4f43b6ff86a5..13b1e001c824b181c5fe1b1b14339d5a7e062a55 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.menu.item.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.menu.item.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='MenuItemList' id=$menuID}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.item.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='MenuItemList' id=$menuID}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.item.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='MenuItemAdd'}{/link}{else}{link controller='MenuItemEdit' id=$itemID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'parentItemID'} class="formError"{/if}>
index 36470e5b42573258ea499d5e2c1bf6610b81c87e..3881e23025bd3b7db376c18d2701f3be8d484108 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.menu.item.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.menu.item.list{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='MenuItemAdd'}menuID={@$menuID}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.item.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
 
 {hascontent}
        <div id="menuItemList" class="section sortableListContainer">
index 09800b1a472d6428a2e0eabe7059c6b33cad70ec..38eb665d9f99f78377442f7925a0eddd387b9978 100644 (file)
@@ -9,20 +9,24 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.menu.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="MenuList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.menu.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='MenuAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="MenuList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='MenuAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
-                       
-                               {event name='contentNavigationButtonsBottom'}
+                               
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 33e231e5a4b308cef917d4fefa5ccc68e8d11133..7b60fe1e509241bb2da4eb96600c993ae30bd444 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.notice.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.notice.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='NoticeList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.notice.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='NoticeList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.notice.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form id="formContainer" method="post" action="{if $action == 'add'}{link controller='NoticeAdd'}{/link}{else}{link controller='NoticeEdit' object=$notice}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'noticeName'} class="formError"{/if}>
index ddb2bfb11ebb3ff04f27ce250b1a9056f0794f74..26a6eab33a82381627e7e00c5870a5a610ca1d34 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.notice.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="NoticeList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.notice.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='NoticeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.notice.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="NoticeList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section sortableListContainer" id="noticeList">
                </div>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='NoticeAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.notice.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index e6cc2407db0855d6af38ee9571df864999593ca9..ed5f5d8d12b44771a59e9870fcc904dace18d805 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.notificationPresetSettings{/lang}</h1>
-       <p class="contentHeaderDescription">{lang}wcf.acp.user.notificationPresetSettings.description{/lang}</p>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.notificationPresetSettings{/lang}</h1>
+               <p class="contentHeaderDescription">{lang}wcf.acp.user.notificationPresetSettings.description{/lang}</p>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
 <form method="post" action="{link controller='NotificationPresetSettings'}{/link}">
        <div id="notificationSettings">
                <div class="section">
index 2aeb50a97ee9910e472a1828839e47a7830a3a2d..a4bbab0d4115d0c37c8842efbb6862a20d9552a2 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.option.category.{$category->categoryName}{/lang}</h1>
-       {hascontent}<p class="contentHeaderDescription">{content}{lang __optional=true}wcf.acp.option.category.{$category->categoryName}.description{/lang}{/content}</p>{/hascontent}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.option.category.{$category->categoryName}{/lang}</h1>
+               {hascontent}<p class="contentHeaderDescription">{content}{lang __optional=true}wcf.acp.option.category.{$category->categoryName}.description{/lang}{/content}</p>{/hascontent}
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {if $success|isset}
 
 {include file='formError'}
 
-<div class="contentNavigation">
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
 <form method="post" action="{link controller='Option' id=$category->categoryID}{/link}" enctype="multipart/form-data">
        {*
-               fake fields are a workaround for chrome autofill getting the wrong fields
+               fake fields are a workaround for chrome autofill picking the wrong fields
                taken from http://stackoverflow.com/a/15917221
        *}
-       <input style="display:none" type="text" name="fakeusernameremembered "/>
-       <input style="display:none" type="password" name="fakepasswordremembered" />
+       <input style="display:none" type="text" name="fakeusernameremembered">
+       <input style="display:none" type="password" name="fakepasswordremembered">
        
        <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
                <nav class="tabMenu">
index b8f7afab0926dc89ab47d5e9b083b87074ecb238..9e1848c66ca7d665b77be9082835d95da2664b47 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{$package->getName()}</h1>
-</header>
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{$package->getName()}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
 
 <div class="section tabMenuContainer">
        <nav class="tabMenu">
        {event name='tabMenuContents'}
 </div>
 
-<div class="contentNavigation">
-       <nav>
+<footer class="contentFooter">
+       <nav class="contentFooterNavigation">
                <ul>
-                       {event name='contentNavigationButtonsBottom'}
-                       
                        <li><a href="{link controller='PackageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
+                       
+                       {event name='contentFooterNavigation'}
                </ul>
        </nav>
-</div>
+</footer>
 
 {include file='footer'}
index 9db8b15a885dcbc7b1d7ecd4aa9ffb3518be46a5..564a84f9e11f4f45f430d8b44e94162175bb73b7 100644 (file)
@@ -21,6 +21,8 @@
                                        $('.jsUninstallButton[data-object-id={@$packageID}]').trigger('click');
                                }, 250);
                        {/if}
+                       
+                       new WCF.ACP.Package.Uninstallation($('.jsPluginContainer .jsUninstallButton'));
                {/if}
                
                {if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage')}
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.package.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller='PackageList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.package.list{/lang}</h1>
+       </div>
        
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
                                {content}
                                        {if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage')}
                                                <li><a href="{link controller='PackageStartInstall'}action=install{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
                                        {/if}
                                        
-                                       {event name='contentNavigationButtonsTop'}
+                                       {event name='contentHeaderNavigation'}
                                {/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller='PackageList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
                
        </div>
-                       
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
                {hascontent}
-                       <script data-relocate="true">
-                               //<![CDATA[
-                               $(function() {
-                                       new WCF.ACP.Package.Uninstallation($('.jsPluginContainer .jsUninstallButton'));
-                               });
-                               //]]>
-                       </script>
-                       
-                       <nav>
+                       <nav class="contentFooterNavigation">
                                <ul>
                                        {content}
                                                {if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage')}
                                                        <li><a href="{link controller='PackageStartInstall'}action=install{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
                                                {/if}
                                                
-                                               {event name='contentNavigationButtonsBottom'}
+                                               {event name='contentFooterNavigation'}
                                        {/content}
                                </ul>
                        </nav>
                {/hascontent}
-       </div>
+       </footer>
 {/if}
 
 {include file='footer'}
index da57694bd9b96a0b3582fb5db667beb6d8403c15..c3e07580123221693ca606e32c53bf3e45682bf7 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='PackageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {if $errorField && $installingImportedStyle}
 
 {include file='formError'}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='PackageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
        <nav class="tabMenu">
                <ul>
index 1cb8eb12ac593b9c892f51587acece704216e9d1..47e50f7bce1d0eee432570ba688ec6eaa21ccbf2 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.updateServer.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='PackageUpdateServerList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='PackageUpdateServerList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='PackageUpdateServerAdd'}{/link}{else}{link controller='PackageUpdateServerEdit' id=$packageUpdateServerID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'serverURL'} class="formError"{/if}>
index e83ce2f5b0bc08a019e7b8f2ddd2e92081711436..e9874879e29b12232d1434aacffb539022541dfc 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.updateServer.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="PackageUpdateServerList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.updateServer.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='PackageUpdateServerAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="PackageUpdateServerList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {hascontent}
        <div class="section tabularBox">
                
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='PackageUpdateServerAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {hascontentelse}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/hascontent}
index 6d959a43436a4fa57c1ae2f7d295662825c360b2..37ff9dc5b629bc9d0380c9c25644a48b63311c42 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{if $action == 'add'}{if $isMultilingual}{lang}wcf.acp.page.addMultilingual{/lang}{else}{lang}wcf.acp.page.add{/lang}{/if}{else}{lang}wcf.acp.page.edit{/lang}{/if}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{if $action == 'add'}{if $isMultilingual}{lang}wcf.acp.page.addMultilingual{/lang}{else}{lang}wcf.acp.page.add{/lang}{/if}{else}{lang}wcf.acp.page.edit{/lang}{/if}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='PageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cms.page.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='PageList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.cms.page.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='PageAdd'}{/link}{else}{link controller='PageEdit' id=$pageID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'name'} class="formError"{/if}>
index c994ca7d5a8e41e9fa4f180024223abb46b03b78..65639ca559933d48058ab240700e8a3b34dd8b39 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.page.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {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 $packageID}{capture append=linkParameters}&packageID={@$packageID}{/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"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.page.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='PageLanding'}{/link}" class="button"><span class="icon icon16 fa-home"></span> {lang}wcf.acp.page.landing{/lang}</a></li>
                        <li><a href="{link controller='PageAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.page.add{/lang}</span></a></li>
                        <li><a href="{link controller='PageAdd'}isMultilingual=1{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.page.addMultilingual{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {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 $packageID}{capture append=linkParameters}&packageID={@$packageID}{/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}
+       </div>
+{/hascontent}
 
 <form method="post" action="{link controller='PageList'}{/link}">
        <section class="section">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
-               
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='PageLanding'}{/link}" class="button"><span class="icon icon16 fa-home"></span> {lang}wcf.acp.page.landing{/lang}</a></li>
                                <li><a href="{link controller='PageAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.page.add{/lang}</span></a></li>
                                <li><a href="{link controller='PageAdd'}isMultilingual=1{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.page.addMultilingual{/lang}</span></a></li>
-               
-                               {event name='contentNavigationButtonsBottom'}
+                               
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {/if}
 
 {include file='footer'}
index da9ba339d4298eae2c5e33a314b07678b47707f6..b6787720dd9a708ae86c36bba4b95909aa10bd68 100644 (file)
 {include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=false}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='PaidSubscriptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='PaidSubscriptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='PaidSubscriptionAdd'}{/link}{else}{link controller='PaidSubscriptionEdit' id=$subscriptionID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'title'} class="formError"{/if}>
index 94f601010af85252d25d60ab1170d55f5399fc31..6a5134e4dc3b10918030476bca4601ceb5a7da56 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller='PaidSubscriptionList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='PaidSubscriptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.paidSubscription.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller='PaidSubscriptionList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='PaidSubscriptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.paidSubscription.add{/lang}</span></a></li>
-                       
-                               {event name='contentNavigationButtonsBottom'}
+                               
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 6ff090a232c681d9d93d88cead9e61b24096e0fb..2f45ccaff1184acc583feeb63325ce10966c60e8 100644 (file)
@@ -2,18 +2,18 @@
 {include file='header'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.transactionLog{/lang}: {@$log->logID}</h1>
-</header>
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.transactionLog{/lang}: {@$log->logID}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='PaidSubscriptionTransactionLogList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.transactionLog.list{/lang}</span></a></li>
-               
-                       {event name='contentNavigationButtonsTop'}
+                       
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
 
 <section class="section">
        <h2 class="sectionTitle">{lang}wcf.acp.paidSubscription.transactionLog{/lang}: {@$log->logID}</h2>
 
 {event name='sections'}
 
-<div class="contentNavigation">
-       <nav>
+<footer class="contentFooter">
+       {hascontent}
+               <div class="paginationBottom">
+                       {content}{@$pagesLinks}{/content}
+               </div>
+       {/hascontent}
+       
+       <nav class="contentFooterNavigation">
                <ul>
                        <li><a href="{link controller='PaidSubscriptionTransactionLogList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.transactionLog.list{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsBottom'}
+                       {event name='contentFooterNavigation'}
                </ul>
        </nav>
-</div>
+</footer>
 
 {include file='footer'}
index 445d2af4c75163f39289588363c7c58ec894fe19..e2f50e98fa37a7423262c2eb0e771943aa933cf4 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.transactionLog.list{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.transactionLog.list{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 <form method="post" action="{link controller='PaidSubscriptionTransactionLogList'}{/link}">
        </div>
 </form>
 
-<div class="contentNavigation">
-       {assign var='linkParameters' value=''}
-       {if $transactionID}{capture append=linkParameters}&transactionID={@$transactionID|rawurlencode}{/capture}{/if}
-       {if $username}{capture append=linkParameters}&username={@$username|rawurlencode}{/capture}{/if}
-       {if $subscriptionID}{capture append=linkParameters}&subscriptionID={@$subscriptionID}{/capture}{/if}
-       
-       {pages print=true assign=pagesLinks controller='PaidSubscriptionTransactionLogList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
-       
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
+{hascontent}
+       <div class="paginationTop">
+               {content}
+                       {assign var='linkParameters' value=''}
+                       {if $transactionID}{capture append=linkParameters}&transactionID={@$transactionID|rawurlencode}{/capture}{/if}
+                       {if $username}{capture append=linkParameters}&username={@$username|rawurlencode}{/capture}{/if}
+                       {if $subscriptionID}{capture append=linkParameters}&subscriptionID={@$subscriptionID}{/capture}{/if}
+                       
+                       {pages print=true assign=pagesLinks controller='PaidSubscriptionTransactionLogList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
+               {/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
                {hascontent}
-                       <nav>
+                       <nav class="contentFooterNavigation">
                                <ul>
-                                       {content}
-                                               {event name='contentNavigationButtonsBottom'}
-                                       {/content}
+                                       {content}{event name='contentFooterNavigation'}{/content}
                                </ul>
                        </nav>
                {/hascontent}
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 36f17e521fdcfd68bf3238d8eae07bec6721069b..b85f39886bfd88734ec70b71866b8e98bc526f33 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.add{/lang}</h1>
-       <p class="contentHeaderDescription">{$subscription->title|language}</p>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.add{/lang}</h1>
+               <p class="contentHeaderDescription">{$subscription->title|language}</p>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='PaidSubscriptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.add{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='PaidSubscriptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.paidSubscription.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{link controller='PaidSubscriptionUserAdd' id=$subscriptionID}{/link}">
        <div class="section">
                <dl{if $errorField == 'username'} class="formError"{/if}>
index 11f240ab515fd3906dfedf528266db5ee054a2d5..e2140e7c10682e9bca22e692fa35afa256c1fa83 100644 (file)
@@ -9,22 +9,24 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller='PaidSubscriptionUserList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.list{/lang}</h1>
+       </div>
        
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller='PaidSubscriptionUserList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
                {hascontent}
-                       <nav>
+                       <nav class="contentFooterNavigation">
                                <ul>
-                                       {content}
-                                               {event name='contentNavigationButtonsBottom'}
-                                       {/content}
+                                       {content}{event name='contentFooterNavigation'}{/content}
                                </ul>
                        </nav>
                {/hascontent}
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 65fdb1610968a993ab1465aeff988f7ddfeb2480..6f21efd1a76b720320f5b915977f281c8ba65d73 100644 (file)
@@ -9,24 +9,22 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.rebuildData{/lang}</h1>
-</header>
-
-{if $showInnoDBWarning}
-       <p class="warning">{lang}wcf.acp.index.innoDBWarning{/lang}</p>
-{/if}
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.rebuildData{/lang}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{if $showInnoDBWarning}
+       <p class="warning">{lang}wcf.acp.index.innoDBWarning{/lang}</p>
+{/if}
 
 <section class="section">
        <header class="sectionHeader">
        {/foreach}
 </section>
 
-<div class="contentNavigation">
+<footer class="contentFooter">
        {hascontent}
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsBottom'}
-                               {/content}
+                               {content}{event name='contentFooterNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</footer>
 
 {include file='footer'}
index f787e081c4b714cd0c5bada092712766e0071221..962f0d70559e2ed107a6f4b97a506f93cdb3e5d6 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.smiley.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.smiley.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.smiley.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='SmileyList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.smiley.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       <li><a href="{link controller='SmileyList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.smiley.list{/lang}</span></a></li>
-                                       {event name='contentNavigationButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='SmileyAdd'}{/link}{else}{link controller='SmileyEdit' id=$smiley->smileyID}{/link}{/if}" enctype="multipart/form-data">
-       <div class="section">
+       <section class="section">
                <dl{if $errorField == 'smileyTitle'} class="formError"{/if}>
                        <dt><label for="smileyTitle">{lang}wcf.acp.smiley.title{/lang}</label></dt>
                        <dd>
index 3200e2108a45f2c287bfe131fd483d17fd354aab..1910d15eb0ba65a4d429e4a683ab63b38ded1fcc 100644 (file)
 {/if}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.smiley.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="SmileyList" object=$category link="pageNo=%d"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.smiley.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='SmileyAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.smiley.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="SmileyList" object=$category link="pageNo=%d"}{/content}
+       </div>
+{/hascontent}
+
 {if $smileyCount}
        <div class="section tabMenuContainer">
                <nav class="menu">{*todo*}
index 3482e8643582aaf3709916f38dae8e3ec73aa0f9..8be9f85a112d4c3713eda3bbea43132dbb377ec8 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.style.{$action}{/lang}</h1>
-       {if $action == 'edit'}<p class="contentHeaderDescription">{$styleName}</p>{/if}
-</header>
-
-<p class="info">{lang}wcf.acp.style.protected{/lang}</p>
-
-{include file='formError'}
-
-{if $success|isset}
-       <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
-{/if}
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.style.{$action}{/lang}</h1>
+               {if $action == 'edit'}<p class="contentHeaderDescription">{$styleName}</p>{/if}
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        {if $action == 'edit'}
                                <li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" class="button"><span class="icon icon16 fa-download"></span> <span>{lang}wcf.acp.style.exportStyle{/lang}</span></a></li>
                        
                        <li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtons'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+<p class="info">{lang}wcf.acp.style.protected{/lang}</p>
+
+{include file='formError'}
+
+{if $success|isset}
+       <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
+{/if}
 
 <form method="post" action="{if $action == 'add'}{link controller='StyleAdd'}{/link}{else}{link controller='StyleEdit' id=$styleID}{/link}{/if}">
        <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="styleTabMenuContainer">
index b622494ab7626d33d2d02783565a5ed3daf6c9d7..f963a70b0b62e43ff6b14c7222723c8569855938 100644 (file)
@@ -1,20 +1,20 @@
 {include file='header' pageTitle='wcf.acp.style.exportStyle'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.style.exportStyle{/lang}</h1>
-</header>
-
-{include file='formError'}
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.style.exportStyle{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtons'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{include file='formError'}
 
 <form method="post" action="{link controller='StyleExport' id=$styleID}{/link}">
        <section class="section">
index a9926e2d47ec19d9a1e7fe41e764e91496c71757..0ec638775c825e4bab2ccd591b40f01d1763dccc 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.style.importStyle'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.style.importStyle{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.style.importStyle{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.add{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{link controller='StyleImport'}{/link}" enctype="multipart/form-data">
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.acp.style.import.source{/lang}</h2>
index 7de91a4ffe073252a59836eaee693ecb2780281f..54f795649973adda384a75e354c47b053b02e35c 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.style.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="StyleList" link="pageNo=%d"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.style.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='StyleAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
                        <li><a href="{link controller='StyleImport'}{/link}" class="button"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtonsTop'}
+                       
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="StyleList" link="pageNo=%d"}{/content}
+       </div>
+{/hascontent}
 
 <div class="section sectionContainerList">
        <ol class="containerList styleList">
        </ol>
 </div>
 
-<div class="contentNavigation">
-       {@$pagesLinks}
+<footer class="contentFooter">
+       {hascontent}
+               <div class="paginationBottom">
+                       {content}{@$pagesLinks}{/content}
+               </div>
+       {/hascontent}
        
-       <nav>
+       <nav class="contentFooterNavigation">
                <ul>
                        <li><a href="{link controller='StyleAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
                        <li><a href="{link controller='StyleImport'}{/link}" class="button"><span class="icon icon16 fa-upload"></span> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtonsBottom'}
+                       
+                       {event name='contentFooterNavigation'}
                </ul>
        </nav>
-</div>
+</footer>
 
 {include file='footer'}
index 990535f6d0fd9c181e9da41c761ceb79f5407bea..0566682b1c6f4b214964a7d81e39c8887b9052dd 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.tag.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.tag.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.tag.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='TagList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.tag.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='TagList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.tag.list{/lang}</span></a></li>
-                               
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='TagAdd'}{/link}{else}{link controller='TagEdit' object=$tagObj}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'name'} class="formError"{/if}>
index 9deffc9800168f8f0e2b56d9b387de319018f570..950879f55fd63bbe2a108226b00619c8be81f4ed 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.tag.list{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.tag.list{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='TagAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        </form>
 {/if}
 
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="TagList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&search=$search"}
-       
-       <nav>
-               <ul>
-                       <li><a href="{link controller='TagAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtonsTop'}
-               </ul>
-       </nav>
-</div>
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="TagList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&search=$search"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                                {/foreach}
                        </tbody>
                </table>
-               
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='TagAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.tag.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-               
-               <nav class="jsClipboardEditor" data-types="[ 'com.woltlab.wcf.tag' ]"></nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 3530dd9e5b3bed2440e96a5b141508b7f4631d59..b1b09268630619df108c4f36e6302f9ff1e7c36a 100644 (file)
@@ -1,8 +1,19 @@
 {include file='header' pageTitle='wcf.acp.template.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.template.{$action}{/lang}</h1>
-       {if $action == 'edit'}<p class="contentHeaderDescription">{$template->getPath()}</p>{/if}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.template.{$action}{/lang}</h1>
+               {if $action == 'edit'}<p class="contentHeaderDescription">{$template->getPath()}</p>{/if}
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       {if $action == 'edit'}<li><a href="{link controller='TemplateDiff' id=$template->templateID}{/link}" class="button"><span class="icon icon16 fa-exchange"></span> <span>{lang}wcf.acp.template.diff{/lang}</span></a></li>{/if}
+                       <li><a href="{link controller='TemplateList'}{if $action == 'edit'}templateGroupID={@$template->templateGroupID}{/if}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.template.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       {if $action == 'edit'}<li><a href="{link controller='TemplateDiff' id=$template->templateID}{/link}" class="button"><span class="icon icon16 fa-exchange"></span> <span>{lang}wcf.acp.template.diff{/lang}</span></a></li>{/if}
-                       <li><a href="{link controller='TemplateList'}{if $action == 'edit'}templateGroupID={@$template->templateGroupID}{/if}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.template.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 {if $availableTemplateGroups|count}
        <form method="post" action="{if $action == 'add'}{link controller='TemplateAdd'}{/link}{else}{link controller='TemplateEdit' id=$templateID}{/link}{/if}">
                <div class="section">
index e43853d03312a458511d5d6faee7958d314c31f7..8e51ce0ab06ec8d5e10babe0b39ba99bd3cb9949 100644 (file)
@@ -1,7 +1,27 @@
 {include file='header' pageTitle="wcf.acp.template.diff"}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.template.diff{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.template.diff{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}
+                                       {if $diff}
+                                               <li><a id="requestFullscreen" class="button" style="display: none;"><span class="icon icon16 fa-arrows-alt"></span> <span>{lang}wcf.global.button.fullscreen{/lang}</span></a></li>
+                                               
+                                               {if $parent->templateGroupID}
+                                                       <li><a href="{link controller='TemplateEdit' id=$parent->templateID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
+                                               {/if}
+                                       {/if}
+                                       
+                                       {event name='contentHeaderNavigation'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
 
 {if $diff}
        <div id="fullscreenContainer">
-               <div class="contentNavigation">
-                       <nav>
-                               <ul>
-                                       <li><a id="requestFullscreen" class="button" style="display: none;"><span class="icon icon16 fa-arrows-alt"></span> <span>{lang}wcf.global.button.fullscreen{/lang}</span></a></li>
-                               </ul>
-                       </nav>
-               </div>
-               
                <div class="sideBySide">
                        <div class="section">
                                <header class="sectionHeader">
                                                *}{/foreach}{*
                                        *}</ol>{*
                                *}</pre>
-                               
-                               {if $parent->templateGroupID}
-                                       <div class="contentNavigation">
-                                               <nav>
-                                                       <ul>
-                                                               <li><a href="{link controller='TemplateEdit' id=$parent->templateID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
-                                                       </ul>
-                                               </nav>
-                                       </div>
-                               {/if}
                        </div>
                        <div class="section">
                                <header class="sectionHeader">
                                        *}</ol>{*
                                *}</pre>
                                
-                               <div class="contentNavigation">
-                                       <nav>
+                               <footer class="contentFooter">
+                                       <nav class="contentFooterNavigation">
                                                <ul>
                                                        <li><a href="{link controller='TemplateEdit' id=$template->templateID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
+                                                       
+                                                       {event name='contentFooterNavigation'}
                                                </ul>
                                        </nav>
-                               </div>
+                               </footer>
                        </div>
                </div>
        </div>
index 539bfcd4eafdf77031ace62e0452a54670c02c78..970d46f6c0aedcdd39ebf319858dd069bdff9be0 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.template.group.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.template.group.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.template.group.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='TemplateGroupList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.template.group.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='TemplateGroupList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.template.group.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='TemplateGroupAdd'}{/link}{else}{link controller='TemplateGroupEdit' id=$templateGroupID}{/link}{/if}">
        <div class="section">
                {if $availableTemplateGroups|count}
index e75b06c14fcbd907855e6df63b820d96ad701bfd..aff6f7ee009a1b35f3fd6ef811b7591de53c5599 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.template.group.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="TemplateGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.template.group.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='TemplateGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.group.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="TemplateGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div id="templateGroupTableContainer" class="section tabularBox">
                
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='TemplateGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.group.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index e557cfb72421c1047f9d1639fae8eafe0384d160..50e68636ffb4fa103264eb9404296da5a76fdae7 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.template.list{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.template.list{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='TemplateAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        </div>
 </form>
 
-<div class="contentNavigation">
-       {assign var='linkParameters' value=''}
-       {if $templateGroupID}{capture append=linkParameters}&templateGroupID={@$templateGroupID}{/capture}{/if}
-       {if $searchTemplateName}{capture append=linkParameters}&searchTemplateName={@$searchTemplateName|rawurlencode}{/capture}{/if}
-       {if $application}{capture append=linkParameters}&application={$application}{/capture}{/if}
-       
-       {pages print=true assign=pagesLinks controller="TemplateList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
-       
-       <nav>
-               <ul>
-                       <li><a href="{link controller='TemplateAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
+{hascontent}
+       <div class="paginationTop">
+               {content}
+                       {assign var='linkParameters' value=''}
+                       {if $templateGroupID}{capture append=linkParameters}&templateGroupID={@$templateGroupID}{/capture}{/if}
+                       {if $searchTemplateName}{capture append=linkParameters}&searchTemplateName={@$searchTemplateName|rawurlencode}{/capture}{/if}
+                       {if $application}{capture append=linkParameters}&application={$application}{/capture}{/if}
                        
-                       {event name='contentNavigationButtonsTop'}
-               </ul>
-       </nav>
-</div>
+                       {pages print=true assign=pagesLinks controller="TemplateList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}        
+               {/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div id="templateTableContainer" class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='TemplateAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.template.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 60292f8158b2ea01df65da0739ba70b3320641d3..22247195eecbfc2e1749fca7d47ec4b8c763f524 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.activityPoint.option{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.activityPoint.option{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a id="updateEvents" class="button"><span class="icon icon16 fa-repeat"></span> <span>{lang}wcf.acp.user.activityPoint.updateEvents{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a id="updateEvents" class="button"><span class="icon icon16 fa-repeat"></span> <span>{lang}wcf.acp.user.activityPoint.updateEvents{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{link controller='UserActivityPointOption'}{/link}">
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.user.activityPoint.pointsPerObject{/lang}</h2>
index b3d2f9f15982a5f40534873d2a58703a0591687e..1189a56d830e9e313eb337cd02192423451f93be 100644 (file)
@@ -9,8 +9,18 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.{@$action}{/lang}</h1>
-       {if $action == 'edit'}<p class="contentHeaderDescription">{$user->username}</p>{/if}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.{@$action}{/lang}</h1>
+               {if $action == 'edit'}<p class="contentHeaderDescription">{$user->username}</p>{/if}
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='UserList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='UserList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='UserAdd'}{/link}{else}{link controller='UserEdit' id=$userID}{/link}{/if}">
        <div class="section tabMenuContainer">
                <nav class="tabMenu">
index 9ff5a06f437e2136df8cc175ce97b7cd687a4b25..16b96917ec5e103d451eca8c8c13c260762f431a 100644 (file)
@@ -1,22 +1,20 @@
 {include file='header' pageTitle='wcf.acp.user.assignToGroup'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.assignToGroup{/lang}</h1>
-</header>
-
-{include file='formError'}
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.assignToGroup{/lang}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{include file='formError'}
 
 <form method="post" action="{link controller='UserAssignToGroup'}{/link}">
        <section class="section">
index 8ead4d53c21414badcd8e005d7ff2d5a04599971..1ad08267fb42b8b8a637c9ccc38c1b3bee8c71f6 100644 (file)
@@ -1,22 +1,24 @@
 {include file='header' pageTitle='wcf.acp.user.authentication.failure.list'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.authentication.failure.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller='UserAuthenticationFailureList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.authentication.failure.list{/lang}</h1>
+       </div>
        
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller='UserAuthenticationFailureList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
                {hascontent}
-                       <nav>
+                       <nav class="contentFooterNavigation">
                                <ul>
-                                       {content}
-                                               {event name='contentNavigationButtonsBottom'}
-                                       {/content}
+                                       {content}{event name='contentFooterNavigation'}{/content}
                                </ul>
                        </nav>
                {/hascontent}
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 3eecb0b316c8de4390af1e577088d2eb0bd6d792..2ee2f90ac1b6ae3b5013a34e24103164527a48d1 100644 (file)
@@ -1,22 +1,20 @@
 {include file='header' pageTitle='wcf.acp.user.revertChanges'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.revertChanges{/lang}</h1>
-</header>
-
-{include file='formError'}
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.revertChanges{/lang}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{include file='formError'}
 
 <form method="post" action="{link controller='UserContentRevertChanges'}{/link}">
        <section class="section">
index 2fa5fb202dca50a5193b635b7be8b2f0c7143424..13c1bdfd723ceae4d77c105c64a1617da02f0c27 100644 (file)
@@ -9,22 +9,20 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
-</header>
-
-{include file='formError'}
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{include file='formError'}
 
 <form method="post" action="{link controller='UserEmailAddressExport'}{/link}">
        <section class="section">
index f89fad4d47a3afc9beb25c659204b16c6da4fbdf..c1fd1f9aeb5ac12860d2ac789c0dd7ef9cc75214 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.group.{@$action}{/lang}</h1>
-</header>
-
-{include file='formError'}
-
-{if $warningSelfEdit|isset}
-       <p class="warning">{lang}wcf.acp.group.edit.warning.selfIsMember{/lang}</p>
-{/if}
-
-{if $success|isset}
-       <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
-{/if}
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.group.{@$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        {if $action == 'edit'}
                                {if $availableUserGroups|count > 1}
                        
                        <li><a href="{link controller='UserGroupList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtons'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{include file='formError'}
+
+{if $warningSelfEdit|isset}
+       <p class="warning">{lang}wcf.acp.group.edit.warning.selfIsMember{/lang}</p>
+{/if}
+
+{if $success|isset}
+       <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
+{/if}
 
 <form method="post" action="{if $action == 'add'}{link controller='UserGroupAdd'}{/link}{else}{link controller='UserGroupEdit' id=$groupID}{/link}{/if}">
        <div class="section">
index feae7d1c3d6d7892353ccc24ca687dd30dc102cf..a7aaaa8d1cd700b1855bd8fa24d13cbbcfddbf66 100644 (file)
@@ -9,7 +9,17 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.group.assignment.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.group.assignment.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='UserGroupAssignmentList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.group.assignment.button.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='UserGroupAssignmentList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.group.assignment.button.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='UserGroupAssignmentAdd'}{/link}{else}{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'title'} class="formError"{/if}>
index 20f09eb386dca3bcee332bc113edb9590f11375d..a97f838bb3e216578d2794d1a55fcdcc97f8af02 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.group.assignment.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="UserGroupAssignmentList" link="pageNo=%d"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.group.assignment.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='UserGroupAssignmentAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.group.assignment.button.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="UserGroupAssignmentList" link="pageNo=%d"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox" id="userGroupAssignmentTableContainer">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='UserGroupAssignmentAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.group.assignment.button.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 76d15bde1a01efd7f047ec805869d725ab836e74..f504c4f194fc30c0dea66087512906e0285d92a7 100644 (file)
@@ -9,26 +9,30 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.group.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="UserGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.group.list{/lang}</h1>
+       </div>
        
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
                                {content}
                                        {if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}
                                                <li><a href="{link controller='UserGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
                                        {/if}
-                                       
-                                       {event name='contentNavigationButtonsTop'}
+                                               
+                                       {event name='contentHeaderNavigation'}
                                {/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="UserGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 <div class="section tabularBox">
        <table class="table">
        </table>
 </div>
 
-<div class="contentNavigation">
-       {@$pagesLinks}
+<footer class="contentFooter">
+       {hascontent}
+               <div class="paginationBottom">
+                       {content}{@$pagesLinks}{/content}
+               </div>
+       {/hascontent}
        
        {hascontent}
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                {content}
                                        {if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}
                                                <li><a href="{link controller='UserGroupAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
                                        {/if}
                                        
-                                       {event name='contentNavigationButtonsBottom'}
+                                       {event name='contentFooterNavigation'}
                                {/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</footer>
 
 {include file='footer'}
index 47b863a6b6242d7099d2a9ddb189efc5d0b22e2c..b32bdf432c5674d0482a324ceccb57529d48c4a4 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.group.option.editingOption{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.group.option.editingOption{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsTop'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
 <form method="post" action="{link controller='UserGroupOption' id=$userGroupOption->optionID}{/link}">
        <section class="section" id="optionValueContainer">
                <header class="sectionHeader">
        </div>
 </form>
 
-<div class="contentNavigation">
+<footer class="contentFooter">
        {hascontent}
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtonsBottom'}
-                               {/content}
+                               {content}{event name='contentFooterNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</footer>
 
 {include file='footer'}
index 5d03ec098c00131454b673399d27b2e4967f399b..faba83258d83aa0b751bffdc7f35fe95f55db330 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}
+                                       {if $__wcf->session->getPermission('admin.user.canAddUser')}
+                                               <li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+                                       {/if}
+                                       
+                                       {event name='contentHeaderNavigation'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
-{assign var=encodedURL value=$url|rawurlencode}
-{assign var=encodedAction value=$action|rawurlencode}
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="UserList" id=$searchID link="pageNo=%d&action=$encodedAction&sortField=$sortField&sortOrder=$sortOrder"}
-       
-       <nav>
-               <ul>
-                       {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                               <li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
-                       {/if}
+{hascontent}
+       <div class="paginationTop">
+               {content}
+                       {assign var=encodedURL value=$url|rawurlencode}
+                       {assign var=encodedAction value=$action|rawurlencode}
                        
-                       {event name='contentNavigationButtonsTop'}
-               </ul>
-       </nav>
-</div>
+                       {pages print=true assign=pagesLinks controller="UserList" id=$searchID link="pageNo=%d&action=$encodedAction&sortField=$sortField&sortOrder=$sortOrder"}
+               {/content}
+       </div>
+{/hascontent}
 
 {if $users|count}
        <div id="userTableContainer" class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
-                       <ul>
-                               {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                                       <li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
-                               {/if}
-                               
-                               {event name='contentNavigationButtonsBottom'}
-                       </ul>
-               </nav>
-               
-               <nav class="jsClipboardEditor" data-types="[ 'com.woltlab.wcf.user' ]"></nav>
-       </div>
+               {hascontent}
+                       <nav class="contentFooterNavigation">
+                               <ul>
+                                       {content}
+                                               {if $__wcf->session->getPermission('admin.user.canAddUser')}
+                                                       <li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+                                               {/if}
+                                               
+                                               {event name='contentFooterNavigation'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
+       </footer>
 {else}
        <p class="info">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
 {/if}
index fcce3550c1f6e7a3a8399d330e91c789de66841f..70b1884ddf1cc6c3913228fbf8b24f125cca47bb 100644 (file)
 {/if}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
-</header>
-
-{include file='formError'}
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='UserList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
                        <li><a href="{link controller='UserSearch'}{/link}" class="button"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtons'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{include file='formError'}
 
 <form method="post" action="{link controller='UserMail'}{/link}">
        {if $action == ''}
index b8956662ab125b49929264d60301e051a0e51180..9f9f18f5059caa49d0ff5e740e1b0c56a0749f38 100644 (file)
@@ -1,22 +1,20 @@
 {include file='header' pageTitle='wcf.acp.user.merge'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.merge{/lang}</h1>
-</header>
-
-{include file='formError'}
-
-<div class="contentNavigation">
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.merge{/lang}</h1>
+       </div>
+       
        {hascontent}
-               <nav>
+               <nav class="contentHeaderNavigation">
                        <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
+                               {content}{event name='contentHeaderNavigation'}{/content}
                        </ul>
                </nav>
        {/hascontent}
-</div>
+</header>
+
+{include file='formError'}
 
 <form method="post" action="{link controller='UserMerge'}{/link}">
        <section class="section">
@@ -57,7 +55,7 @@
        {event name='sections'}
        
        <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
                {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
index 8dd038f222a337b81e71f07b4d397b82f41bcecd..c337c07d12ae959e3ca06b1328edd3deb1872666 100644 (file)
@@ -1,7 +1,18 @@
 {include file='header' pageTitle='wcf.acp.user.option.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.option.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.option.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='UserOptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.option.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
+
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='UserOptionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.option.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 {if !$availableCategories|empty}
        <form method="post" action="{if $action == 'add'}{link controller='UserOptionAdd'}{/link}{else}{link controller='UserOptionEdit' id=$optionID}{/link}{/if}">
                <div class="section">
index c0af44bfe6791f3ea00a76cbb67bcfa2e2a9b1e9..9ec322bd7929973a85ba26e38c4ef31ca98c0a55 100644 (file)
@@ -1,7 +1,18 @@
 {include file='header' pageTitle='wcf.acp.user.option.category.'|concat:$action}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='UserOptionCategoryList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.option.category.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
+
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='UserOptionCategoryList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.option.category.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='UserOptionCategoryAdd'}{/link}{else}{link controller='UserOptionCategoryEdit' id=$categoryID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'categoryName'} class="formError"{/if}>
index 5efb45f364281c1ff8be957053861a90dfb9b794..a95465e1d2342e0350123bdcb4f28316eafaad50 100644 (file)
@@ -9,21 +9,25 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.option.category.list{/lang}</h1>
-</header>
-
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="UserOptionCategoryList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.option.category.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="UserOptionCategoryList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                                {/foreach}
                        </tbody>
                </table>
-               
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index 4fd081f9696c438d918038eacb8da95da103d78e..423df1aab9fb412433bbd979a1f0975665d260b7 100644 (file)
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.option.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="UserOptionList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.option.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='UserOptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.option.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="UserOptionList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {if $objects|count}
        <div class="section tabularBox">
                </table>
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='UserOptionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.option.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
index a1faa0a7d2614d5c8665bfa0744bdff23e185c3e..bc259a3ee3ea265c876dc14b894c7122d7223ecc 100644 (file)
@@ -1,7 +1,17 @@
 {include file='header' pageTitle='wcf.acp.user.option.setDefaults'}
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.option.setDefaults{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.option.setDefaults{/lang}</h1>
+       </div>
+       
+       {hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               {content}{event name='contentHeaderNavigation'}{/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       {hascontent}
-               <nav>
-                       <ul>
-                               {content}
-                                       {event name='contentNavigationButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
 {if !$optionTree|empty}
        <form method="post" action="{link controller='UserOptionSetDefaults'}{/link}">
                <div class="section">
index d269dcb9c0ae907c9d8af45fb1644b964185bd16..84085112e2e7a18125b41bdc9fb94bd766d56ef9 100644 (file)
@@ -9,7 +9,17 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.rank.{$action}{/lang}</h1>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.rank.{$action}{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
+               <ul>
+                       <li><a href="{link controller='UserRankList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.rank.list{/lang}</span></a></li>
+                       
+                       {event name='contentHeaderNavigation'}
+               </ul>
+       </nav>
 </header>
 
 {include file='formError'}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
 {/if}
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='UserRankList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.user.rank.list{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtons'}
-               </ul>
-       </nav>
-</div>
-
 <form method="post" action="{if $action == 'add'}{link controller='UserRankAdd'}{/link}{else}{link controller='UserRankEdit' id=$rankID}{/link}{/if}">
        <div class="section">
                <dl{if $errorField == 'rankTitle'} class="formError"{/if}>
index 85c08493e59fd85e8f21c2ab42647b3263fd0dad..f26e56b657365eed0815c086e44fb602a77a86b1 100644 (file)
@@ -9,20 +9,24 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.rank.list{/lang}</h1>
-</header>
-
-<div class="contentNavigation">
-       {pages print=true assign=pagesLinks controller="UserRankList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.rank.list{/lang}</h1>
+       </div>
        
-       <nav>
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li><a href="{link controller='UserRankAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.rank.add{/lang}</span></a></li>
                        
-                       {event name='contentNavigationButtonsTop'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{hascontent}
+       <div class="paginationTop">
+               {content}{pages print=true assign=pagesLinks controller="UserRankList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+       </div>
+{/hascontent}
 
 {hascontent}
        <div class="section tabularBox">
                                {/content}
                        </tbody>
                </table>
-               
        </div>
        
-       <div class="contentNavigation">
-               {@$pagesLinks}
+       <footer class="contentFooter">
+               {hascontent}
+                       <div class="paginationBottom">
+                               {content}{@$pagesLinks}{/content}
+                       </div>
+               {/hascontent}
                
-               <nav>
+               <nav class="contentFooterNavigation">
                        <ul>
                                <li><a href="{link controller='UserRankAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.user.rank.add{/lang}</span></a></li>
                                
-                               {event name='contentNavigationButtonsBottom'}
+                               {event name='contentFooterNavigation'}
                        </ul>
                </nav>
-       </div>
+       </footer>
 {hascontentelse}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/hascontent}
index 3be1e92649b54ae4eb35da2c3efa593c62bbab4a..a7ac6ffbd725aec73ac1379c3a4b7c0e9997a774 100644 (file)
@@ -7,17 +7,11 @@
 </script>
 
 <header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.acp.user.search{/lang}</h1>
-</header>
-
-{if $errorField == 'search'}
-       <p class="error">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
-{else}
-       {include file='formError'}
-{/if}
-
-<div class="contentNavigation">
-       <nav>
+       <div class="contentHeaderTitle">
+               <h1 class="contentTitle">{lang}wcf.acp.user.search{/lang}</h1>
+       </div>
+       
+       <nav class="contentHeaderNavigation">
                <ul>
                        <li class="dropdown">
                                <a class="button dropdownToggle"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.user.quickSearch{/lang}</span></a>
                                </ul>
                        </li>
                        
-                       {event name='contentNavigationButtons'}
+                       {event name='contentHeaderNavigation'}
                </ul>
        </nav>
-</div>
+</header>
+
+{if $errorField == 'search'}
+       <p class="error">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
+{else}
+       {include file='formError'}
+{/if}
 
 <form method="post" action="{link controller='UserSearch'}{/link}">
        <section class="section">