Updates/Adds template events
authorMatthias Schmidt <gravatronics@live.com>
Mon, 14 Jan 2013 21:29:38 +0000 (22:29 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 14 Jan 2013 21:29:38 +0000 (22:29 +0100)
cf. #877

47 files changed:
wcfsetup/install/files/acp/templates/acpSessionLog.tpl
wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
wcfsetup/install/files/acp/templates/applicationEdit.tpl
wcfsetup/install/files/acp/templates/applicationManagement.tpl
wcfsetup/install/files/acp/templates/cacheList.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/index.tpl
wcfsetup/install/files/acp/templates/languageAdd.tpl
wcfsetup/install/files/acp/templates/languageExport.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/masterPassword.tpl
wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/optionImport.tpl
wcfsetup/install/files/acp/templates/package.tpl
wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/files/acp/templates/packageStartInstall.tpl
wcfsetup/install/files/acp/templates/packageUpdate.tpl
wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
wcfsetup/install/files/acp/templates/pageMenuItemList.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/updateServerAdd.tpl
wcfsetup/install/files/acp/templates/updateServerList.tpl
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.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/userSearch.tpl
wcfsetup/install/files/acp/templates/usersMassProcessing.tpl

index 76ff4a572666c77ec483183620e63f6f392fb255..d43293f3098b7ac79e0e67c5eb9808aa26af3c65 100644 (file)
@@ -13,7 +13,7 @@
                <ul>
                        <li><a href="{link controller='ACPSessionLogList'}{/link}" title="{lang}wcf.acp.sessionLog.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
                        
-                       {event name='largeButtonsTop'}
+                       {event name='contentNavigationButtonsTop'}
                </ul>
        </nav>
 </div>
@@ -34,7 +34,7 @@
                                        <th class="columnURL columnRequestURI{if $sortField == 'requestURI'} active{/if}"><a href="{link controller='ACPSessionLog' id=$sessionLogID}pageNo={@$pageNo}&sortField=requestURI&sortOrder={if $sortField == 'requestURI' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnText columnRequestMethod{if $sortField == 'requestMethod'} active{/if}"><a href="{link controller='ACPSessionLog' id=$sessionLogID}pageNo={@$pageNo}&sortField=requestMethod&sortOrder={if $sortField == 'requestMethod' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {event name='headColumns'}
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
@@ -64,7 +64,7 @@
                        <ul>
                                <li><a href="{link controller='ACPSessionLogList'}{/link}" title="{lang}wcf.acp.sessionLog.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.sessionLog.list{/lang}</span></a></li>
                                
-                               {event name='largeButtonsBottom'}
+                               {event name='contentNavigationButtonsBottom'}
                        </ul>
                </nav>
        </div>
index d071a1e07ae1e2d4c790f587cfef1695b80ec121..4ff2fad09d6d6a771dc2b6e5fbce89550ebf4529 100644 (file)
@@ -8,9 +8,19 @@
 
 <div class="contentNavigation">
        {pages print=true assign=pagesLinks controller="ACPSessionLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       
+       {hascontent}
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtonsTop'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </div>
 
-{hascontent}
+{if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop">
                <hgroup>
                        <h1>{lang}wcf.acp.sessionLog.list{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.sessionLog.list.count{/lang}">{#$items}</span></h1>
                                        <th class="columnDate columnLastActivityTime{if $sortField == 'lastActivityTime'} active{/if}"><a href="{link controller='ACPSessionLogList'}pageNo={@$pageNo}&sortField=lastActivityTime&sortOrder={if $sortField == 'lastActivityTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnDigits columnAccesses{if $sortField == 'accesses'} active{/if}"><a href="{link controller='ACPSessionLogList'}pageNo={@$pageNo}&sortField=accesses&sortOrder={if $sortField == 'accesses' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.sessionLog.actions{/lang}{if $sortField == 'accesses'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {event name='headColumns'}
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
                        <tbody>
-                               {content}
-                                       {foreach from=$objects item=sessionLog}
-                                               <tr class="{if $sessionLog->active} activeContainer{/if}">
-                                                       <td class="columnID columnSessionLogID"><p>{@$sessionLog->sessionLogID}</p></td>
-                                                       <td class="columnTitle columnUsername"><p>{if $__wcf->user->userID == $sessionLog->userID}<img src="{@$__wcf->getPath()}icon/user.svg" alt="" class="icon16" />{/if} <a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->username}</a></p></td>
-                                                       <td class="columnSmallText columnIpAddress"><p><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->getIpAddress()}</a>{if $sessionLog->hostname != $sessionLog->ipAddress}<br /><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->hostname}</a>{/if}</p></td>
-                                                       <td class="columnSmallText columnUserAgent" title="{$sessionLog->userAgent}"><p><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->userAgent|truncate:75}</a></p></td>
-                                                       <td class="columnDate columnTime"><p>{@$sessionLog->time|time}</p></td>
-                                                       <td class="columnDate columnLastActivityTime"><p>{@$sessionLog->lastActivityTime|time}</p></td>
-                                                       <td class="columnDigits columnAccesses"><p>{#$sessionLog->accesses}</p></td>
-                                                       
-                                                       {event name='columns'}
-                                               </tr>
-                                       {/foreach}
-                               {/content}
+                               {foreach from=$objects item=sessionLog}
+                                       <tr class="{if $sessionLog->active} activeContainer{/if}">
+                                               <td class="columnID columnSessionLogID"><p>{@$sessionLog->sessionLogID}</p></td>
+                                               <td class="columnTitle columnUsername"><p>{if $__wcf->user->userID == $sessionLog->userID}<img src="{@$__wcf->getPath()}icon/user.svg" alt="" class="icon16" />{/if} <a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->username}</a></p></td>
+                                               <td class="columnSmallText columnIpAddress"><p><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->getIpAddress()}</a>{if $sessionLog->hostname != $sessionLog->ipAddress}<br /><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->hostname}</a>{/if}</p></td>
+                                               <td class="columnSmallText columnUserAgent" title="{$sessionLog->userAgent}"><p><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->userAgent|truncate:75}</a></p></td>
+                                               <td class="columnDate columnTime"><p>{@$sessionLog->time|time}</p></td>
+                                               <td class="columnDate columnLastActivityTime"><p>{@$sessionLog->lastActivityTime|time}</p></td>
+                                               <td class="columnDigits columnAccesses"><p>{#$sessionLog->accesses}</p></td>
+                                               
+                                               {event name='columns'}
+                                       </tr>
+                               {/foreach}
                        </tbody>
                </table>
        </div>
        
        <div class="contentNavigation">
                {@$pagesLinks}
+               
+               {hascontent}
+                       <nav>
+                               <ul>
+                                       {content}
+                                               {event name='contentNavigationButtonsBottom'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
        </div>
-{/hascontent}
+{/if}
 
 {include file='footer'}
index 0751bf362c3daf941b9205aa81664750fc955315..77ff5162a48c4f6edf6d0c32a9b1dd51703b7490 100644 (file)
 <div class="contentNavigation">
        <nav>
                <ul>
-                       {if $application->packageID != 1 && !$application->isPrimary}<li><a id="setAsPrimary" class="button"><img src="{@$__wcf->getPath()}icon/default.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.application.setAsPrimary{/lang}</span></a></li>{/if}
+                       {if $application->packageID != 1 && !$application->isPrimary}
+                               <li><a id="setAsPrimary" class="button"><img src="{@$__wcf->getPath()}icon/default.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.application.setAsPrimary{/lang}</span></a></li>
+                       {/if}
                        <li><a href="{link controller='ApplicationManagement'}{/link}" title="{lang}wcf.acp.application.management{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.application.management{/lang}</span></a></li>
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
@@ -65,6 +67,7 @@
                                        {/if}
                                </dd>
                        </dl>
+                       
                        <dl>
                                <dt><label for="domainPath">{lang}wcf.acp.application.domainPath{/lang}</label></dt>
                                <dd>
@@ -72,6 +75,8 @@
                                        <small>{lang}wcf.acp.application.domainPath.description{/lang}</small>
                                </dd>
                        </dl>
+                       
+                       {event name='domainFields'}
                </fieldset>
                
                <fieldset>
@@ -94,6 +99,7 @@
                                        {/if}
                                </dd>
                        </dl>
+                       
                        <dl{if $errorField == 'cookiePath'} class="formError"{/if}>
                                <dt><label for="cookiePath">{lang}wcf.acp.application.cookiePath{/lang}</label></dt>
                                <dd>
                                        {/if}
                                </dd>
                        </dl>
+                       
+                       {event name='cookieFields'}
                </fieldset>
                
                {event name='fieldsets'}
index 1aa331e7c9e80e079469ca4731f8c509f42c534d..e12157c40956fbfb7894c291a524b73d8dd4501d 100644 (file)
@@ -1,10 +1,18 @@
 {include file='header' pageTitle='wcf.acp.application.management'}
 
-<div class="contentNavigation">
-       {* todo: event *}
-</div>
-
 {hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtonsTop'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
+
+{if $applicationList|count}
        <header class="boxHeadline">
                <hgroup>
                        <h1>{lang}wcf.acp.application.list{/lang} <span class="badge">{#$applicationList|count}</span></h1>
                                        <th class="columnText columnCookieDomain">{lang}wcf.acp.application.cookieDomain{/lang}</th>
                                        <th class="columnText columnCookiePath">{lang}wcf.acp.application.cookiePath{/lang}</th>
                                        
-                                       {event name='headColumns'}
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
                        <tbody>
-                               {content}
-                                       {foreach from=$applicationList item=application}
-                                               <tr>
-                                                       <td class="columnIcon"><a href="{link controller='ApplicationEdit' id=$application->packageID}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" class="icon16 jsTooltip" title="{lang}wcf.global.button.edit{/lang}" /></a></td>
-                                                       <td class="columnID columnPackageID">{#$application->packageID}</td>
-                                                       <td class="columnText columnPackageName">
-                                                               <a href="{link controller='ApplicationEdit' id=$application->packageID}{/link}">{$application->getPackage()}</a>
-                                                               {if $application->isPrimary}
-                                                                       <aside class="statusDisplay">
-                                                                               <img src="{@$__wcf->getPath()}icon/home.svg" alt="" class="icon16 jsTooltip" title="{lang}wcf.acp.application.primaryApplication{/lang}" />
-                                                                       </aside>
-                                                               {/if}
-                                                       </td>
-                                                       <td class="columnText columnDomainName">{$application->domainName}</td>
-                                                       <td class="columnText columnDomainPath">{$application->domainPath}</td>
-                                                       <td class="columnText columnCookieDomain">{$application->cookieDomain}</td>
-                                                       <td class="columnText columnCookiePath">{$application->cookiePath}</td>
-                                               </tr>
-                                       {/foreach}
-                               {/content}
+                               {foreach from=$applicationList item=application}
+                                       <tr>
+                                               <td class="columnIcon"><a href="{link controller='ApplicationEdit' id=$application->packageID}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" class="icon16 jsTooltip" title="{lang}wcf.global.button.edit{/lang}" /></a></td>
+                                               <td class="columnID columnPackageID">{#$application->packageID}</td>
+                                               <td class="columnText columnPackageName">
+                                                       <a href="{link controller='ApplicationEdit' id=$application->packageID}{/link}">{$application->getPackage()}</a>
+                                                       {if $application->isPrimary}
+                                                               <aside class="statusDisplay">
+                                                                       <img src="{@$__wcf->getPath()}icon/home.svg" alt="" class="icon16 jsTooltip" title="{lang}wcf.acp.application.primaryApplication{/lang}" />
+                                                               </aside>
+                                                       {/if}
+                                               </td>
+                                               <td class="columnText columnDomainName">{$application->domainName}</td>
+                                               <td class="columnText columnDomainPath">{$application->domainPath}</td>
+                                               <td class="columnText columnCookieDomain">{$application->cookieDomain}</td>
+                                               <td class="columnText columnCookiePath">{$application->cookiePath}</td>
+                                               
+                                               {event name='columns'}
+                                       </tr>
+                               {/foreach}
                        </tbody>
                </table>
        </div>
-{/hascontent}
-
-<div class="contentNavigation">
-       {* todo: event *}
-</div>
+       
+       {hascontent}
+               <div class="contentNavigation">
+                       <nav>
+                               <ul>
+                                       {content}
+                                               {event name='contentNavigationButtonsBottom'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               </div>
+       {/hascontent}
+{/if}
 
 {include file='footer'}
index 15364bf43c086de664d474c195239cc5bef942c3..30868e5f1357d485fc8b9ea4ea87b56455ad657d 100644 (file)
 <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"><img src="{@$__wcf->getPath()}icon/delete.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
+                       {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"><img src="{@$__wcf->getPath()}icon/delete.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                       {/if}
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtonsTop'}
                </ul>
        </nav>
 </div>
 <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"><img src="{@$__wcf->getPath()}icon/delete.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
+                       {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"><img src="{@$__wcf->getPath()}icon/delete.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                       {/if}
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtonsBottom'}
                </ul>
        </nav>
 </div>
index 07dee62cb1024b2455fe4500ec17fbbb4e478795..da6c8f1a9314864c899e5d2f60d01e0043dd4f61 100644 (file)
@@ -82,7 +82,7 @@
                                                <li><a href="{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}" title="{$objectType->getProcessor()->getLanguageVariable('add')}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
                                        {/if}
                                        
-                                       {event name='contentNavigationButtons'}
+                                       {event name='contentNavigationButtonsTop'}
                                {/content}
                        </ul>
                </nav>
                                                                <img src="{@$__wcf->getPath()}icon/{if !$category->isDisabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$category->isDisabled}enable{else}disable{/if}{/lang}" class="icon16 disabled" />
                                                        {/if}
                                                        
-                                                       {event name='buttons'}
+                                                       {event name='itemButtons'}
                                                </span>
                                        </span>
                                        
                                                        <li><a href="{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}" title="{$objectType->getProcessor()->getLanguageVariable('add')}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
                                                {/if}
                                                
-                                               {event name='contentNavigationButtons'}
+                                               {event name='contentNavigationButtonsBottom'}
                                        {/content}
                                </ul>
                        </nav>
index ba339ca8f3c8ad011f80d1c6d8f4dd2543123d03..2275ecc4cf43df8f6cc1092a7daccae788761215 100644 (file)
                                <li><a href="{link controller='CronjobExecute' id=$cronjobID}{/link}" title="{lang}wcf.acp.cronjob.execute{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/play.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>
                        {/if}
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
 
-<form method="post" action="{if $action == 'add'}{link controller='CronjobAdd'}{/link}{else}{link controller='CronjobEdit'}{/link}{/if}">
+<form method="post" action="{if $action == 'add'}{link controller='CronjobAdd'}{/link}{else}{link controller='CronjobEdit' id=$cronjobID}{/link}{/if}">
        <div class="container containerPadding marginTop">
                <fieldset>
                        <legend>{lang}wcf.global.form.data{/lang}</legend>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {if $cronjobID|isset}<input type="hidden" name="id" value="{@$cronjobID}" />{/if}
        </div>
 </form>
 
index a7379d2ecd1406c2064d2e037d989f67be8edb66..f96521c9b2fb531573d6c2e37d309bd382e00550 100644 (file)
@@ -40,7 +40,7 @@
                <ul>
                        <li><a href="{link controller='CronjobAdd'}{/link}" title="{lang}wcf.acp.cronjob.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
                        
-                       {event name='largeButtonsTop'}
+                       {event name='contentNavigationButtonsTop'}
                </ul>
        </nav>
 </div>
@@ -63,7 +63,7 @@
                                        <th class="columnText columnDescription{if $sortField == 'description'} active{/if}"><a href="{link controller='CronjobList'}pageNo={@$pageNo}&sortField=description&sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnDate columnNextExec{if $sortField == 'nextExec'} active{/if}"><a href="{link controller='CronjobList'}pageNo={@$pageNo}&sortField=nextExec&sortOrder={if $sortField == 'nextExec' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {event name='headColumns'}
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
@@ -95,7 +95,7 @@
                                                                        <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
                                                                {/if}
                                                                
-                                                               {event name='buttons'}
+                                                               {event name='rowButtons'}
                                                        </td>
                                                        <td class="columnID"><p>{@$cronjob->cronjobID}</p></td>
                                                        <td class="columnDate columnStartMinute"><p>{$cronjob->startMinute|truncate:30}</p></td>
                <ul>
                        <li><a href="{link controller='CronjobAdd'}{/link}" title="{lang}wcf.acp.cronjob.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
                        
-                       {event name='largeButtonsBottom'}
+                       {event name='contentNavigationButtonsBottom'}
                </ul>
        </nav>
 </div>
index aa4fc45d6410d7104d1ded989dd27eec8525e1cb..dcc24c4aeb39ffbc6077afa15561f5e7e63985ce 100644 (file)
@@ -19,7 +19,7 @@
                                }
                        });
                });
-
+               
                $('.jsCronjobError').click(function(event) {
                        $(event.currentTarget).next().wcfDialog({
                                title: '{lang}wcf.acp.cronjob.log.error.details{/lang}'
        </hgroup>
 </header>
 
-{hascontent}
-       <div class="contentNavigation">
-               {pages print=true assign=pagesLinks controller="CronjobLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
-               
+<div class="contentNavigation">
+       {pages print=true assign=pagesLinks controller="CronjobLogList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       
+       {hascontent}
                <nav>
                        <ul>
-                               <li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete"><img src="{@$__wcf->getPath()}icon/delete.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
+                               {if $objects|count}
+                                       <li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete"><img src="{@$__wcf->getPath()}icon/delete.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
+                               {/if}
+                               
+                               {content}
+                                       {event name='contentNavigationButtonsTop'}
+                               {/content}
                        </ul>
                </nav>
-       </div>
-       
+       {/hascontent}
+</div>
+
+{hascontent}
        <div class="tabularBox tabularBoxTitle marginTop">
                <hgroup>
                        <h1>{lang}wcf.acp.cronjob.log{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.cronjob.log.count{/lang}">{#$items}</span></h1>
@@ -60,7 +68,7 @@
                                        <th class="columnDate columnExecTime{if $sortField == 'execTime'} active{/if}"><a href="{link controller='CronjobLogList'}pageNo={@$pageNo}&sortField=execTime&sortOrder={if $sortField == 'execTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnText columnSuccess{if $sortField == 'success'} active{/if}"><a href="{link controller='CronjobLogList'}pageNo={@$pageNo}&sortField=success&sortOrder={if $sortField == 'success' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.cronjob.log.status{/lang}{if $sortField == 'success'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {event name='headColumns'}
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
                <nav>
                        <ul>
                                <li><a title="{lang}wcf.acp.cronjob.log.clear{/lang}" class="button jsCronjobLogDelete"><img src="{@$__wcf->getPath()}icon/delete.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.cronjob.log.clear{/lang}</span></a></li>
+                               
+                               {event name='contentNavigationButtonsBottom'}
                        </ul>
                </nav>
        </div>
index e6ff31675121194901709d459ec35a0c14758061..75d2b59f75d026409ad848765487d707ef3a25c2 100644 (file)
@@ -29,7 +29,8 @@
                        {if $health !== 'success'}<li><a href="{@$__wcf->getAnchor('health')}" title="Health">Health</a></li>{/if}
                        <li><a href="{@$__wcf->getAnchor('news')}" title="News">News</a></li>
                        <li><a href="{@$__wcf->getAnchor('credits')}" title="Credits">Credits</a></li>
-                       {event name='tabs'}
+                       
+                       {event name='tabMenuTabs'}
                </ul>
        </nav>
        
                </dl>
        </fieldset>
        
-       {event name='tabContent'}
+       {event name='tabMenuContents'}
 </div>
 {include file='footer'}
\ No newline at end of file
index 507ce641676f694cb8b1e7f68164e535e1b12670..b00c61506d0aa537079fa5c0d9f7ae9927924007 100644 (file)
@@ -50,6 +50,8 @@
                                        <label><input type="radio" name="mode" value="copy" id="copy" {if $mode == 'copy'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.copy{/lang}</label>
                                </dd>
                        </dl>
+                       
+                       {event name='modeFields'}
                </fieldset>
                
                <fieldset id="importDiv">
@@ -83,6 +85,8 @@
                                        {/if}
                                </dd>
                        </dl>
+                       
+                       {event name='importFields'}
                </fieldset>
                
                <fieldset id="copyDiv">
                                        {/if}
                                </dd>
                        </dl>
+                       
+                       {event name='copyFields'}
                </fieldset>
                
                {event name='fieldsets'}
index e0e2af949f695ab006bfcf7c452d41e2a3002c31..fd5493dbfe93ffd19162eb3953216cffe5d7fc74 100644 (file)
                                        <label for="exportCustomValues"><input type="checkbox" name="exportCustomValues" id="exportCustomValues" value="1" /> {lang}wcf.acp.language.export.customValues{/lang}</label>
                                </dd>
                        </dl>
+                       
+                       {event name='exportFields'}
                </fieldset>
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">
index eab0115782bb009f70ffa5223a0f0a1db7d436ee..3adc10cc99017d9e3ba4d102c6221d063d2f71ca 100644 (file)
                                        <th class="columnDigits columnUsers{if $sortField == 'users'} active{/if}"><a href="{link controller='LanguageList'}pageNo={@$pageNo}&sortField=users&sortOrder={if $sortField == 'users' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.language.users{/lang}{if $sortField == 'users'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnDigits columnVariables{if $sortField == 'variables'} active{/if}"><a href="{link controller='LanguageList'}pageNo={@$pageNo}&sortField=variables&sortOrder={if $sortField == 'variables' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.language.variables{/lang}{if $sortField == 'variables'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnDigits columnCustomVariables{if $sortField == 'customVariables'} active{/if}"><a href="{link controller='LanguageList'}pageNo={@$pageNo}&sortField=customVariables&sortOrder={if $sortField == 'customVariables' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.language.customVariables{/lang}{if $sortField == 'customVariables'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
                        <tbody>
-                       {foreach from=$objects item=language}
-                               <tr class="jsLanguageRow">
-                                       <td class="columnIcon">
-                                               {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-                                                       <a href="{link controller='LanguageExport' id=$language->languageID}{/link}"><img src="{@$__wcf->getPath()}icon/download.svg" alt="" title="{lang}wcf.acp.language.export{/lang}" class="icon16 jsTooltip" /></a>
-                                               {else}
-                                                       <img src="{@$__wcf->getPath()}icon/download.svg" alt="" title="{lang}wcf.acp.language.export{/lang}" class="icon16 disabloed" />
-                                               {/if}
-                                               
-                                               {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-                                                       {if !$language->isDefault}
-                                                               <img src="{@$__wcf->getPath()}icon/default.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 jsSetAsDefaultButton jsTooltip" data-object-id="{@$language->languageID}" />
+                               {foreach from=$objects item=language}
+                                       <tr class="jsLanguageRow">
+                                               <td class="columnIcon">
+                                                       {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
+                                                               <a href="{link controller='LanguageExport' id=$language->languageID}{/link}"><img src="{@$__wcf->getPath()}icon/download.svg" alt="" title="{lang}wcf.acp.language.export{/lang}" class="icon16 jsTooltip" /></a>
+                                                       {else}
+                                                               <img src="{@$__wcf->getPath()}icon/download.svg" alt="" title="{lang}wcf.acp.language.export{/lang}" class="icon16 disabloed" />
+                                                       {/if}
+                                                       
+                                                       {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
+                                                               {if !$language->isDefault}
+                                                                       <img src="{@$__wcf->getPath()}icon/default.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 jsSetAsDefaultButton jsTooltip" data-object-id="{@$language->languageID}" />
+                                                               {else}
+                                                                       <img src="{@$__wcf->getPath()}icon/default.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 disabled" />
+                                                               {/if}
                                                        {else}
                                                                <img src="{@$__wcf->getPath()}icon/default.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 disabled" />
                                                        {/if}
-                                               {else}
-                                                       <img src="{@$__wcf->getPath()}icon/default.svg" alt="" title="{lang}wcf.acp.language.setAsDefault{/lang}" class="icon16 disabled" />
-                                               {/if}
-                                               
-                                               {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-                                                       <a href="{link controller='LanguageEdit' id=$language->languageID}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
-                                               {else}
-                                                       <img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 disabled" />
-                                               {/if}
-                                               {if $__wcf->getSession()->getPermission('admin.language.canDeleteLanguage')}
-                                                       {if !$language->isDefault}
-                                                               <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsTooltip jsDeleteButton" data-object-id="{@$language->languageID}" data-confirm-message="{lang}wcf.acp.language.delete.sure{/lang}" />
+                                                       
+                                                       {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
+                                                               <a href="{link controller='LanguageEdit' id=$language->languageID}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
+                                                       {else}
+                                                               <img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 disabled" />
+                                                       {/if}
+                                                       {if $__wcf->getSession()->getPermission('admin.language.canDeleteLanguage')}
+                                                               {if !$language->isDefault}
+                                                                       <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsTooltip jsDeleteButton" data-object-id="{@$language->languageID}" data-confirm-message="{lang}wcf.acp.language.delete.sure{/lang}" />
+                                                               {else}
+                                                                       <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
+                                                               {/if}
                                                        {else}
                                                                <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
                                                        {/if}
-                                               {else}
-                                                       <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
-                                               {/if}
-                                       </td>
-                                       <td class="columnID columnLanguageID">{@$language->languageID}</td>
-                                       <td class="columnTitle columnLanguageName">
-                                               {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-                                                       <a href="{link controller='LanguageEdit' id=$language->languageID}{/link}">{$language->languageName} ({@$language->languageCode})</a>
-                                               {else}
-                                                       {$language->languageName} ({@$language->languageCode})
-                                               {/if}
-                                       </td>
-                                       <td class="columnDigits columnUsers">{#$language->users}</td>
-                                       <td class="columnDigits columnVariables">{#$language->variables}</td>
-                                       <td class="columnDigits columnCustomVariables">{if $language->customVariables > 0 && $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}<a href="{link controller='LanguageEdit' id=$language->languageID}customVariables=1{/link}">{#$language->customVariables}</a>{else}{#$language->customVariables}{/if}</td>
-                               </tr>
-                       {/foreach}
+                                                       
+                                                       {event name='rowButtons'}
+                                               </td>
+                                               <td class="columnID columnLanguageID">{@$language->languageID}</td>
+                                               <td class="columnTitle columnLanguageName">
+                                                       {if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
+                                                               <a href="{link controller='LanguageEdit' id=$language->languageID}{/link}">{$language->languageName} ({@$language->languageCode})</a>
+                                                       {else}
+                                                               {$language->languageName} ({@$language->languageCode})
+                                                       {/if}
+                                               </td>
+                                               <td class="columnDigits columnUsers">{#$language->users}</td>
+                                               <td class="columnDigits columnVariables">{#$language->variables}</td>
+                                               <td class="columnDigits columnCustomVariables">{if $language->customVariables > 0 && $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}<a href="{link controller='LanguageEdit' id=$language->languageID}customVariables=1{/link}">{#$language->customVariables}</a>{else}{#$language->customVariables}{/if}</td>
+
+                                               {event name='columns'}
+                                       </tr>
+                               {/foreach}
                        </tbody>
                </table>
        </div>
index 1dc94b15a003d4bd55f3fe4b303de1c4ec6cbb6f..ba9c74d851c90d7583b60edb736a522183bd9e07 100644 (file)
        <p class="success">{lang}wcf.acp.language.multilingualism.success{/lang}</p>
 {/if}
 
+{hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
+
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageMultilingualism'}{/link}">
        <div class="container containerPadding marginTop">
                <fieldset>
                                </dd>
                        </dl>
                        
-                       {event name='additionalFields'}
+                       {event name='enableFields'}
                </fieldset>
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">
index b90a029ca7253e530568523f26be8eba5a8dba3c..a18f1a3c50424041708e8e0222c871cab9bd7cd7 100644 (file)
                                        <small>{lang}wcf.acp.languageServer.server.description{/lang}</small>
                                </dd>
                        </dl>
+                       
+                       {event name='dataFields'}
                </fieldset>
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">
index f82cf76445012298ccecb026fb443301c22a7dc4..2ff2bb1c9d3b9d2dbbc2bb7b0473f68503164860 100644 (file)
@@ -50,6 +50,8 @@
                                <tr>
                                        <th class="columnID columnLanguageServerID{if $sortField == 'languageServerID'} active{/if}" colspan="2"><a href="{link controller='LanguageServerList'}pageNo={@$pageNo}&sortField=languageServerID&sortOrder={if $sortField == 'languageServerID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}{if $sortField == 'languageServerID'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnTitle columnServerURL{if $sortField == 'serverURL'} active{/if}"><a href="{link controller='LanguageServerList'}pageNo={@$pageNo}&sortField=serverURL&sortOrder={if $sortField == 'serverURL' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.languageServer.serverURL{/lang}{if $sortField == 'serverURL'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        <tbody>
@@ -69,6 +71,8 @@
                                                        {else}
                                                                <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
                                                        {/if}
+                                                       
+                                                       {event name='rowButtons'}
                                                </td>
                                                <td class="columnID columnLanguageServerID">{@$languageServer->languageServerID}</td>
                                                <td class="columnTitle columnServerURL">
@@ -78,6 +82,8 @@
                                                                {@$languageServer->serverURL}
                                                        {/if}
                                                </td>
+                                               
+                                               {event name='columns'}
                                        </tr>
                                {/foreach}
                        </tbody>
index d2ae7ac46646d0a3b89ae1039d562e29f13460ae..6d4645ba7b149212c193cad6eeb426f2021c03d6 100644 (file)
@@ -14,7 +14,7 @@
        </hgroup>
 </header>
 
-{if $errorField != ''}
+{if $errorField}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
index 7920a19c4a8510e9136118d21f2b2b5e749ffb43..610e9181d622cb9ef3839c333be0a8411a8e1169 100644 (file)
@@ -18,7 +18,7 @@
        </hgroup>
 </header>
 
-{if $errorField != ''}
+{if $errorField}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
index 1c43707c25f9da1a1b09c619943a0311b2526ca9..bd6e74e79e83cdcd05b0ff07185a857307547041 100644 (file)
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
+{hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
+
 <form method="post" action="{link controller='Option' id=$category->categoryID}{/link}">
        <div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
                <nav class="tabMenu">
index 3a561194ba668d51c334e85679a384c2d0307e0d..fcaf20aaf84ca192ab9eb744afed7745ff47e4c6 100644 (file)
        <p class="success">{lang}wcf.acp.option.import.success{/lang}</p>
 {/if}
 
+{hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
+
 <form method="post" action="{link controller='OptionImport'}{/link}" enctype="multipart/form-data">
        <div class="container containerPadding marginTop">
                <fieldset>
index bf66fc4d4f2b99d7ff6756e7423b952409dcc17a..fa1cf6e1da545415c716412d4a4b25f29760c578 100644 (file)
        </hgroup>
 </header>
 
+{hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtonsTop'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
+
 <div class="tabMenuContainer">
        <nav class="tabMenu">
                <ul>
@@ -24,6 +36,8 @@
                        {if $package->getRequiredPackages()|count || $package->getDependentPackages()|count}
                                <li><a href="{@$__wcf->getAnchor('dependencies')}">{lang}wcf.acp.package.dependencies.title{/lang}</a></li>
                        {/if}
+                       
+                       {event name='tabMenuTabs'}
                </ul>
        </nav>
        
@@ -70,7 +84,7 @@
                        
                        {event name='propertyFields'}
                </fieldset>
-
+               
                {if $package->packageDescription|language}
                        <fieldset>
                                <legend>{lang}wcf.acp.package.description{/lang}</legend>
@@ -78,6 +92,8 @@
                                <p>{$package->packageDescription|language}</p>
                        </fieldset>
                {/if}
+               
+               {event name='informationFieldsets'}
        </div>
        
        {if $package->getRequiredPackages()|count || $package->getDependentPackages()|count}
                                        {if $package->getDependentPackages()|count}
                                                <li><a href="{@$__wcf->getAnchor('dependencies-dependent')}">{lang}wcf.acp.package.dependencies.dependent{/lang}</a></li>
                                        {/if}
+                                       
+                                       {event name='DependenciesSubTabMenuTabs'}
                                </ul>
                        </nav>
                        
                                                                <th class="columnText">{lang}wcf.acp.package.version{/lang}</th>
                                                                <th class="columnDigits">{lang}wcf.acp.package.packageDate{/lang}</th>
                                                                
-                                                               {event name='requirementHeadColumns'}
+                                                               {event name='requirementColumnHeads'}
                                                        </tr>
                                                </thead>
                                                
                                                                <th class="columnText">{lang}wcf.acp.package.version{/lang}</th>
                                                                <th class="columnDigits">{lang}wcf.acp.package.packageDate{/lang}</th>
                                                                
-                                                               {event name='dependencyHeadColumns'}
+                                                               {event name='dependencyColumnHeads'}
                                                        </tr>
                                                </thead>
                                                
                                        </table>
                                </div>
                        {/hascontent}
+                       
+                       {event name='DependenciesSubTabMenuContents'}
                </div>
        {/if}
+       
+       {event name='tabMenuContents'}
 </div>
 
 <div class="contentNavigation">
                                <li><a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}" title="{lang}wcf.acp.package.button.update{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/update.svg" alt="" /> <span>{lang}wcf.acp.package.button.update{/lang}</span></a></li>
                        {/if}
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtonsBottom'}
                        
                        <li><a href="{link controller='PackageList'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/window.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
                </ul>
index ca81ed84dabca1b922d2d9d4d0051fe598ff027b..b03917c381dca095f8efda5e55cf642b5be49954 100644 (file)
@@ -1,5 +1,11 @@
 {include file='header' pageTitle='wcf.acp.packageUpdate'}
 
+{*
+       todo:
+       * update CSS classes
+       * add events
+*}
+
 <script type="text/javascript">
        //<![CDATA[
        var checkedAll = true;
@@ -45,7 +51,7 @@
                                                        </label>
                                                </h1>
                                        </hgroup>
-
+                                       
                                        <div class="wcf-messageBody">
                                                <dl>
                                                        <dt><label>{lang}wcf.acp.packageUpdate.currentVersion{/lang}</label></dt>
index 4b915bd7700d680cf2abf97de057caf31bca6914..0e70d3344ddc9e82859663c6a6187909856b4254 100644 (file)
                                        <th class="columnTitle">{lang}wcf.acp.package.name{/lang}</th>
                                        <th class="columnText">{lang}wcf.acp.package.installation.packageStatus{/lang}</th>
                                        <th class="columnDigits">{lang}wcf.acp.package.installation.requiredVersion{/lang}</th>
+                                       
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
                        <tbody>
-                       {foreach from=$requiredPackages item=$package}
-                               <tr>
-                                       <td class="columnTitle"><p><span class="badge label {if $package.status == 'installed'}green{elseif $package.status == 'delivered'}yellow{else}red{/if}">{@$package.name}</span></p></td>
-                                       <td class="columnText"><p>{lang}wcf.acp.package.installation.packageStatus.{@$package.status}{/lang}</p></td>
-                                       <td class="columnDigits"><p>{if $package.minversion|isset}{if $package.status == 'missingVersion'}<span class="badge label red">{/if}{$package.minversion}{if $package.status == 'missingVersion'}</span>{/if}{/if}</p></td>
-                               </tr>
-                       {/foreach}
+                               {foreach from=$requiredPackages item=$package}
+                                       <tr>
+                                               <td class="columnTitle"><p><span class="badge label {if $package.status == 'installed'}green{elseif $package.status == 'delivered'}yellow{else}red{/if}">{@$package.name}</span></p></td>
+                                               <td class="columnText"><p>{lang}wcf.acp.package.installation.packageStatus.{@$package.status}{/lang}</p></td>
+                                               <td class="columnDigits"><p>{if $package.minversion|isset}{if $package.status == 'missingVersion'}<span class="badge label red">{/if}{$package.minversion}{if $package.status == 'missingVersion'}</span>{/if}{/if}</p></td>
+                                               
+                                               {event name='columns'}
+                                       </tr>
+                               {/foreach}
                        </tbody>
                </table>
        </div>
index 75dd19072213a128432932223c811664d5578901..a1d3546ec766c6e8746fe4a3e58de06b4b348a10 100644 (file)
                                                <li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
                                        {/if}
                                        
-                                       {event name='largeButtons'}
+                                       {event name='contentNavigationButtonsTop'}
                                {/content}
                        </ul>
                </nav>
        {/hascontent}
 </div>
 
-{if $objects|count > 0}
+{if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop">
                <hgroup>
                        <h1>{lang}wcf.acp.package.list{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.package.list.count{/lang}">{#$items}</span></h1>
@@ -49,7 +49,7 @@
                                        <th class="columnText">{lang}wcf.acp.package.version{/lang}</th>
                                        <th class="columnDate{if $sortField == 'updateDate'} active{/if}"><a href="{link controller='PackageList'}pageNo={@$pageNo}&sortField=updateDate&sortOrder={if $sortField == 'updateDate' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {event name='headColumns'}
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
@@ -68,7 +68,7 @@
                                                                <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="icon16 disabled" />
                                                        {/if}
                                                        
-                                                       {event name='buttons'}
+                                                       {event name='rowButtons'}
                                                </td>
                                                <td class="columnID"><p>{@$package->packageID}</p></td>
                                                <td class="columnIcon">
                </table>
                
        </div>
+                       
+       <div class="contentNavigation">
+               {@$pagesLinks}
+               
+               {hascontent}
+                       <script type="text/javascript">
+                               //<![CDATA[
+                               $(function() {
+                                       new WCF.ACP.Package.Uninstallation($('.jsPluginContainer .jsUninstallButton'));
+                               });
+                               //]]>
+                       </script>
+                       
+                       <nav>
+                               <ul>
+                                       {content}
+                                               {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}
+                                                       <li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
+                                               {/if}
+                                               
+                                               {event name='contentNavigationButtonsBottom'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
+       </div>
 {/if}
 
-<div class="contentNavigation">
-       {@$pagesLinks}
-       
-       {hascontent}
-               <script type="text/javascript">
-                       //<![CDATA[
-                       $(function() {
-                               new WCF.ACP.Package.Uninstallation($('.jsPluginContainer .jsUninstallButton'));
-                       });
-                       //]]>
-               </script>
-               <nav>
-                       <ul>
-                               {content}
-                                       {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}
-                                               <li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
-                                       {/if}
-                                       
-                                       {event name='largeButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</div>
-
 {include file='footer'}
index 47fa74109329f39c7679cbe8b296cbd3a7bd5864..e59a633ae1f564efd70b4e4d3a7332766979f7c1 100644 (file)
@@ -11,7 +11,7 @@
        </hgroup>
 </header>
 
-{if $errorField != ''}
+{if $errorField}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
@@ -20,7 +20,7 @@
                <ul>
                        <li><a href="{link controller='PackageList'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
@@ -68,7 +68,7 @@
                
                {event name='fieldsets'}
        </div>
-
+       
        <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="action" value="{$action}" />
index fe22d398fe3a3da20c79705ccb8f84ccff8dc5a5..390b23ff349d6bd9dde5791392c2cb1490b2cbc3 100644 (file)
@@ -28,7 +28,6 @@
 {if $packageInstallationStack|count}
        <form method="post" action="{link controller='PackageUpdate'}{/link}">
                <div class="container containerPadding marginTop">
-                       
                        <fieldset>
                                <legend>{lang}wcf.acp.packageUpdate.updates{/lang}</legend>
                                
@@ -45,6 +44,7 @@
                                </ul>
                        </fieldset>
                        
+                       {event name='fieldsets'}
                </div>
                
                <div class="formSubmit">
index a8ab66dd0a86a49be1238a59733ee92d946fe881..be4f3e41916f9d92dbb51befe6ea5768e3da3e03 100644 (file)
@@ -6,7 +6,7 @@
        </hgroup>
 </header>
 
-{if $errorField != ''}
+{if $errorField}
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
@@ -31,6 +31,8 @@
                                        <dd>{@$message}</dd>
                                </dl>
                        {/if}
+                       
+                       {event name='dataFields'}
                </fieldset>
                
                <fieldset>
                                </dt>
                                <dd><small>{lang}wcf.acp.packageUpdate.auth.save.description{/lang}</small></dd>
                        </dl>
+                       
+                       {event name='authFields'}
                </fieldset>
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">
index 3a0ab868e22a910c14713c616249e972903071ea..5c37b2c7ade79a1159c96821058ef9cf9b7cc460 100644 (file)
        </hgroup>
 </header>
 
-{if $errorField != ''}
+{if $errorField}
        <p class="error">{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
 {/if}
 
-{if !$updateServers|count}
-       <p class="warning">{lang}wcf.acp.updateServer.view.noneAvailable{/lang}</p>
-{else}
+{if $updateServers|count}
        <form method="post" action="{link controller='PackageUpdateSearch'}{/link}">
                <div class="container containerPadding marginTop">
                        <fieldset>
@@ -70,6 +68,8 @@
                                                </dd>
                                        {/foreach}
                                </dl>
+                               
+                               {event name='serverFields'}
                        </fieldset>
                        
                        <fieldset>
                                                <label><input type="checkbox" name="other" value="1" {if $other == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.other{/lang}</label> 
                                        </dd>
                                </dl>
+                               
+                               {event name='conditionFields'}
                        </fieldset>
+                       
+                       {event name='fieldsets'}
                </div>
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                </div>
        </form>
+{else}
+       <p class="warning">{lang}wcf.acp.updateServer.view.noneAvailable{/lang}</p>
 {/if}
 
 {include file='footer'}
index b837d6f582d5a98818d8ffd180c52ffb3368d6f0..84d1d214181ff0534fc5beb3b61b1a3d701d12b8 100644 (file)
@@ -8,6 +8,16 @@
 
 <div class="contentNavigation">
        {pages print=true assign=pagesLinks controller="PackageUpdateSearchResult" id=$searchID link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+       
+       {hascontent}
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtonsTop'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </div>
 
 <form method="post" action="{link controller='PackageUpdate'}{/link}">
 
 <div class="contentNavigation">
        {@$pagesLinks}
+       
+       {hascontent}
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtonsBottom'}
+                               {/content}
+                       </ul>
+               </nav>
+       {/hascontent}
 </div>
 
 {include file='footer'}
index 86f6cbf9d203d7857f8a30186242153b09658501..c6da57fca9b8198cfda9162cb735587471d1caf0 100644 (file)
@@ -53,6 +53,8 @@
        <nav>
                <ul>
                        <li><a href="{link controller='PageMenuItemList'}{/link}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" /> <span>{lang}wcf.acp.pageMenu.list{/lang}</span></a></li>
+                       
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
                                        {include file='multipleLanguageInputJavascript' elementIdentifier='pageMenuItem' forceSelection=true}
                                </dd>
                        </dl>
+                       
+                       {event name='dataFields'}
                </fieldset>
                
                <fieldset>
                                        {include file='multipleLanguageInputJavascript' elementIdentifier='menuItemLink' forceSelection=false}
                                </dd>
                        </dl>
+                       
+                       {event name='linkFields'}
                </fieldset>
                
                <fieldset>
                                        <label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> <span>{lang}wcf.acp.pageMenu.isDisabled{/lang}</span></label>
                                </dd>
                        </dl>
+                       
+                       {event name='advancedFields'}
                </fieldset>
                
+               {event name='fields'}
+               
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
                </div>
        </form>
 </div>
 
-<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='PageMenuItemList'}{/link}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" /> <span>{lang}wcf.acp.pageMenu.list{/lang}</span></a></li>
-               </ul>
-       </nav>
-</div>
-
 {include file='footer'}
index f6e76fa41a11e22e1da37105fd7ef3215d646cb1..530a06f07364b3a11cabbbcd3795c6b22ed801ca 100644 (file)
@@ -27,7 +27,7 @@
                <ul>
                        <li><a href="{link controller='PageMenuItemAdd'}{/link}" title="{lang}wcf.acp.pageMenu.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.pageMenu.add{/lang}</span></a></li>
                        
-                       {event name='largeButtonsTop'}
+                       {event name='contentNavigationButtonsTop'}
                </ul>
        </nav>
 </div>
@@ -55,6 +55,8 @@
                                                                        {else}
                                                                                <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" class="icon16 disabled" />
                                                                        {/if}
+                                                                       
+                                                                       {event name='headerItemButtons'}
                                                                </span>
                                                        </span>
                                                        {if $menuItem|count}
@@ -67,6 +69,8 @@
                                                                                                        <img src="{@$__wcf->getPath()}icon/{if $childMenuItem->isDisabled}disabled{else}enabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if $childMenuItem->isDisabled}enable{else}disable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip pointer" data-object-id="{@$childMenuItem->menuItemID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" />
                                                                                                        <a href="{link controller='PageMenuItemEdit' id=$childMenuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" class="icon16" /></a>
                                                                                                        <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip pointer" data-object-id="{@$childMenuItem->menuItemID}" data-confirm-message="{lang __menuItem=$childMenuItem}wcf.acp.pageMenu.delete.sure{/lang}" />
+                                                                                                       
+                                                                                                       {event name='subHeaderItemButtons'}
                                                                                                </span>
                                                                                        </span>
                                                                                </li>
                                                                        <img src="{@$__wcf->getPath()}icon/{if $menuItem->isDisabled}disabled{else}enabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip pointer" data-object-id="{@$menuItem->menuItemID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" />
                                                                        <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" class="icon16" /></a>
                                                                        <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip pointer" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang __menuItem=$menuItem}wcf.acp.pageMenu.delete.sure{/lang}" />
+                                                                       
+                                                                       {event name='footerItemButtons'}
                                                                </span>
                                                        </span>
                                                </li>
                <ul>
                        <li><a href="{link controller='PageMenuItemAdd'}{/link}" title="{lang}wcf.acp.pageMenu.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.pageMenu.add{/lang}</span></a></li>
                        
-                       {event name='largeButtonsBottom'}
+                       {event name='contentNavigationButtonsBottom'}
                </ul>
        </nav>
 </div>
index 1cab6f48d6b6b0179f8c9d50fce91aa49b1d5ba0..7c34bf5bb5814e481cd313729a413f96cf4c055e 100644 (file)
@@ -66,6 +66,8 @@
                                        {if $__wcf->session->getPermission('admin.style.canDeleteStyle') || $__wcf->session->getPermission('admin.style.canEditStyle')}
                                                <li><a href="{link controller='StyleList'}{/link}" title="{lang}wcf.acp.menu.link.style.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
                                        {/if}
+                                       
+                                       {event name='contentNavigationButtons'}
                                {/content}
                        </ul>
                </nav>
@@ -80,6 +82,8 @@
                                <li><a href="{@$__wcf->getAnchor('globals')}">{lang}wcf.acp.style.globals{/lang}</a></li>
                                <li><a href="{@$__wcf->getAnchor('colors')}">{lang}wcf.acp.style.colors{/lang}</a></li>
                                <li><a href="{@$__wcf->getAnchor('advanced')}">{lang}wcf.acp.style.advanced{/lang}</a></li>
+                               
+                               {event name='tabMenuTabs'}
                        </ul>
                </nav>
                
                                                {include file='multipleLanguageInputJavascript' elementIdentifier='styleDescription' forceSelection=true}
                                        </dd>
                                </dl>
+                               
+                               {event name='dataFields'}
                        </fieldset>
                        
                        <fieldset>
                                                <small>{lang}wcf.acp.style.imagePath.description{/lang}</small>
                                        </dd>
                                </dl>
+                               
+                               {event name='fileFields'}
                        </fieldset>
+                       
+                       {event name='generalFieldsets'}
                </div>
                
                {* globals *}
                                                <small>{lang}wcf.acp.style.globals.pageLogo.description{/lang}</small>
                                        </dd>
                                </dl>
+                               
+                               {event name='layoutFields'}
                        </fieldset>
                        
                        {* font *}
                                                </select>
                                        </dd>
                                </dl>
+                               
+                               {event name='fontFields'}
                        </fieldset>
+                       
+                       {event name='globalFieldsets'}
                </div>
                
                {* colors *}
                                        <li>{include file='styleVariableColor' variableName='wcfPageColor' languageVariable='color'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfPageLinkColor' languageVariable='linkColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfPageLinkHoverColor' languageVariable='linkHoverColor'}</li>
+                                       
+                                       {event name='pageColorListItems'}
                                </ul>
+                               
+                               {event name='pageColorLists'}
                        </fieldset>
                        
                        <fieldset>
                                        <li>{include file='styleVariableColor' variableName='wcfDimmedColor' languageVariable='dimmedColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfLinkColor' languageVariable='linkColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfLinkHoverColor' languageVariable='linkHoverColor'}</li>
+                                       
+                                       {event name='contentColorListItems'}
                                </ul>
+                               
+                               {event name='contentColorLists'}
                        </fieldset>
                        
                        <fieldset>
                                        <li>{include file='styleVariableColor' variableName='wcfContainerAccentBackgroundColor' languageVariable='accentBackgroundColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfContainerBorderColor' languageVariable='borderColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfContainerHoverBackgroundColor' languageVariable='hoverBackgroundColor'}</li>
+                                       
+                                       {event name='containerColorListItems'}
                                </ul>
+                               
+                               {event name='containerColorLists'}
                        </fieldset>
                        
                        <fieldset>
                                        <li>{include file='styleVariableColor' variableName='wcfUserPanelColor' languageVariable='color'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfUserPanelHoverBackgroundColor' languageVariable='hoverBackgroundColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfUserPanelHoverColor' languageVariable='hoverColor'}</li>
+                                       
+                                       {event name='userPanelColorListItems'}
                                </ul>
+                               
+                               {event name='userPanelColorLists'}
                        </fieldset>
                        
                        <fieldset>
                                        <li>{include file='styleVariableColor' variableName='wcfTabularBoxBackgroundColor' languageVariable='backgroundColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfTabularBoxColor' languageVariable='color'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfTabularBoxHoverColor' languageVariable='hoverColor'}</li>
+                                       
+                                       {event name='tabularColorListItems'}
                                </ul>
+                               
+                               {event name='tabularColorLists'}
                        </fieldset>
                        
                        <fieldset>
                                        <li>{include file='styleVariableColor' variableName='wcfButtonBackgroundColor' languageVariable='backgroundColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfButtonBorderColor' languageVariable='borderColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfButtonColor' languageVariable='color'}</li>
+                                       
+                                       {event name='defaultButtonColorListItems'}
                                </ul>
                                
                                {* button:hover *}
                                        <li>{include file='styleVariableColor' variableName='wcfButtonHoverBackgroundColor' languageVariable='hoverBackgroundColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfButtonHoverBorderColor' languageVariable='hoverBorderColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfButtonHoverColor' languageVariable='hoverColor'}</li>
+                                       
+                                       {event name='hoverButtonColorListItems'}
                                </ul>
                                
                                {* primary button *}
                                        <li>{include file='styleVariableColor' variableName='wcfButtonPrimaryBackgroundColor' languageVariable='primaryBackgroundColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfButtonPrimaryBorderColor' languageVariable='primaryBorderColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfButtonPrimaryColor' languageVariable='primaryColor'}</li>
+                                       
+                                       {event name='primaryButtonColorListItems'}
                                </ul>
+                               
+                               {event name='buttonsColorLists'}
                        </fieldset>
                        
                        <fieldset>
                                <legend>{lang}wcf.acp.style.colors.formInput{/lang}</legend>
                                
-                               {* default button *}
+                               {* form input *}
                                <ul class="colorList">
                                        <li>{include file='styleVariableColor' variableName='wcfInputBackgroundColor' languageVariable='backgroundColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfInputBorderColor' languageVariable='borderColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfInputColor' languageVariable='color'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfInputHoverBackgroundColor' languageVariable='hoverBackgroundColor'}</li>
                                        <li>{include file='styleVariableColor' variableName='wcfInputHoverBorderColor' languageVariable='hoverBorderColor'}</li>
+                                       
+                                       {event name='formInputColorListItems'}
                                </ul>
+                               
+                               {event name='formInputColorLists'}
                        </fieldset>
+                       
+                       {event name='colorFieldsets'}
                </div>
                
                {* advanced *}
                                {/if}
                                <small>{lang}wcf.acp.style.advanced.overrideLess.description{/lang}</small>
                        </fieldset>
+                       
+                       {event name='syntaxFieldsets'}
                </div>
+               
+               {event name='tabMenuContents'}
        </div>
        
        <div class="formSubmit">
index 897665f45ee58bbb66c66652598eff92c413efd6..b3618046d4ec19f3a6df4e3b24236fb575432e84 100644 (file)
@@ -10,6 +10,8 @@
        <nav>
                <ul>
                        <li><a href="{link controller='StyleList'}{/link}" title="{lang}wcf.acp.menu.link.style.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
+                       
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
@@ -35,6 +37,8 @@
                                        <label><input type="checkbox" name="exportTemplates" value="1"{if $exportTemplates} checked="checked"{/if}{if !$canExportTemplates} disabled="disabled"{/if} /> <span>{lang}wcf.acp.style.exportTemplates{/lang}</span></label>
                                </dd>
                        </dl>
+                       
+                       {event name='componentFields'}
                </fieldset>
                
                <fieldset>
                                        <small>{lang}wcf.acp.style.packageName.description{/lang}</small>
                                </dd>
                        </dl>
+                       
+                       {event name='exportAsPackageFields'}
                </fieldset>
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">
index c1e034b276be3fc9b8cefc7aeca7d1287595f089..f3685558a0d3542bad31621fcf02bd0a72f2c7f3 100644 (file)
@@ -18,6 +18,8 @@
                                        {if $__wcf->session->getPermission('admin.style.canDeleteStyle') || $__wcf->session->getPermission('admin.style.canEditStyle')}
                                                <li><a href="{link controller='StyleList'}{/link}" title="{lang}wcf.acp.menu.link.style.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
                                        {/if}
+                                       
+                                       {event name='contentNavigationButtons'}
                                {/content}
                        </ul>
                </nav>
index f6ebbe40a5c919917e707ad9b0d7af446412cbd2..77dbf77611d294e732bdff045b533e71434b7187 100644 (file)
@@ -28,7 +28,7 @@
                                                <li><a href="{link controller='StyleImport'}{/link}" title="{lang}wcf.acp.menu.link.style.import{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/upload.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
                                        {/if}
                                        
-                                       {event name='largeButtons'}
+                                       {event name='contentNavigationButtonsTop'}
                                {/content}
                        </ul>
                </nav>
@@ -53,6 +53,8 @@
                                                                <li><a title="{lang}wcf.acp.style.button.setAsDefault{/lang}" class="jsSetAsDefault jsTooltip"><img src="{@$__wcf->getPath()}icon/default.svg" class="icon16 jsTooltip" alt="" /></a></li>
                                                                <li><a title="{lang}wcf.global.button.delete{/lang}" class="jsDelete jsTooltip" data-confirm-message="{lang}wcf.acp.style.delete.confirmMessage{/lang}"><img src="{@$__wcf->getPath()}icon/delete.svg" class="icon16" alt="" /></a></li>
                                                        {/if}
+                                                       
+                                                       {event name='itemButtons'}
                                                </ul>
                                                <dl class="plain inlineDataList">
                                                        <dt>{lang}wcf.acp.style.users{/lang}</dt>
@@ -85,7 +87,7 @@
                                                <li><a href="{link controller='StyleImport'}{/link}" title="{lang}wcf.acp.menu.link.style.import{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/upload.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
                                        {/if}
                                        
-                                       {event name='largeButtons'}
+                                       {event name='contentNavigationButtonsBottom'}
                                {/content}
                        </ul>
                </nav>
index af16c74215d69d24c66fbd95120bc87b20e7a08c..ab4d4285a586e761197684f8eeeb2e28d39dbaeb 100644 (file)
                <ul>
                        <li><a href="{link controller='UpdateServerList'}{/link}" title="{lang}wcf.acp.menu.link.package.server.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li>
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
 
-<form method="post" action="{if $action == 'add'}{link controller='UpdateServerAdd'}{/link}{else}{link controller='UpdateServerEdit'}{/link}{/if}">
+<form method="post" action="{if $action == 'add'}{link controller='UpdateServerAdd'}{/link}{else}{link controller='UpdateServerEdit' id=$packageUpdateServerID}{/link}{/if}">
        <div class="container containerPadding marginTop">
                <fieldset>
                        <legend>{lang}wcf.acp.updateServer.data{/lang}</legend>
@@ -73,7 +73,6 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {if $packageUpdateServerID|isset}<input type="hidden" name="id" value="{@$packageUpdateServerID}" />{/if}
        </div>
 </form>
 
index 44128666b2a8931a81c7e11abbdf7c5f082445ff..b62ffd7fe1f954a6e0b44a4043309716f1cbb722 100644 (file)
@@ -26,7 +26,7 @@
                <ul>
                        <li><a href="{link controller='UpdateServerAdd'}{/link}" title="{lang}wcf.acp.updateServer.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
                        
-                       {event name='largeButtonsTop'}
+                       {event name='contentNavigationButtonsTop'}
                </ul>
        </nav>
 </div>
@@ -47,7 +47,7 @@
                                        <th class="columnText columnErrorText{if $sortField == 'errorMessage'} active{/if}"><a href="{link controller='UpdateServerList'}pageNo={@$pageNo}&sortField=errorMessage&sortOrder={if $sortField == 'errorMessage' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnDate columnTimestamp{if $sortField == 'lastUpdateTime'} active{/if}"><a href="{link controller='UpdateServerList'}pageNo={@$pageNo}&sortField=lastUpdateTime&sortOrder={if $sortField == 'lastUpdateTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.updateServer.lastUpdateTime{/lang}{if $sortField == 'lastUpdateTime'} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {event name='headColumns'}
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
@@ -60,7 +60,7 @@
                                                                <a href="{link controller='UpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
                                                                <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip pointer" data-object-id="{@$updateServer->packageUpdateServerID}" data-confirm-message="{lang}wcf.acp.updateServer.delete.sure{/lang}" />
                                                                
-                                                               {event name='buttons'}
+                                                               {event name='itemButtons'}
                                                        </td>
                                                        <td class="columnID"><p>{@$updateServer->packageUpdateServerID}</p></td>
                                                        <td class="columnText columnTitle"><p><a href="{link controller='UpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}" title="{lang}wcf.acp.updateServer.edit{/lang}">{$updateServer->serverURL}</a></p></td>
@@ -85,7 +85,7 @@
                        <ul>
                                <li><a href="{link controller='UpdateServerAdd'}{/link}" title="{lang}wcf.acp.updateServer.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
                                
-                               {event name='largeButtonsBottom'}
+                               {event name='contentNavigationButtonsBottom'}
                        </ul>
                </nav>
        </div>
index c8a5c4b887ce16a500b67ea177424be4b35406b3..f9af965df0591912566fed6833af1c7d394a6ece 100644 (file)
@@ -32,7 +32,7 @@
                        <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
                        <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/search.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
@@ -68,6 +68,8 @@
                                        </dd>
                                </dl>
                        {/if}
+                       
+                       {event name='generalFields'}
                </fieldset>
                
                {if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')}
                                                {/if}
                                        </dd>
                                </dl>
+                               
+                               {event name='emailFields'}
                        </fieldset>
                {/if}
                
                                                {/if}
                                        </dd>
                                </dl>
+                               
+                               {event name='passwordFields'}
                        </fieldset>
                {/if}
                
                                                {foreach from=$optionTree item=categoryLevel1}
                                                        <li><a href="{@$__wcf->getAnchor($categoryLevel1[object]->categoryName)}">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</a></li>
                                                {/foreach}
-                                               
-                                               {event name='tabMenuTabs'}
                                        </ul>
                                </nav>
                                
                                                {/foreach}
                                        </div>
                                {/foreach}
-                               
-                               {event name='tabMenuContent'}
                        </div>
                {/if}
        </div>
index f0e5df950887c328fade9ae2ec538f91d55640ba..66b470e6ed254355f831dd6be9a5d17eccfa19e1 100644 (file)
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
+{hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
+
 <form method="post" action="{link controller='UserAssignToGroup'}{/link}">
        <div class="container containerPadding marginTop">
                <fieldset>
@@ -18,6 +30,8 @@
                        <div>
                                {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
                        </div>
+                       
+                       {event name='markedUserFields'}
                </fieldset>
                
                <fieldset>
                                        {/if}
                                <dd>
                        </dl>
+                       
+                       {event name='userGroupFields'}
                </fieldset>
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">
index 122fbdb3c433643c0704772d45c14062de190cc5..9b44aa9f1231118ce59c0d872c24c7a99dca46da 100644 (file)
        </hgroup>
 </header>
 
+{hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
+
 <form method="post" action="{link controller='UserEmailAddressExport'}{/link}">
        <div class="container containerPadding marginTop">
                <fieldset>
@@ -22,6 +34,8 @@
                        <div>
                                {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
                        </div>
+                       
+                       {event name='markedUserFields'}
                </fieldset>
                
                <fieldset>
                                        <input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
                                </dd>
                        </dl>
+                       
+                       {event name='emailAddressFormatFields'}
                </fieldset>
                
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">
index 99329f39f27dd9ebbb624d63f3ebbf747a821841..cb15b9d57a8c2468a6609039a2d7fae90130f223 100644 (file)
@@ -31,7 +31,7 @@
                <ul>
                        <li><a href="{link controller='UserGroupList'}{/link}" title="{lang}wcf.acp.menu.link.group.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
index c90c4b8f5f14db482a768783038adf828d7e24f3..5cdebff400c9b3dfa4ebe811a8f54a2af43aff9d 100644 (file)
                <nav>
                        <ul>
                                {content}
-                                       {if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>{/if}
+                                       {if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}
+                                               <li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+                                       {/if}
                                        
-                                       {event name='largeButtonsTop'}
+                                       {event name='contentNavigationButtonsTop'}
                                {/content}
                        </ul>
                </nav>
@@ -61,7 +63,7 @@
                                                        <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
                                                {/if}
                                                
-                                               {event name='buttons'}
+                                               {event name='rowButtons'}
                                        </td>
                                        <td class="columnID columnGroupID"><p>{@$group->groupID}</p></td>
                                        <td class="columnTitle columnGroupName">
                <nav>
                        <ul>
                                {content}
-                                       {if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>{/if}
+                                       {if $__wcf->getSession()->getPermission('admin.user.canAddGroup')}
+                                               <li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+                                       {/if}
                                        
-                                       {event name='largeButtonsBottom'}
+                                       {event name='contentNavigationButtonsBottom'}
                                {/content}
                        </ul>
                </nav>
index 538ac87271e9fc104686482d58d8100b4c30a87a..5429729da1d31f7dce90ec952a826f7cc7428282 100644 (file)
        </hgroup>
 </header>
 
-<div class="contentNavigation"></div>
+{hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
 
 <p class="info marginTop">{lang}wcf.acp.group.option.hint{/lang}</p>
 
@@ -39,6 +49,8 @@
                {/foreach}
        </fieldset>
        
+       {event name='fieldsets'}
+       
        <div class="formSubmit">
                <input type="button" value="{lang}wcf.global.button.submit{/lang}" id="submitButton" />
                <input type="hidden" name="id" value="{@$userGroupOption->optionID}" />
index 6f872fdd61e77af8b6dd3d4ef738566ce74dc0b6..31ee77ff27d5ec5dcbd271598f2a2f62870531aa 100644 (file)
@@ -43,7 +43,7 @@
                        {/if}
                        <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/search.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtonsTop'}
                </ul>
        </nav>
 </div>
@@ -69,7 +69,7 @@
                                                <th class="column{$column|ucfirst}{if $sortField == $column} active{/if}"><a href="{link controller='UserList'}searchID={@$searchID}&action={@$encodedAction}&pageNo={@$pageNo}&sortField={$column}&sortOrder={if $sortField == $column && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} <img src="{@$__wcf->getPath()}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        {/foreach}
                                        
-                                       {event name='headColumns'}
+                                       {event name='columnHeads'}
                                </tr>
                        </thead>
                        
@@ -90,7 +90,7 @@
                                                                        <img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.acp.user.delete{/lang}" class="icon16 disabled" />
                                                                {/if}
                                                                
-                                                               {event name='buttons'}
+                                                               {event name='rowButtons'}
                                                        </td>
                                                        <td class="columnID columnUserID"><p>{@$user->userID}</p></td>
                                                        <td class="columnTitle columnUsername"><p>{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="{link controller='UserEdit' id=$user->userID}{/link}">{$user->username}</a>{else}{$user->username}{/if}</p></td>
                                {/if}
                                <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/search.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                                
-                               {event name='largeButtons'}
+                               {event name='contentNavigationButtonsBottom'}
                        </ul>
                </nav>
        </div>
index c3b2e2e12d0a44f8f85103a70e23177f3dc973f9..f046c68259670b0ed98a5782579d8f12b3545a64 100644 (file)
@@ -36,7 +36,7 @@
                        <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
                        <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/search.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
@@ -50,6 +50,8 @@
                                <div>
                                        {implode from=$userList item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
                                </div>
+                               
+                               {event name='markedUserFields'}
                        </fieldset>
                {/if}
                
@@ -71,6 +73,8 @@
                                                {/if}
                                        </dd>
                                </dl>
+                               
+                               {event name='userGroupFields'}
                        </fieldset>
                {/if}
                
index 5b8cad36f560169fa9a8f72747f4052771d4520c..9d56ee5959794e83cae0bdce8fb4b15b96d3a78c 100644 (file)
        <p class="error">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
 {/if}
 
-{*if $deletedUsers}
-       <p class="success">{lang}wcf.acp.user.delete.success{/lang}</p>
-{elseif $deletedUsers === 0}
-       <p class="error">{lang}wcf.acp.user.delete.error{/lang}</p>
-{/if*}
-
 <div class="contentNavigation">
        <nav>
                <ul>
@@ -33,7 +27,7 @@
                        {/if}
                        <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
                        
-                       {event name='largeButtons'}
+                       {event name='contentNavigationButtons'}
                </ul>
        </nav>
 </div>
@@ -89,6 +83,8 @@
                                        </dd>
                                </dl>
                        {/if}
+                       
+                       {event name='generalFields'}
                </fieldset>
                
                {event name='fieldsets'}
                                                        {include file='optionFieldList' options=$category[options] langPrefix='wcf.user.option.'}
                                                </fieldset>
                                        {/foreach}
+                                       
+                                       {event name='profileFieldsets'}
                                </div>
                        {/if}
                        
                                                                <option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.user.username{/lang}</option>
                                                                <option value="email"{if $sortField == 'email'} selected="selected"{/if}>{lang}wcf.user.email{/lang}</option>
                                                                <option value="registrationDate"{if $sortField == 'registrationDate'} selected="selected"{/if}>{lang}wcf.user.registrationDate{/lang}</option>
-                                                       
+                                                               
                                                                {if $additionalSortFields|isset}{@$additionalSortFields}{/if}
                                                        </select>
                                                </dd>
                                                        </select>
                                                </dd>
                                        </dl>
-                                                       
+                                       
                                        <dl>
                                                <dt><label for="itemsPerPage">{lang}wcf.acp.user.search.display.itemsPerPage{/lang}</label></dt>
                                                <dd>
                                                        <label><input type="checkbox" name="columns[]" value="registrationDate" {if "registrationDate"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.registrationDate{/lang}</label>
                                                </dd>
                                        </dl>
-                                       
                                </fieldset>
+                               
+                               {event name='resultOptionFieldsets'}
                        </div>
                </div>
        </div>
index 89a7a55cccd3a91aeafb972bf69ba69d3a3e3ae7..257c9654579a9fb6e8f691e74a2568730ace1781 100644 (file)
        <p class="success">{lang}wcf.acp.user.massProcessing.success{/lang}</p>
 {/if}
 
+{hascontent}
+       <div class="contentNavigation">
+               <nav>
+                       <ul>
+                               {content}
+                                       {event name='contentNavigationButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
+
 <form method="post" action="{link controller='UsersMassProcessing'}{/link}">
        <div class="container containerPadding marginTop">
                <fieldset>
                                        </dd>
                                </dl>
                        {/if}
+                       
+                       {event name='generalFields'}
                </fieldset>
                
                {event name='fieldsets'}
                                        </fieldset>
                                {/if}
                                
-                               {event name='tabMenuContent'}
+                               {event name='tabMenuContents'}
                        </div>
                {/hascontent}
        </div>
                                                <label for="enableHTML"><input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked="checked"{/if}/> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
                                        </dd>
                                </dl>
-                       </div>
-               </fieldset>
+                       </fieldset>
+               </div>
                
                <div id="exportMailAddressDiv">
                        <fieldset>