From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 14 Jul 2012 16:34:05 +0000 (+0200)
Subject: Updates/Adds title of acp pages
X-Git-Tag: 2.0.0_Beta_1~872^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7485c55b988825f2de3aa42a4c4a9c62644c4134;p=GitHub%2FWoltLab%2FWCF.git

Updates/Adds title of acp pages
---

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index f901a8d62f..9c36b7c8dc 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.sessionLog.access.list'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
index d5af8a112b..a1dbd47b40 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.sessionLog.list'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 040cc44e72..e0f1012ece 100644
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.cache.list'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 3c6d35943a..0243bb03a1 100644
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle=$objectType->getProcessor()->getLanguageVariable($action)}
 
 {if $aclObjectTypeID}
 	{include file='aclPermissions'}
diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl
index a5e98118a1..7932cfd19b 100644
--- a/wcfsetup/install/files/acp/templates/categoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle=$objectType->getProcessor()->getLanguageVariable('list')}
 
 {if $categoryNodeList|count}
 	<script type="text/javascript">
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index b49600807d..94b850a260 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.cronjob.'|concat:$action}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index d38b26d713..32bf1aeb3a 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.cronjob.list'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 50665d267a..111d5e8473 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.cronjob.log'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 3705d0012d..d52e870156 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -3,7 +3,7 @@
 <head>
 	<base href="{$baseHref}" />
 	<meta charset="utf-8" />
-	<title>{if $pageTitle|isset}{@$pageTitle}{else}{lang}wcf.global.pageTitle{/lang}{/if} - {lang}wcf.acp{/lang}</title>
+	<title>{if $pageTitle|isset}{@$pageTitle|language} - {/if}{lang}wcf.acp{/lang}{if PACKAGE_ID} - {PAGE_TITLE|language}{/if}</title>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<script type="text/javascript">
 		//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index ad684445ac..13a6eae0de 100644
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -1,5 +1,4 @@
-{capture assign='pageTitle'}{lang}wcf.user.login{/lang}{/capture}
-{include file='header'}
+{include file='header' pageTitle='wcf.user.login'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index fd6eb37649..ad44e3f603 100644
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.masterPassword.enter'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index 6d9ff35570..a1f1dedfe6 100644
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.masterPassword.init'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index 91b9945332..4306e6a9b4 100644
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.option.category.'|concat:$category->categoryName}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index 4b4f0308a0..57ce93f449 100644
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.option.import'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
index ae508cafcc..55e7e4fd08 100644
--- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index cf9de6e91e..9055fa9a66 100644
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle=$archive->getLocalizedPackageInfo('packageName')}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 3b88988ff2..b7152063ec 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.package.list'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
index a36708df6e..c41e95f8ce 100644
--- a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
+++ b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.package.list'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 539fda2e80..673d6f65f1 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -1,15 +1,14 @@
+{if $packageID == 0}
+	{assign var='pageTitle' value='wcf.acp.package.startInstall'}
+{else}
+	{assign var='pageTitle' value='wcf.acp.package.startUpdate'}
+{/if}
 {include file='header'}
 
 <header class="boxHeadline">
-	{if $packageID == 0}
-		<hgroup>
-			<h1>{lang}wcf.acp.package.startInstall{/lang}</h1>
-		</hgroup>
-	{else}
-		<hgroup>
-			<h1>{lang}wcf.acp.package.startUpdate{/lang}</h1>
-		</hgroup>
-	{/if}
+	<hgroup>
+		<h1>{lang}{@$pageTitle}{/lang}</h1>
+	</hgroup>
 </header>
 
 {if $errorField != ''}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index fca5284326..a6b4fbccc7 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
index c9023f35c2..fb1d61f7dd 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate.auth'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index 4246ccb599..3099210d24 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate.search'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
index ddfeef1d79..08163eb5da 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate.search'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 78c4883569..38b94744e7 100644
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle=$package->getName()}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
index 430136cf02..569fd0c764 100644
--- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.updateServer.'|concat:$action}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index 7e5bc7dccd..f593a61977 100644
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.updateServer.list'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index a4d9d01466..af90fdfa63 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.'|concat:$action}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 97bca46a37..aa5367abee 100644
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.assignToGroup'}
 
 <header class="boxHeadline">
 	<hgroup>
diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index 2fd61a0e5b..6f2c1c1662 100644
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.exportEmailAddress'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index f2e54996d6..8d2b6481c9 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.group.'|concat:$action}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index f5410c7c71..695d95a8c3 100644
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.group.list'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 8f827e9ab6..1dcad6953c 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -1,3 +1,9 @@
+{if $searchID}
+	{assign var='pageTitle' value='wcf.acp.user.search'}
+{else}
+	{assign var='pageTitle' value='wcf.acp.user.list'}
+{/if}
+
 {include file='header'}
 
 <script type="text/javascript">
@@ -21,7 +27,7 @@
 
 <header class="boxHeadline">
 	<hgroup>
-		<h1>{lang}wcf.acp.user.{if $searchID}search{else}list{/if}{/lang}</h1>
+		<h1>{lang}{@$pageTitle}{/lang}</h1>
 	</hgroup>
 </header>
 
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index bc92fd8ac8..605f575f25 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -1,3 +1,11 @@
+{if $action == 'all'}
+	{assign var='pageTitle' value='wcf.acp.user.sendMail.all'}
+{elseif $action == 'group'}
+	{assign var='pageTitle' value='wcf.acp.user.sendMail.group'}
+{else}
+	{assign var='pageTitle' value='wcf.acp.user.sendMail'}
+{/if}
+
 {include file='header'}
 
 {if $mailID|isset}
@@ -14,15 +22,7 @@
 
 <header class="boxHeadline">
 	<hgroup>
-		<h1>
-			{if $action == 'all'}
-				{lang}wcf.acp.user.sendMail.all{/lang}
-			{elseif $action == 'group'}
-				{lang}wcf.acp.user.sendMail.group{/lang}
-			{else}
-				{lang}wcf.acp.user.sendMail{/lang}
-			{/if}
-		</h1>
+		<h1>{lang}{@$pageTitle}{/lang}</h1>
 	</hgroup>
 </header>
 
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index b2ada61065..2b11a8b933 100644
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.search'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
index 3d1c6ba312..3b119d50eb 100644
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.massProcessing'}
 
 <script type="text/javascript">
 	//<![CDATA[
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 714518ba73..b3d4dd577c 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="de" languagename="Deutsch">
+	<category name="wcf.acp">
+		<item name="wcf.acp"><![CDATA[Administration]]></item>
+	</category>
+	
 	<category name="wcf.acp.cronjob">
 		<item name="wcf.acp.cronjob.list"><![CDATA[Cronjobs]]></item>
 		<item name="wcf.acp.cronjob.add"><![CDATA[Cronjob hinzufügen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 22d31dd27e..dc309dd829 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="en" languagename="English">
+	<category name="wcf.acp">
+		<item name="wcf.acp"><![CDATA[Administration]]></item>
+	</category>
+	
 	<category name="wcf.acp.cronjob">
 		<item name="wcf.acp.cronjob.list"><![CDATA[Cron jobs]]></item>
 		<item name="wcf.acp.cronjob.add"><![CDATA[Add a new cron job]]></item>