From 1ba05032e5473fdfdf440b77109f96c3e21286b5 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 7 Dec 2012 19:25:55 +0100
Subject: [PATCH] Enhanced application management and removed RELATIVE_WCF_DIR
 in templates

---
 wcfsetup/install/files/acp/templates/ajaxException.tpl   | 1 -
 .../files/acp/templates/applicationManagement.tpl        | 9 ++++++++-
 wcfsetup/install/files/acp/templates/header.tpl          | 2 +-
 wcfsetup/install/files/acp/templates/index.tpl           | 4 ++--
 .../install/files/acp/templates/packageListDetailed.tpl  | 2 +-
 wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl | 4 ++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/ajaxException.tpl b/wcfsetup/install/files/acp/templates/ajaxException.tpl
index b63ae1f64f..be4b8fb2b4 100644
--- 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 130d509203..1aa331e7c9 100644
--- 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 75359d301f..de8b58391b 100644
--- 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 6a44372e2c..d0de52cb5c 100644
--- 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 e88f75e461..3e86093338 100644
--- 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 0fbeeaa1af..793f10ae40 100644
--- 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>
-- 
2.20.1