Replaces template variables with template events

I mostly replaced existing template variables with events and added some new events for consistency reasons.

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index 13cf6f6367117159d8192628c038baab7c66af1e..a964177296a47a908db77fbeca379bbb2aed82f9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -28,7 +28,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="{@RELATIVE_WCF_DIR}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="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
+                                       {event name='headColumns'}
                                </tr>
                        </thead>
                        
@@ -43,8 +43,8 @@
                                                        <td class="columnText columnClassName"><p>{$sessionAccessLog->className}</p></td>
                                                        <td class="columnURL columnRequestURI" title="{$sessionAccessLog->requestURI}"><p>{if !$sessionAccessLog->hasProtectedURI()}<a href="{$sessionAccessLog->requestURI}{@SID_ARG_2ND}">{$sessionAccessLog->requestURI|truncate:50}</a>{else}{$sessionAccessLog->requestURI|truncate:50}{/if}</p></td>
                                                        <td class="columnTextolumnRequestMethod"><p>{$sessionAccessLog->requestMethod}</p></td>
-                                       
-                                                       {if $additionalColumns.$sessionAccessLog->sessionAccessLogID|isset}{@$additionalColumns.$sessionAccessLog->sessionAccessLogID}{/if}
+                                                       
+                                                       {event name='columns'}
                                                </tr>
                                        {/foreach}
                                {/content}

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
index f007cb9a639f88eb0292a61b805acdb261b24698..798b266e9216ef0a8dc076dc6309fc2cf558f2a3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
@@ -28,7 +28,7 @@
                                        <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="{@RELATIVE_WCF_DIR}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.accesses{/lang}{if $sortField == 'accesses'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
+                                       {event name='headColumns'}
                                </tr>
                        </thead>
                        
@@ -44,7 +44,7 @@
                                                        <td class="columnDate columnLastActivityTime"><p>{@$sessionLog->lastActivityTime|time}</p></td>
                                                        <td class="columnDigits columnAccesses"><p>{#$sessionLog->accesses}</p></td>
                                        
-                                                       {if $additionalColumns.$sessionLog->sessionLogID|isset}{@$additionalColumns.$sessionLog->sessionLogID}{/if}
+                                                       {event name='columns'}
                                                </tr>
                                        {/foreach}
                                {/content}

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 85b88052d16e3dab361f1f9bf64622cb87bb72d2..14bbcee9dccba68c9b4d6281928d9006f769d889 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -45,14 +45,15 @@
                <dd>{#$cacheData.files}</dd>
        </dl>{/if}
        
-       {if $additionalFields|isset}{@$additionalFields}{/if}
+       {event name='dataFields'}
 </fieldset>
 
 <div class="contentHeader">
        <nav>
                <ul class="largeButtons">
                        {if $cacheData.files}<li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="{link controller='CacheClear'}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -100,7 +101,8 @@
        <nav class="largeButtons">
                <ul>
                        {if $cacheData.files}<li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="{link controller='CacheClear'}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>

diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index b879cb716a2f52bb315105e02ac885dc0077780f..c6eee63c1d416c639b40664480d150861aebf08b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -22,7 +22,11 @@
        <nav>
                <ul class="largeButtons">
                        <li><a href="{link controller='CronjobList'}{/link}" title="{lang}wcf.acp.menu.link.cronjob.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/time1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
-                       {if $action == 'edit'}<li><a href="{link controller='CronjobExecute' id=$cronjobID}{/link}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/run1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>{/if}
+                       {if $action == 'edit'}
+                               <li><a href="{link controller='CronjobExecute' id=$cronjobID}{/link}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/run1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>
+                       {/if}
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -55,6 +59,8 @@
                                        <input type="text" id="description" name="description" value="{$description}" class="long" />
                                </dd>
                        </dl>
+                       
+                       {event name='dataFields'}
                </fieldset>
                
                <fieldset>
@@ -124,9 +130,11 @@
                                        <small>{lang}wcf.acp.cronjob.startDow.description{/lang}</small>
                                </dd>
                        </dl>
+                       
+                       {event name='timingFields'}
                </fieldset>
                
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 6ee91b01b782546d4cefc9ae9f7c1971bb4c9ee2..d0939b699255c60d583c7c889b9c0a5a4456631a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -37,13 +37,19 @@
 <div class="contentHeader">
        {pages print=true assign=pagesLinks controller="CronjobList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
        
-       {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
+       {hascontent}
                <nav>
                        <ul class="largeButtons">
-                               <li><a href="{link controller='CronjobAdd'}{/link}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
+                               {content}
+                                       {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
+                                               <li><a href="{link controller='CronjobAdd'}{/link}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li>
+                                       {/if}
+
+                                       {event name='largeButtons'}
+                               {/content}
                        </ul>
                </nav>
-       {/if}
+       {/hascontent}
 </div>
 
 {hascontent}
@@ -64,7 +70,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="{@RELATIVE_WCF_DIR}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="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
+                                       {event name='headColumns'}
                                </tr>
                        </thead>
                        
@@ -99,7 +105,8 @@
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" />
                                                                {/if}
-                                                               {if $additionalButtons[$cronjob->cronjobID]|isset}{@$additionalButtons[$cronjob->cronjobID]}{/if}
+                                                               
+                                                               {event name='buttons'}
                                                        </td>
                                                        <td class="columnID"><p>{@$cronjob->cronjobID}</p></td>
                                                        <td class="columnDate columnStartMinute"><p>{$cronjob->startMinute|truncate:30:' ...'}</p></td>
@@ -120,7 +127,7 @@
                                                                {/if}
                                                        </td>
                                        
-                                                       {if $additionalColumns[$cronjob->cronjobID]|isset}{@$additionalColumns[$cronjob->cronjobID]}{/if}
+                                                       {event name='columns'}
                                                </tr>
                                        {/foreach}
                                {/content}
@@ -132,6 +139,7 @@
        <div class="contentFooter">
                {@$pagesLinks}
                
+               {* todo: add large button event *}
                {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
                        <nav>
                                <ul class="largeButtons">

diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 811abd9ba54f4ee0d1f42d6d92301cea2d920e27..f823c817707cb6d44e40ac9100e17c4c80775901 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -27,7 +27,7 @@
                                                <th class="columnText columnDescription{if $sortField == 'description'} active{/if}"><a href="{link controller='CronjobLogList'}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="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                                <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="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                                
-                                               {if $additionalColumns|isset}{@$additionalColumns}{/if}
+                                               {event name='headColumns'}
                                        </tr>
                                </thead>
                                
@@ -49,7 +49,7 @@
                                                                        <td class="columnDate columnExecTime"></td>
                                                                {/if}
                                                        
-                                                               {if $cronjobLog->additionalColumns|isset}{@$cronjobLog->additionalColumns}{/if}
+                                                               {event name='columns'}
                                                        </tr>
                                                {/foreach}
                                        {/content}

diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index 812873ed11ec0f5d7d2106efae0ecc0da4cc7cf7..8933311c521b3970e89a70a57f3f2c8943146269 100644 (file)
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -59,9 +59,11 @@
                        </dd>
                </dl>
                
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='dataFields'}
        </fieldset>
        
+       {event name='fieldsets'}
+       
        <div class="formSubmit">
                <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />

diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index 2a4c6c18461ae30f808d8f54752e3fd9d0e974df..d7c899168a29409532e089813dbf713217fb6dcb 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -41,9 +41,11 @@
                                        <small>{lang}wcf.acp.masterPassword.enter.description{/lang}</small>
                                </dd>
                        </dl>
+                       
+                       {event name='enterFields'}
                </fieldset>
                
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='fieldsets'}
        </div>
 
        <div class="formSubmit">

diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index 7f4d07029e3bd6efab1cfce998143e6c09c10bf5..d2c71549d9ba40c38da7eb9057fdfd37b1295d98 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -69,9 +69,11 @@
                                        <input type="hidden" id="exampleMasterPassword" name="exampleMasterPassword" value="{@$exampleMasterPassword}" />
                                </dd>
                        </dl>
+                       
+                       {event name='initFields'}
                </fieldset>
                
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='fieldsets'}
        </div>
 
        <div class="formSubmit">

diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index c99e2c2f117ad46c4c150e3c7a63f39cd6677298..3f061183f1843dabbd28633fd68bb66a66306737 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -37,9 +37,11 @@
                                        <small>{lang}wcf.acp.option.import.upload.description{/lang}</small>
                                </dd>
                        </dl>
+                       
+                       {event name='importFields'}
                </fieldset>
                
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='importFieldsets'}
        </div>
 
        <div class="formSubmit">
@@ -68,9 +70,11 @@
                                <small>{lang}wcf.acp.option.export.download.description{/lang}</small>
                        </dd>
                </dl>
+               
+               {event name='exportFields'}
        </fieldset>
        
-       {if $additionalFields|isset}{@$additionalFields}{/if}
+       {event name='exportFieldsets'}
 </div>
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
index 6c09145d246fa30fffd5cfe81121221647cf6ebd..a6b7213a2fc127274d562b31e36d288794e9e552 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
@@ -45,7 +45,7 @@
                                                                {$availableUpdate.packageName}{if $availableUpdate.instanceNo > 1} (#{#$availableUpdate.instanceNo}){/if}
                                                        </label>
                                                </h1>
-                                       <hgroup>
+                                       </hgroup>
 
                                        <div class="messageBody">
                                                <dl>

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 53ba2f7a203be8c0dd587718910fff5351c7519d..ae4477de5743c52be6336e835a6288083738b5b4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -71,7 +71,7 @@
                <dd>{if $archive->getPackageInfo('authorURL')}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$archive->getPackageInfo('authorURL')|rawurlencode}" class="externalURL">{$archive->getPackageInfo('author')}</a>{else}{$archive->getPackageInfo('author')}{/if}</dd>
        </dl>
        
-       {if $additionalFields|isset}{@$additionalFields}{/if}
+       {event name='propertyFields'}
 </fieldset>
 
 {if $updatableInstances|count > 0}

diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
index ac24ccbc33b12351cb8a92a1e0eeb831d50edad8..8d38a267370da6f1b6853e88fc5e6dbb3287eab1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
+++ b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
@@ -20,14 +20,19 @@
 <div class="contentHeader">
        {pages print=true assign=pagesLinks controller='PackageListDetailed' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
 
-       {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset}
+       {hascontent}
                <nav>
                        <ul class="largeButtons">
-                               {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}
-                               {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                               {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}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
+                                       {/if}
+                               
+                                       {event name='largeButtons'}
+                               {/content}
                        </ul>
                </nav>
-       {/if}
+       {/hascontent}
 </div>
 
 {if $objects|count > 0}
@@ -45,7 +50,7 @@
                                        <th class="columnText{if $sortField == 'packageVersion'}active{/if}"><a href="{link controller='PackageListDetailed'}pageNo={@$pageNo}&sortField=packageVersion&sortOrder={if $sortField == 'packageVersion' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnDate{if $sortField == 'updateDate'} active{/if}"><a href="{link controller='PackageListDetailed'}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="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
+                                       {event name='headColumns'}
                                </tr>
                        </thead>
                        
@@ -64,7 +69,7 @@
                                                                <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
                                                        {/if}
                                                        
-                                                       {if $additionalButtons[$package->packageID]|isset}{@$additionalButtons[$package->packageID]}{/if}
+                                                       {event name='buttons'}
                                                </td>
                                                <td class="columnID"><p>{@$package->packageID}</p></td>
                                                <td class="columnIcon">
@@ -83,7 +88,7 @@
                                                <td class="columnText"><p>{$package->packageVersion}</p></td>
                                                <td class="columnDate"><p>{@$package->updateDate|time}</p></td>
                                                
-                                               {if $additionalColumns[$package->packageID]|isset}{@$additionalColumns[$package->packageID]}{/if}
+                                               {event name='columns'}
                                        </tr>
                                {/foreach}
                        </tbody>
@@ -95,14 +100,19 @@
 <div class="contentFooter">
        {@$pagesLinks}
        
-       {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset}
+       {hascontent}
                <nav>
                        <ul class="largeButtons">
-                               {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="{link controller='PackageStartInstall'}action=install{/link}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}
-                               {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                               {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}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
+                                       {/if}
+                               
+                                       {event name='largeButtons'}
+                               {/content}
                        </ul>
                </nav>
-       {/if}
+       {/hascontent}
 </div>
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 725ba43ae54ea55818f5557166117e0f364256b9..0b8b80aa139503e96afbcf8c73240dcd90bc1cff 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -22,7 +22,8 @@
        <nav>
                <ul class="largeButtons">
                        <li><a href="{link controller='PackageList'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -65,9 +66,11 @@
                                        <small>{lang}wcf.acp.package.startInstall.source.download.description{/lang}</small>
                                </dd>
                        </dl>
+                       
+                       {event name='sourceFields'}
                </fieldset>
                
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='fieldsets'}
        </div>
 
        <div class="formSubmit">

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index b5ad9c4a46782a96e169aad405e25995a5b6b93b..9f05aa68921f762b99a87f71628a0b53068acd03 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -60,7 +60,7 @@
                <dd>{if $packageObj->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$packageObj->authorURL|rawurlencode}" class="externalURL">{$packageObj->author}</a>{else}{$packageObj->author}{/if}</dd>
        </dl>
        
-       {if $additionalFields|isset}{@$additionalFields}{/if}
+       {event name='propertyFields'}
 </fieldset>
 
 {if $dependentPackages|count > 0}
@@ -84,7 +84,7 @@
                                        <th class="columnText">{lang}wcf.acp.package.list.version{/lang}</th>
                                        <th class="columnDate">{lang}wcf.acp.package.list.date{/lang}</th>
                                        
-                                       {if $additionalColumns|isset}{@$additionalColumns}{/if}
+                                       {event name='headColumns'}
                                </tr>
                        </thead>
                        
@@ -103,7 +103,7 @@
                                                        <img src="{@RELATIVE_WCF_DIR}icon/deleteD1.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
                                                {/if}
                                                
-                                               {if $package.additionalButtons|isset}{@$package.additionalButtons}{/if}
+                                               {event name='buttons'}
                                        </td>
                                        <td class="columnID"><p>{@$package.packageID}</p></td>
                                        <td class="columnIcon">
@@ -120,7 +120,7 @@
                                        <td class="columnText"><p>{$package.packageVersion}</p></td>
                                        <td class="columnDate"><p>{@$package.packageDate|date}</p></td>
                                        
-                                       {if $package.additionalColumns|isset}{@$package.additionalColumns}{/if}
+                                       {event name='columns'}
                                </tr>
                        {/foreach}
                        </tbody>

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index edcb48d14f03b68894347b567a04084777e70c97..f6ab9fd515e9ce6c51794b55955d082fa7109b47 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -91,7 +91,7 @@
                                <dd>{if $package->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="externalURL">{$package->author}</a>{else}{$package->author}{/if}</dd>
                        </dl>
        
-                       {if $additionalFields|isset}{@$additionalFields}{/if}
+                       {event name='propertyFields'}
                </fieldset>
 
                {if $package->packageDescription}
@@ -127,8 +127,8 @@
                                                                <th class="columnText">{lang}wcf.acp.package.list.author{/lang}</th>
                                                                <th class="columnText">{lang}wcf.acp.package.list.version{/lang}</th>
                                                                <th class="columnDigits">{lang}wcf.acp.package.list.date{/lang}</th>
-                                       
-                                                               {if $additionalColumns|isset}{@$additionalColumns}{/if}
+                                                               
+                                                               {event name='requirementHeadColumns'}
                                                        </tr>
                                                </thead>
                        
@@ -162,6 +162,8 @@
                                                                                <td class="columnText">{if $requiredPackage.authorURL}<p><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$requiredPackage.authorURL|rawurlencode}" class="externalURL">{$requiredPackage.author}</a>{else}{$requiredPackage.author}</p>{/if}</td>
                                                                                <td class="columnText"><p>{$requiredPackage.packageVersion}</p></td>
                                                                                <td class="columnDate"><p>{@$requiredPackage.packageDate|date}</p></td>
+                                                                               
+                                                                               {event name='requirementColumns'}
                                                                        </tr>
                                                                {/foreach}
                                                        {/content}
@@ -185,8 +187,8 @@
                                                                <th>{lang}wcf.acp.package.list.author{/lang}</th>
                                                                <th>{lang}wcf.acp.package.list.version{/lang}</th>
                                                                <th>{lang}wcf.acp.package.list.date{/lang}</th>
-                                       
-                                                               {if $additionalColumns|isset}{@$additionalColumns}{/if}
+                                                               
+                                                               {event name='dependencyHeadColumns'}
                                                        </tr>
                                                </thead>
                        
@@ -220,6 +222,8 @@
                                                                                <td class="columnText">{if $dependentPackage.authorURL}<p><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$dependentPackage.authorURL|rawurlencode}" class="externalURL">{$dependentPackage.author}</a>{else}{$dependentPackage.author}</p>{/if}</td>
                                                                                <td class="columnText"><p>{$dependentPackage.packageVersion}</p></td>
                                                                                <td class="columnDate"><p>{@$dependentPackage.packageDate|date}</p></td>
+                                                                               
+                                                                               {event name='dependencyColumns'}
                                                                        </tr>
                                                                {/foreach}
                                                        {/content}
@@ -239,17 +243,28 @@
        {/if}
 {/foreach}
 
-<div class="contentFooter">
-       <nav>
-               <ul class="largeButtons">
-                       {if PACKAGE_ID != $package->packageID}
-                               {if $package->standalone && $package->package != 'com.woltlab.wcf'}<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>{/if}
-                               {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}<li><a href="{link controller='Package'}action=startUninstall&packageID={@$package->packageID}{/link}" onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.view.button.uninstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.uninstall{/lang}</span></a></li>{/if}
-                       {/if}
-                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}<li><a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}" title="{lang}wcf.acp.package.view.button.update{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>{/if}
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
-               </ul>
-       </nav>
-</div>
+{hascontent}
+       <div class="contentFooter">
+               <nav>
+                       <ul class="largeButtons">
+                               {content}
+                                       {if PACKAGE_ID != $package->packageID}
+                                               {if $package->standalone && $package->package != 'com.woltlab.wcf'}
+                                                       <li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>
+                                               {/if}
+                                               {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}
+                                                       <li><a href="{link controller='Package'}action=startUninstall&packageID={@$package->packageID}{/link}" onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.view.button.uninstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.uninstall{/lang}</span></a></li>
+                                               {/if}
+                                       {/if}
+                                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
+                                               <li><a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}" title="{lang}wcf.acp.package.view.button.update{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>
+                                       {/if}
+                                       
+                                       {event name='largeButtons'}
+                               {/content}
+                       </ul>
+               </nav>
+       </div>
+{/hascontent}
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
index 832f97ae56f3c88eb6f4cf0806d28465ba340244..502ac14df5088d22bb56b12c67130b3acf16036e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
@@ -23,6 +23,8 @@
        <nav>
                <ul class="largeButtons">
                        <li><a href="{link controller='UpdateServerList'}{/link}" title="{lang}wcf.acp.menu.link.package.server.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/server1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li>
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -65,9 +67,10 @@
                                </dd>
                        </dl>
                        
-                       {if $additionalFields|isset}{@$additionalFields}{/if}
+                       {event name='dataFields'}
                </fieldset>
                
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">

diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index 61ba2b52d3166eabcb50398fab81ebf3cb6cf995..51f7f3d3a6d0a36c2823995ffce0d0bed6d792dc 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -26,6 +26,8 @@
        <nav>
                <ul class="largeButtons">
                        <li><a href="{link controller='UpdateServerAdd'}{/link}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -46,7 +48,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="{@RELATIVE_WCF_DIR}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="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
+                                       {event name='headColumns'}
                                </tr>
                        </thead>
                        
@@ -59,7 +61,7 @@
                                                                <a href="{link controller='UpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
                                                                <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="deleteButton balloonTooltip" data-object-id="{@$updateServer->packageUpdateServerID}" data-confirm-message="{lang}wcf.acp.updateServer.delete.sure{/lang}" />
                                                        
-                                                               {if $additionalButtons[$updateServer->packageUpdateServerID]|isset}{@$additionalButtons[$updateServer->packageUpdateServerID]}{/if}
+                                                               {event name='buttons'}
                                                        </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.global.button.edit{/lang}">{$updateServer->serverURL}</a></p></td>
@@ -68,7 +70,7 @@
                                                        <td class="columnText"><p title="{@$updateServer->errorMessage}">{@$updateServer->errorMessage|truncate:"30"}</p></td>
                                                        <td class="columnDate"><p>{if $updateServer->lastUpdateTime}{@$updateServer->lastUpdateTime|time}{/if}</p></td>
                                                
-                                                       {if $additionalColumns[$updateServer->packageUpdateServerID]|isset}{@$additionalColumns[$updateServer->packageUpdateServerID]}{/if}
+                                                       {event name='columns'}
                                                </tr>
                                        {/foreach}
                                {/content}
@@ -83,6 +85,8 @@
                <nav>
                        <ul class="largeButtons">
                                <li><a href="{link controller='UpdateServerAdd'}{/link}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li>
+                               
+                               {event name='largeButtons'}
                        </ul>
                </nav>
        </div>

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 9e7169b66eee6a351852a99e422b7714a0d479d9..6549be3706e9af3e8664954e8a73768064f3ee4c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -32,7 +32,8 @@
                <ul class="largeButtons">
                        <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <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}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -142,7 +143,7 @@
                        </fieldset>
                {/if}
        
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='fieldsets'}
                
                {if $optionTree|count || $additionalTabs|isset}
                        <div class="tabMenuContainer">

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index b51ee8b014bfb8863d260cee4bb5fd8654bd9e36..4779bb616044adf8d6a64377a83e4db5ea6cb27b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -35,7 +35,8 @@
        <nav>
                <ul class="largeButtons">
                        <li><a href="{link controller='UserGroupList'}{/link}" title="{lang}wcf.acp.menu.link.group.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -63,10 +64,10 @@
                                </dd>
                        </dl>
                        
-                       {if $additionalFields|isset}{@$additionalFields}{/if}
+                       {event name='dataFields'}
                </fieldset>
                
-               {if $additionalFieldSets|isset}{@$additionalFieldSets}{/if}
+               {event name='fieldsets'}
                
                <div class="tabMenuContainer" data-active="{$activeSubTabMenuItem}" data-store="activeTabMenuItem">
                        <nav class="tabMenu">

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index e5a9ba45f985f8e51fa38954d117a9dd39a88898..6e45dfc76de0252c14abaa8aa74347b4f42134d5 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -12,7 +12,8 @@
        <nav>
                <ul class="largeButtons">
                        <li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}                       
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -30,7 +31,7 @@
                                        <th class="columnTitle columnGroupName{if $sortField == 'groupName'} active{/if}"><a href="{link controller='UserGroupList'}pageNo={@$pageNo}&sortField=groupName&sortOrder={if $sortField == 'groupName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnDigits columnMembers{if $sortField == 'members'} active{/if}"><a href="{link controller='UserGroupList'}pageNo={@$pageNo}&sortField=members&sortOrder={if $sortField == 'members' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
-                                       {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
+                                       {event name='headColumns'}
                                </tr>
                        </thead>
                        
@@ -49,14 +50,14 @@
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" />
                                                                {/if}
-                                                       
-                                                               {if $additionalButtons[$group->groupID]|isset}{@$additionalButtons[$group->groupID]}{/if}
+                                                               
+                                                               {event name='buttons'}
                                                        </td>
                                                        <td class="columnID columnGroupID"><p>{@$group->groupID}</p></td>
                                                        <td class="columnTitle columnGroupName">{if $group->isEditable()}<p><a title="{lang}wcf.acp.group.edit{/lang}" href="{link controller='UserGroupEdit' id=$group->groupID}{/link}">{lang}{$group->groupName}{/lang}</a>{else}{lang}{$group->groupName}{/lang}</p>{/if}</td>
                                                        <td class="columnDigits columnMembers"><p><a title="{lang}wcf.acp.group.showMembers{/lang}" href="{link controller='UserSearch'}groupID={@$group->groupID}{/link}">{#$group->members}</p></a></td>
                                                
-                                                       {if $additionalColumns[$group->groupID]|isset}{@$additionalColumns[$group->groupID]}{/if}
+                                                       {event name='columns'}
                                                </tr>
                                        {/foreach}
                                {/content}
@@ -70,7 +71,8 @@
                <nav>
                        <ul class="largeButtons">
                                <li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
-                               {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                               
+                               {event name='largeButtons'}
                        </ul>
                </nav>
        </div>

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index fe4793735fa9629c5156e0b1d02dcbeae22f6617..283052bb4f682849071e2faf9ba71f9d378c0f51 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -28,7 +28,8 @@
                                <li><a href="{link controller='UserAdd'}{/link}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                        {/if}
                        <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -37,7 +38,8 @@
        <nav class="menu">
                <ul>
                        <li{if $action == ''} class="active"{/if}><a href="{link controller='UserList'}{/link}"><span>{lang}wcf.acp.user.list.all{/lang}</span> <span class="badge" title="{lang}wcf.acp.user.list.count{/lang}">{#$items}</span></a></li>
-                       {if $additionalUserListOptions|isset}{@$additionalUserListOptions}{/if}
+                       
+                       {event name='userListOptions'}
                </ul>
        </nav>
        
@@ -53,7 +55,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="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        {/foreach}
                                        
-                                       {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
+                                       {event name='headColumns'}
                                </tr>
                        </thead>
                        
@@ -74,7 +76,7 @@
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.user.delete{/lang}" />
                                                                {/if}
                                                
-                                                               {if $additionalButtons[$user->userID]|isset}{@$additionalButtons[$user->userID]}{/if}
+                                                               {event name='buttons'}
                                                        </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>
@@ -83,7 +85,7 @@
                                                                <td class="column{$column|ucfirst}"><p>{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}</p></td>
                                                        {/foreach}
                                        
-                                                       {if $additionalColumns[$user->userID]|isset}{@$additionalColumns[$user->userID]}{/if}
+                                                       {event name='columns'}
                                                </tr>
                                        {/foreach}
                                {/content}
@@ -103,7 +105,8 @@
                                        <li><a href="{link controller='UserAdd'}{/link}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                                {/if}
                                <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
-                               {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                               
+                               {event name='largeButtons'}
                        </ul>
                </nav>
        </div>

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 22c8e375f2314c42950f3c0338491fb7c8fba55a..509010dd31dc4effc8d52d3be74e35af4a8bb9af 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -36,7 +36,8 @@
                <ul class="largeButtons">
                        <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <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}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
-                       {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -145,9 +146,10 @@
                                </dd>
                        </dl>
                        
-                       {if $additionalFields|isset}{@$additionalFields}{/if}
+                       {event name='mailFields'}
                </fieldset>
                
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 6c440af346a141eafa53c052aceabda471e2de96..874af1a1d2f67f79dc274eed57c68bc936ead399 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -32,6 +32,8 @@
                                <li><a href="{link controller='UserAdd'}{/link}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                        {/if}
                        <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+                       
+                       {event name='largeButtons'}
                </ul>
        </nav>
 </div>
@@ -108,13 +110,17 @@
                        {/if}
                </fieldset>
                
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='fieldsets'}
                
                <div class="tabMenuContainer">
                        <nav class="tabMenu">
                                <ul>
-                                       {if $optionTree|count}<li><a href="#profile">{*<span>*}{lang}wcf.acp.user.search.conditions.profile{/lang}{*</span>*}</a></li>{/if}
-                                       {if $additionalTabs|isset}{@$additionalTabs}{/if}
+                                       {if $optionTree|count}
+                                               <li><a href="#profile">{*<span>*}{lang}wcf.acp.user.search.conditions.profile{/lang}{*</span>*}</a></li>
+                                       {/if}
+                                       
+                                       {event name='tabMenuTabs'}
+                                       
                                        <li><a href="#resultOptions">{*<span>*}{lang}wcf.acp.user.search.display{/lang}{*</span>*}</a></li>
                                </ul>
                        </nav>
@@ -128,7 +134,7 @@
                                </div>
                        {/if}
                
-                       {if $additionalTabContents|isset}{@$additionalTabContents}{/if}
+                       {event name='tabMenuContent'}
                
                        <div id="resultOptions" class="border tabMenuContent hidden">
                                <hgroup class="subHeading">

diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
index a71b7520a650554498deca6f30caeba38c68a0b5..80f4666304964ecc392a2ac822ea1b03a5d9f6c2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
@@ -148,30 +148,37 @@
                        {/if}
                </fieldset>
        
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='fieldsets'}
                
-               <nav class="tabMenu"><!-- ToDo: Fix that TabMenu! -->
-                       <ul>
-                               {if $options|count}<li id="profile"><a onclick="tabMenu.showSubTabMenu('profile');"><span>{lang}wcf.acp.user.search.conditions.profile{/lang}</span></a></li>{/if}
-                               {if $additionalTabs|isset}{@$additionalTabs}{/if}
-                       </ul>
-               </nav>
-               
-               <nav class="menu">
-                       <div class="containerHead"><div> </div></div>
-               </nav>
-               
-               {if $options|count}
-                       <div id="profile-content" class="border tabMenuContent hidden">
-                               <hgroup class="subHeading">
-                                       <h1>{lang}wcf.acp.user.search.conditions.profile{/lang}</h1>
-                               </hgroup>
-                               
-                               {include file='optionFieldList' langPrefix='wcf.user.option.'}
-                       </div>
-               {/if}
-               
-               {if $additionalTabContents|isset}{@$additionalTabContents}{/if}
+               {hascontent}
+                       <nav class="tabMenu"><!-- ToDo: Fix that TabMenu! -->
+                               <ul>
+                                       {content}
+                                               {if $options|count}
+                                                       <li id="profile"><a onclick="tabMenu.showSubTabMenu('profile');"><span>{lang}wcf.acp.user.search.conditions.profile{/lang}</span></a></li>
+                                               {/if}
+
+                                               {event name='tabMenuTabs'}
+                                       {/content}
+                               </ul>
+                       </nav>
+
+                       <nav class="menu">
+                               <div class="containerHead"><div> </div></div>
+                       </nav>
+
+                       {if $options|count}
+                               <div id="profile-content" class="border tabMenuContent hidden">
+                                       <hgroup class="subHeading">
+                                               <h1>{lang}wcf.acp.user.search.conditions.profile{/lang}</h1>
+                                       </hgroup>
+
+                                       {include file='optionFieldList' langPrefix='wcf.user.option.'}
+                               </div>
+                       {/if}
+
+                       {event name='tabMenuContent'}
+               {/hascontent}
        </div>
        
        <div class="border content">