Enhanced application management and removed RELATIVE_WCF_DIR in templates

diff --git a/wcfsetup/install/files/acp/templates/ajaxException.tpl b/wcfsetup/install/files/acp/templates/ajaxException.tpl
index b63ae1f64fb6a59735b0a8bce8b55606670a3e42..be4b8fb2b45fe56c890ca428790e99233e4f0635 100644 (file)
--- a/wcfsetup/install/files/acp/templates/ajaxException.tpl
+++ b/wcfsetup/install/files/acp/templates/ajaxException.tpl
@@ -1,3 +1,2 @@
 <p class="error">{$message}</p>
-<!--<img src="{@RELATIVE_WCF_DIR}icon/plus1.svg" alt="" /> <span>Stacktrace</span>-->
 <div id="ajaxExceptionStacktrace"><pre>{$stacktrace}</pre></div> 
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/applicationManagement.tpl b/wcfsetup/install/files/acp/templates/applicationManagement.tpl
index 130d509203d22e12e8a0132e55b13f9ad1ce9e6e..1aa331e7c9e80e079469ca4731f8c509f42c534d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/applicationManagement.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationManagement.tpl
@@ -32,7 +32,14 @@
                                                <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='Package' id=$application->packageID}{/link}">{lang}{$application->getPackage()->getName()}{/lang}</a></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>

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 75359d301f4ee0fc3427a3462ecd33c78c7c3502..de8b58391b4264d5cdb89f636c60781c5b79a173 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -8,7 +8,7 @@
                //<![CDATA[
                var SID_ARG_1ST = '{@SID_ARG_1ST}';
                var SID_ARG_2ND = '{@SID_ARG_2ND_NOT_ENCODED}';
-               var RELATIVE_WCF_DIR = '{@RELATIVE_WCF_DIR}'; // todo: still needed?
+               var RELATIVE_WCF_DIR = '{@$__wcf->getPath()}';
                var SECURITY_TOKEN = '{@SECURITY_TOKEN}';
                var LANGUAGE_ID = {@$__wcf->getLanguage()->languageID};
                //]]>

diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index 6a44372e2cc5f17925f9eee21f6b81d3ea7446ee..d0de52cb5c6b39c754bad094e25655e5052f1c39 100644 (file)
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -60,7 +60,7 @@
        <fieldset id="credits" class="container containerPadding hidden tabMenuContent">
                <dl>
                        <dt>{lang}wcf.acp.index.credits.developedBy{/lang}</dt>
-                       <dd><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={"http://www.woltlab.com"|rawurlencode}" class="externalURL">WoltLab&reg; GmbH</a></dd>
+                       <dd><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={"http://www.woltlab.com"|rawurlencode}" class="externalURL">WoltLab&reg; GmbH</a></dd>
                </dl>
                
                <dl>
@@ -100,7 +100,7 @@
                                        <li>Tim D&uuml;sterhus</li>
                                        <li>Matthias Schmidt</li>
                                        <li>
-                                               <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={"https://github.com/WoltLab/WCF/contributors"|rawurlencode}" class="externalURL">
+                                               <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={"https://github.com/WoltLab/WCF/contributors"|rawurlencode}" class="externalURL">
                                                        {lang}wcf.acp.index.credits.contributor.more{/lang}
                                                </a>
                                        </li>

diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
index e88f75e461711c98535b165c4f96d73f56e89712..3e860933388f96064d77bf5084e5424444d57a1b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
+++ b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
@@ -58,7 +58,7 @@
                                        <tr class="jsPackageRow">
                                                <td class="columnIcon">
                                                        {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-                                                               <a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="icon16 jsTooltip" /></a>
+                                                               <a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}"><img src="{@$__wcf->getPath()}icon/update.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="icon16 jsTooltip" /></a>
                                                        {else}
                                                                <img src="{@$__wcf->getPath()}icon/update.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="icon16 disabled" />
                                                        {/if}

diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
index 0fbeeaa1af8424735cf1bae8fc2bc246fe1ef8c3..793f10ae402c85bf976417ecf1a11dc6cf0060a4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
@@ -57,7 +57,7 @@
 <div class="contentNavigation">
        <nav>
                <ul>
-                       <li><a href="{link controller='PageMenuItemList'}{/link}" class="button"><img src="{@RELATIVE_WCF_DIR}icon/list.svg" alt="" /> <span>{lang}wcf.acp.pageMenu.list{/lang}</span></a></li>
+                       <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>
@@ -183,7 +183,7 @@
 <div class="contentNavigation">
        <nav>
                <ul>
-                       <li><a href="{link controller='PageMenuItemList'}{/link}" class="button"><img src="{@RELATIVE_WCF_DIR}icon/list.svg" alt="" /> <span>{lang}wcf.acp.pageMenu.list{/lang}</span></a></li>
+                       <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>