From 1ccc393c72aeedb6ad868915dfe48a74269cc47d Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 21 Nov 2013 20:00:25 +0100
Subject: [PATCH] Improved ACP user panel

---
 .../install/files/acp/templates/header.tpl    | 43 ++++++++++++++++++-
 .../install/files/acp/templates/index.tpl     |  4 --
 wcfsetup/install/lang/de.xml                  |  7 ++-
 wcfsetup/install/lang/en.xml                  |  7 ++-
 4 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 0ea4489f79..3600ba8083 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -131,12 +131,53 @@
 								<a class="dropdownToggle framed" data-toggle="userMenu">{if PACKAGE_ID}{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(24)} {/if}{lang}wcf.user.userNote{/lang}</a>
 								<ul class="dropdownMenu">
 									{if PACKAGE_ID > 1}
-										<li><a href="{@$__wcf->getPageMenu()->getLandingPage()->getLink()}">{lang}wcf.global.toLandingPage{/lang}</a></li>
+										<li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}{/link}" class="box32">
+											<div class="framed">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</div>
+											
+											<div class="containerHeadline">
+												<h3>{$__wcf->user->username}</h3>
+												<small>{lang}wcf.user.myProfile{/lang}</small>
+											</div>
+										</a></li>
+										{if $__wcf->getUserProfileHandler()->canEditOwnProfile()}<li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}editOnInit=true#about{/link}">{lang}wcf.user.editProfile{/lang}</a></li>{/if}
+										<li><a href="{link controller='Settings' forceFrontend=true}{/link}">{lang}wcf.user.menu.settings{/lang}</a></li>
+										
+										{event name='userMenuItems'}
+										
 										<li class="dropdownDivider"></li>
 									{/if}
 									<li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
 								</ul>
 							</li>
+							
+							{if PACKAGE_ID > 1}
+								<li id="jumpToPage" class="dropdown">
+									<a class="dropdownToggle" data-toggle="jumpToPage"><span class="icon icon16 icon-home"></span> <span>{lang}wcf.global.jumpToPage{/lang}</span></a>
+									<ul class="dropdownMenu">
+										{foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
+											<li><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}</a></li>
+										{/foreach}
+									</ul>
+								</li>
+								
+								{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
+									<li>
+										<a href="{link controller='PackageUpdate'}{/link}"><span class="icon icon16 icon-refresh"></span> <span>{lang}wcf.acp.package.updates{/lang}</span> <span class="badge badgeInverse">{#$__wcf->getAvailableUpdates()|count}</span></a>
+									</li>
+								{/if}
+							{/if}
+														
+							<li id="woltlab" class="dropdown">
+								<a class="dropdownToggle" data-toggle="woltlab"><span class="icon icon16 icon-info-sign"></span> <span>WoltLab&reg;</span></a>
+								
+								<ul class="dropdownMenu">
+									<li><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={"http://www.woltlab.com"|rawurlencode}">{lang}wcf.acp.index.woltlab.website{/lang}</a></li>
+									<li><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={"http://www.woltlab.com/forum/"|rawurlencode}">{lang}wcf.acp.index.woltlab.forums{/lang}</a></li>
+									{* @todo<li><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={"http://www.woltlab.com"|rawurlencode}">{lang}wcf.acp.index.woltlab.tickets{/lang}</a></li>*}
+									<li><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={"http://www.woltlab.com/pluginstore/"|rawurlencode}">{lang}wcf.acp.index.woltlab.pluginStore{/lang}</a></li>
+								</ul>
+							</li>
+							
 							{event name='topMenu'}
 						</ul>
 						
diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index 406fbbd65a..cd7fe41e75 100644
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -16,10 +16,6 @@
 	<p style="background-color: rgb(255, 153, 153); border: 2px solid rgb(255, 0, 0); padding: 1em;">{lang}wcf.acp.index.inRescueMode{/lang}</p>
 {/if}
 
-{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
-	<p class="info">{lang}wcf.global.availableUpdates{/lang}</p>
-{/if}
-
 {if $usersAwaitingApproval}
 	<p class="info">{lang}wcf.acp.user.usersAwaitingApprovalInfo{/lang}</p>
 {/if}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 1a9d30b1b3..047e6333fa 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -396,6 +396,10 @@
 		<item name="wcf.acp.index.system.php"><![CDATA[PHP-Version]]></item>
 		<item name="wcf.acp.index.system.mySQLVersion"><![CDATA[MySQL-Version]]></item>
 		<item name="wcf.acp.index.system.load"><![CDATA[Aktueller UNIX Load]]></item>
+		<item name="wcf.acp.index.woltlab.website"><![CDATA[Website]]></item>
+		<item name="wcf.acp.index.woltlab.forums"><![CDATA[Supportforum]]></item>
+		<item name="wcf.acp.index.woltlab.tickets"><![CDATA[Ticket-Support]]></item>
+		<item name="wcf.acp.index.woltlab.pluginStore"><![CDATA[Plugin-Store]]></item>
 	</category>
 	
 	<category name="wcf.acp.label">
@@ -964,6 +968,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.package.search.error.noMatches"><![CDATA[Es wurden keine Pakete gefunden.]]></item>
 		<item name="wcf.acp.package.url"><![CDATA[Website]]></item>
 		<item name="wcf.acp.package.error.uploadFailed"><![CDATA[Das Hochladen der ausgewählten Datei ist fehlgeschlagen.]]></item>
+		<item name="wcf.acp.package.updates"><![CDATA[Aktualisierungen]]></item>
 	</category>
 	
 	<category name="wcf.acp.pageMenu">
@@ -1731,7 +1736,7 @@ Fehler sind beispielsweise:
 		<item name="wcf.global.subject"><![CDATA[Betreff]]></item>
 		<item name="wcf.global.thousandsSeparator"><![CDATA[.]]></item>
 		<item name="wcf.global.title"><![CDATA[Titel]]></item>
-		<item name="wcf.global.toLandingPage"><![CDATA[Zur Seite]]></item>
+		<item name="wcf.global.jumpToPage"><![CDATA[Zur Seite]]></item>
 		<item name="wcf.global.preview"><![CDATA[Vorschau]]></item>
 		<item name="wcf.global.multiSelect"><![CDATA[Mehrfache Markierungen sind durch zusätzliches Drücken der Taste „Strg/Ctrl“ (Windows) oder „Befehl/Command“ (Mac OS) möglich.]]></item>
 		<item name="wcf.global.page.jumpTo"><![CDATA[Gehe zu Seite]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 96d232e30c..02bd1e7f9e 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -395,6 +395,10 @@ Examples for medium ID detection:
 		<item name="wcf.acp.index.system.php"><![CDATA[PHP Version]]></item>
 		<item name="wcf.acp.index.system.mySQLVersion"><![CDATA[MySQL Version]]></item>
 		<item name="wcf.acp.index.system.load"><![CDATA[Current UNIX Load]]></item>
+		<item name="wcf.acp.index.woltlab.website"><![CDATA[Website]]></item>
+		<item name="wcf.acp.index.woltlab.forums"><![CDATA[Support Forums]]></item>
+		<item name="wcf.acp.index.woltlab.tickets"><![CDATA[Ticket Support]]></item>
+		<item name="wcf.acp.index.woltlab.pluginStore"><![CDATA[Plugin Store]]></item>
 	</category>
 	
 	<category name="wcf.acp.label">
@@ -964,6 +968,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.package.search.error.noMatches"><![CDATA[No packages matched your criteria.]]></item>
 		<item name="wcf.acp.package.url"><![CDATA[Website]]></item>
 		<item name="wcf.acp.package.error.uploadFailed"><![CDATA[Uploading of specified file has failed.]]></item>
+		<item name="wcf.acp.package.updates"><![CDATA[Updates]]></item>
 	</category>
 	
 	<category name="wcf.acp.pageMenu">
@@ -1730,7 +1735,7 @@ Errors are:
 		<item name="wcf.global.subject"><![CDATA[Subject]]></item>
 		<item name="wcf.global.thousandsSeparator"><![CDATA[,]]></item>
 		<item name="wcf.global.title"><![CDATA[Title]]></item>
-		<item name="wcf.global.toLandingPage"><![CDATA[To Front Page]]></item>
+		<item name="wcf.global.jumpToPage"><![CDATA[To Front Page]]></item>
 		<item name="wcf.global.preview"><![CDATA[Preview]]></item>
 		<item name="wcf.global.multiSelect"><![CDATA[Multiple items can be selected by holding the “Ctrl/Shift” key (Windows) or “Command” (Mac OS) key and clicking on the desired items.]]></item>
 		<item name="wcf.global.page.jumpTo"><![CDATA[Go to Page]]></item>
-- 
2.20.1