Updates/Adds title of acp pages
authorMatthias Schmidt <gravatronics@live.com>
Sat, 14 Jul 2012 16:34:05 +0000 (18:34 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 14 Jul 2012 16:34:05 +0000 (18:34 +0200)
37 files changed:
wcfsetup/install/files/acp/templates/acpSessionLog.tpl
wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
wcfsetup/install/files/acp/templates/cacheList.tpl
wcfsetup/install/files/acp/templates/categoryAdd.tpl
wcfsetup/install/files/acp/templates/categoryList.tpl
wcfsetup/install/files/acp/templates/cronjobAdd.tpl
wcfsetup/install/files/acp/templates/cronjobList.tpl
wcfsetup/install/files/acp/templates/cronjobLogList.tpl
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/acp/templates/login.tpl
wcfsetup/install/files/acp/templates/masterPassword.tpl
wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/optionImport.tpl
wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/files/acp/templates/packageListDetailed.tpl
wcfsetup/install/files/acp/templates/packageStartInstall.tpl
wcfsetup/install/files/acp/templates/packageUpdate.tpl
wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
wcfsetup/install/files/acp/templates/packageView.tpl
wcfsetup/install/files/acp/templates/updateServerAdd.tpl
wcfsetup/install/files/acp/templates/updateServerList.tpl
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/files/acp/templates/userMail.tpl
wcfsetup/install/files/acp/templates/userSearch.tpl
wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index f901a8d62fac1d549bf1ea80002f853f5ec72bda..9c36b7c8dceb7f309ea199bde8b76bfb5d1b5521 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.sessionLog.access.list'}
 
 <header class="boxHeadline">
        <hgroup>
index d5af8a112ba7e9eb6944962902ebdd939babafa7..a1dbd47b40e4442f7ea8873c3f937eb1cd408587 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.sessionLog.list'}
 
 <header class="boxHeadline">
        <hgroup>
index 040cc44e727a5cbcd1f568ff2f414958f0ba81cc..e0f1012ece747811a924b17358b0281cdf29ab06 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.cache.list'}
 
 <script type="text/javascript">
        //<![CDATA[
index 3c6d35943a5a3d8b2efc1733ed6d4719228f3adf..0243bb03a11f8d11c0cc5a41a54c25753b3a4ada 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle=$objectType->getProcessor()->getLanguageVariable($action)}
 
 {if $aclObjectTypeID}
        {include file='aclPermissions'}
index a5e98118a1b08458f7a31b8eac987e9a0a2cca1d..7932cfd19bd9b311ae49f676f795b66c3b59c667 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle=$objectType->getProcessor()->getLanguageVariable('list')}
 
 {if $categoryNodeList|count}
        <script type="text/javascript">
index b49600807d214316a3d55bcb686b8e8b6c15c055..94b850a2609e21b69f62ff357af2875884fd1c8b 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.cronjob.'|concat:$action}
 
 <header class="boxHeadline">
        <hgroup>
index d38b26d713603970a7fc12d675e82f37b46290d7..32bf1aeb3a18ca7221e72942cb9bd5ec066c8a66 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.cronjob.list'}
 
 <header class="boxHeadline">
        <hgroup>
index 50665d267ac99f19272ea6e938e2bc8ebecd4dc8..111d5e84737e52cd276abc5ee18dd34856731a62 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.cronjob.log'}
 
 <header class="boxHeadline">
        <hgroup>
index 3705d0012dcaa63470f041b620189e54909824f9..d52e870156d9288a090ca3a7a115eda6d6a739be 100644 (file)
@@ -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[
index ad684445ac1521313c53ec9263075853cedf18df..13a6eae0dec47d7e4eb23ce2122a124f861e0c89 100644 (file)
@@ -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[
index fd6eb37649f858e6877f96f0b0e8163128df65a4..ad44e3f60320eb159d537b622210058b68606188 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.masterPassword.enter'}
 
 <script type="text/javascript">
        //<![CDATA[
index 6d9ff35570167c61b85b2675ed53750f171656fd..a1f1dedfe6e3b1fe694cb0943fa1c93d03f32135 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.masterPassword.init'}
 
 <script type="text/javascript">
        //<![CDATA[
index 91b994533243cdb19233e605998ec6ce3f5540ad..4306e6a9b4fed09d10233a6457b9587ea5c8f362 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.option.category.'|concat:$category->categoryName}
 
 <script type="text/javascript">
        //<![CDATA[
index 4b4f0308a005a2dd84f72b4f4ba56eadaea01edf..57ce93f4499550d1d5225f267b8144c422169677 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.option.import'}
 
 <header class="boxHeadline">
        <hgroup>
index ae508cafcc00b724b624e6c087928d92f6ad808c..55e7e4fd085833da41232fdf816f9e5a8ff03c04 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate'}
 
 <script type="text/javascript">
        //<![CDATA[
index cf9de6e91e92008e9a6cb52d9b04a6b7d182bebf..9055fa9a66f4fe5c5304cac6729e8c28951c77e7 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle=$archive->getLocalizedPackageInfo('packageName')}
 
 <script type="text/javascript">
        //<![CDATA[
index 3b88988ff2d48cfcc357869f4abcd550c0e498a9..b7152063ecf1424af50bf2d31d72716d2c32edb9 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.package.list'}
 
 <script type="text/javascript">
        //<![CDATA[
index a36708df6ee1bde113035aa77c2a4589b425783f..c41e95f8ce8f164f0333512f655edb90fe9633b5 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.package.list'}
 
 <script type="text/javascript">
        //<![CDATA[
index 539fda2e80db41d816cb7f75e80d04094e44cdce..673d6f65f1d38838d95872bd69b99529c943cf05 100644 (file)
@@ -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 != ''}
index fca5284326c05f2633faa8e7d6beebaa995f289e..a6b4fbccc75cc8a681ea656e2640d89f7953c8f5 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate'}
 
 <header class="boxHeadline">
        <hgroup>
index c9023f35c2dd29056193d5b5a47ba9c860f65404..fb1d61f7dd0a4b6e938f57758d1f9734a5b25ec0 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate.auth'}
 
 <header class="boxHeadline">
        <hgroup>
index 4246ccb599f04837839ee442b1e324ee5ce0e810..3099210d24822de7fed30b32f06b6da771ba0a73 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate.search'}
 
 <script type="text/javascript">
        //<![CDATA[
index ddfeef1d79e9df3eb55bbb4c27437a2fb551a6d8..08163eb5dafbc7faae5ae4f31e3c2379b1901c3d 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.packageUpdate.search'}
 
 <header class="boxHeadline">
        <hgroup>
index 78c48835691b106205336419e743b0762d18e3a2..38b94744e7f62c874c12467b44df3c4f5c5ad484 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle=$package->getName()}
 
 <script type="text/javascript">
        //<![CDATA[
index 430136cf02a6d09b19e9bd6c991ac5947ab3c911..569fd0c7647b217c40b9b07f2f71d90e9864167f 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.updateServer.'|concat:$action}
 
 <header class="boxHeadline">
        <hgroup>
index 7e5bc7dccdf897c092d0763607357e884a21e13f..f593a6197793143afef9f27abc244830fae0369b 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.updateServer.list'}
 
 <script type="text/javascript">
        //<![CDATA[
index a4d9d01466d0b77fdea86f1b3beae1a0f71811f1..af90fdfa63c89d37d187ae387764ba435a9c0e45 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.'|concat:$action}
 
 <script type="text/javascript">
        //<![CDATA[
index 97bca46a377bc7e094ce533122834963dbbad28b..aa5367abeefc72e547de59b3f835ecd42188ac4c 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.assignToGroup'}
 
 <header class="boxHeadline">
        <hgroup>
index 2fd61a0e5b00e676e834071efb478b938ed2cbc8..6f2c1c1662e642baa8fc129c6d7f74d5d956c4f4 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.exportEmailAddress'}
 
 <script type="text/javascript">
        //<![CDATA[
index f2e54996d6f1ebeecceefa394475f1f9d8b15ab2..8d2b6481c9945891d1b96dc5c5a1f8fc581fbc5a 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.group.'|concat:$action}
 
 <script type="text/javascript">
        //<![CDATA[
index f5410c7c71cdd668da9b471ffde7e78e28604213..695d95a8c381f97c958abde25dd8e527f77c3d3d 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.group.list'}
 
 <script type="text/javascript">
        //<![CDATA[
index 8f827e9ab60975e1c145588bb9153c7faa621737..1dcad6953cbbfc089405fd05ca66cc946efc5eea 100644 (file)
@@ -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>
 
index bc92fd8ac8f1d068658358a3a479988f2b75d6a8..605f575f2559778ef502e4c58461b609890706bc 100644 (file)
@@ -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}
 
 <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>
 
index b2ada61065162de48aa337db93d39ce42ca47a51..2b11a8b933b511e3405cd2396b2467a526ed93dc 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.search'}
 
 <script type="text/javascript">
        //<![CDATA[
index 3d1c6ba31299fb7c00ece68541ee65dfba027f4d..3b119d50eb20353f4ef1b286c592b77f06614903 100644 (file)
@@ -1,4 +1,4 @@
-{include file='header'}
+{include file='header' pageTitle='wcf.acp.user.massProcessing'}
 
 <script type="text/javascript">
        //<![CDATA[
index 714518ba73a42acf3944e2160d04e55801d9c27a..b3d4dd577cf6e91b89c515ad678b025b178dd07d 100644 (file)
@@ -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>
index 22d31dd27e2b221921a570dfd9e901e53d5f85e6..dc309dd8290bd524889a80f1ad32e1c644c96ea2 100644 (file)
@@ -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>