Cleaned up the user menu, extra profile link

diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index 10ffe02fac2a521afc3600a52493334328c11b14..7a7f72cfb20429019bf9231a434325aa98514c78 100644 (file)
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -27,7 +27,7 @@
                                                <div class="userMenuTitle">{lang}wcf.user.controlPanel{/lang}</div>
                                        </div>
                                        <div class="userMenuContent">
-                                               <div class="userMenuItem">
+                                               <div class="userMenuItem{if !MODULE_USER_RANK} userMenuItemSingleLine{/if}">
                                                        <div class="userMenuItemImage">
                                                                {@$__wcf->getUserProfileHandler()->getUserProfile()->getAvatar()->getImageTag(48)}
                                                        </div>
@@ -35,24 +35,30 @@
                                                                {* This is the unformatted username, custom styles might not work nicely here and
                                                                   the consistent styling is used to provide visual anchors to identify links. *}
                                                                <a href="{$__wcf->user->getLink()}" class="userMenuItemLink">{$__wcf->user->username}</a>
-                                                               
-                                                               {if MODULE_USER_RANK}
-                                                                       {if $__wcf->getUserProfileHandler()->getUserTitle()}
-                                                                               <span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {@$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span>
-                                                                       {/if}
-                                                                       {if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->rankImage}
-                                                                               <span class="userRankImage">{@$__wcf->getUserProfileHandler()->getRank()->getImage()}</span>
-                                                                       {/if}
-                                                               {/if}
                                                        </div>
+                                                       {if MODULE_USER_RANK}
                                                        <div class="userMenuItemMeta">
-                                                               {lang}wcf.user.myProfile{/lang}
+                                                               {if $__wcf->getUserProfileHandler()->getUserTitle()}
+                                                                       <span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {@$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span>
+                                                               {/if}
+                                                               {if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->rankImage}
+                                                                       <span class="userRankImage">{@$__wcf->getUserProfileHandler()->getRank()->getImage()}</span>
+                                                               {/if}
                                                        </div>
+                                                       {/if}
                                                </div>
                                        </div>
                                        <div class="userMenuContentDivider"></div>
-                                       {if $__wcf->session->getPermission('admin.general.canUseAcp')}
                                        <div class="userMenuContent">
+                                               <div class="userMenuItem userMenuItemNarrow userMenuItemSingleLine">
+                                                       <div class="userMenuItemImage">
+                                                               <span class="icon icon32 fa-user-circle-o"></span>
+                                                       </div>
+                                                       <div class="userMenuItemContent">
+                                                               <a href="{$__wcf->user->getLink()}" class="userMenuItemLink">{lang}wcf.user.myProfile{/lang}</a>
+                                                       </div>
+                                               </div>
+                                               {if $__wcf->session->getPermission('admin.general.canUseAcp')}
                                                <div class="userMenuItem userMenuItemNarrow userMenuItemSingleLine">
                                                        <div class="userMenuItemImage">
                                                                <span class="icon icon32 fa-wrench"></span>
@@ -61,12 +67,12 @@
                                                                <a href="{link isACP=true}{/link}" class="userMenuItemLink">{lang}wcf.global.acp{/lang}</a>
                                                        </div>
                                                </div>
+                                               {/if}
                                        </div>
                                        <div class="userMenuContentDivider"></div>
-                                       {/if}
                                        <div class="userMenuContent userMenuContentScrollable">
                                                {foreach from=$__wcf->getUserMenu()->getUserMenuItems() item=menuItem}
-                                               <div class="userMenuItem userMenuItemNarrow" data-category="{$menuItem[category]->menuItem}">
+                                               <div class="userMenuItem userMenuItemNarrow userMenuItemSingleLine" data-category="{$menuItem[category]->menuItem}">
                                                        <div class="userMenuItemImage">
                                                                <span class="icon icon32 {$menuItem[category]->getIconClassName()}"></span>
                                                        </div>
@@ -75,9 +81,6 @@
                                                                        {$menuItem[category]->getTitle()}
                                                                </a>
                                                        </div>
-                                                       <div class="userMenuItemMeta">
-                                                               {implode from=$menuItem[items] item=title glue=' · '}{$title}{/implode}
-                                                       </div>
                                                </div>
                                                {/foreach}
                                        </div>

diff --git a/wcfsetup/install/files/style/ui/userMenu.scss b/wcfsetup/install/files/style/ui/userMenu.scss
index 606ed69ffa9c097b6f3df5cd6f64169c3c50547a..68ea8c4086d3f2aec85eea3a5a4dec74f87645df 100644 (file)
--- a/wcfsetup/install/files/style/ui/userMenu.scss
+++ b/wcfsetup/install/files/style/ui/userMenu.scss
@@ -258,6 +258,7 @@ body:not(.touch) .userMenuItemMarkAsRead {
 .userMenuFooter {
        border-top: 1px solid var(--border-color);
        padding: 10px;
+       position: relative;
        text-align: center;
 }
 
@@ -268,6 +269,15 @@ body:not(.touch) .userMenuItemMarkAsRead {
                color: inherit;
                text-decoration: underline;
        }
+
+       &::before {
+               bottom: 0;
+               content: "";
+               left: 0;
+               position: absolute;
+               right: 0;
+               top: 0;
+       }
 }
 
 .userMenuContent .ps-scrollbar-y-rail {

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index da104a911c4620ac5916cfebddfa25adca3287c0..ab3b2e37e7680c25af78407c55fe7acb3396f595 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4849,12 +4849,12 @@ sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}
                <item name="wcf.user.menu.community.notification"><![CDATA[Benachrichtigungen]]></item>
                <item name="wcf.user.menu.community.following"><![CDATA[Benutzer, denen ich folge]]></item>
                <item name="wcf.user.menu.community.ignoredUsers"><![CDATA[Blockierte Benutzer]]></item>
-               <item name="wcf.user.menu.profile"><![CDATA[Benutzerkonto]]></item>
+               <item name="wcf.user.menu.profile"><![CDATA[Benutzerkonto verwalten]]></item>
                <item name="wcf.user.menu.profile.accountManagement"><![CDATA[Verwaltung]]></item>
                <item name="wcf.user.menu.profile.security"><![CDATA[Sicherheit]]></item>
                <item name="wcf.user.menu.profile.avatar"><![CDATA[Avatar]]></item>
                <item name="wcf.user.menu.profile.signature"><![CDATA[Signatur]]></item>
-               <item name="wcf.user.menu.settings"><![CDATA[Einstellungen]]></item>
+               <item name="wcf.user.menu.settings"><![CDATA[Einstellungen und Privatsphäre]]></item>
                <item name="wcf.user.menu.settings.notification"><![CDATA[Benachrichtigungen]]></item>
                <item name="wcf.user.menu.settings.paidSubscription"><![CDATA[Bezahlte Mitgliedschaften]]></item>
        </category>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 9aa3cd0e62e4fc9fee8e83ad5ea0e8e45cb624f0..39cd03850f4484a813d664aa84d20baa7c0a3967 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4848,12 +4848,12 @@ not register with us.]]></item>
                <item name="wcf.user.menu.community.notification"><![CDATA[Notifications]]></item>
                <item name="wcf.user.menu.community.following"><![CDATA[Users I Follow]]></item>
                <item name="wcf.user.menu.community.ignoredUsers"><![CDATA[Blocked Users]]></item>
-               <item name="wcf.user.menu.profile"><![CDATA[User Account]]></item>
+               <item name="wcf.user.menu.profile"><![CDATA[Manage Your Account]]></item>
                <item name="wcf.user.menu.profile.accountManagement"><![CDATA[Account Management]]></item>
                <item name="wcf.user.menu.profile.security"><![CDATA[Security]]></item>
                <item name="wcf.user.menu.profile.avatar"><![CDATA[Avatar]]></item>
                <item name="wcf.user.menu.profile.signature"><![CDATA[Signature]]></item>
-               <item name="wcf.user.menu.settings"><![CDATA[Settings]]></item>
+               <item name="wcf.user.menu.settings"><![CDATA[Settings and Privacy]]></item>
                <item name="wcf.user.menu.settings.notification"><![CDATA[Notifications]]></item>
                <item name="wcf.user.menu.settings.paidSubscription"><![CDATA[Paid Subscriptions]]></item>
        </category>