Added standalone button for "edit profile"

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index f4012acc3c5b51722330fe23435f42c368e0d40b..797fa312a47e1a32a5517e5683b1dfbf35695eed 100644 (file)
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -242,27 +242,20 @@
                                </dl>
                        </div>
                </div>
-               
-               <nav class="contentHeaderNavigation">
-                       <ul class="userProfileButtonContainer">
-                               {hascontent}
-                                       <li class="dropdown">
-                                               <a class="jsTooltip button dropdownToggle" title="{lang}wcf.user.profile.customization{/lang}"><span class="icon icon32 fa-pencil"></span> <span class="invisible">{lang}wcf.user.profile.customization{/lang}</span></a>
-                                               <ul class="dropdownMenu userProfileButtonMenu" data-menu="customization">
-                                                       {content}
-                                                               {event name='menuCustomization'}
-                                                               
-                                                               {if $user->canEdit() || ($__wcf->getUser()->userID == $user->userID && $user->canEditOwnProfile())}
-                                                                       <li><a href="#" class="jsButtonEditProfile">{lang}wcf.user.editProfile{/lang}</a></li>
-                                                               {/if}
-                                                       {/content}
-                                               </ul>
-                                       </li>
-                               {/hascontent}
-                               
-                               {event name='contentHeaderNavigation'}
-                       </ul>
-               </nav>
+
+               {hascontent}
+                       <nav class="contentHeaderNavigation">
+                               <ul class="userProfileButtonContainer">
+                                       {content}
+                                               {if $user->canEdit() || ($__wcf->getUser()->userID == $user->userID && $user->canEditOwnProfile())}
+                                                       <li><a href="#" class="jsButtonEditProfile button buttonPrimary"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.user.editProfile{/lang}</span></a></li>
+                                               {/if}
+                                               
+                                               {event name='contentHeaderNavigation'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
        </header>
 {/capture}
 
@@ -308,6 +301,7 @@
 {/capture}
 
 {capture assign='contentInteractionDropdownItems'}
+       {* DEPRECATED *}{event name='menuCustomization'}
        {event name='menuInteraction'}
                                                                
        {if $user->userID != $__wcf->user->userID}

diff --git a/wcfsetup/install/files/style/layout/print.scss b/wcfsetup/install/files/style/layout/print.scss
index 126d8a50618a56cf45768e89d776df67b7b77fac..6dfe73dc86ca8cf7d3f8441e13a82463805ea9f9 100644 (file)
--- a/wcfsetup/install/files/style/layout/print.scss
+++ b/wcfsetup/install/files/style/layout/print.scss
@@ -50,7 +50,6 @@
        
        /* user profile */
        .userProfileCoverPhoto,
-       .userProfileButtonContainer,
        .containerListButtonGroup {
                display: none !important;
        }

diff --git a/wcfsetup/install/files/style/ui/userProfile.scss b/wcfsetup/install/files/style/ui/userProfile.scss
index 15f79b2cbe17586ff09680519026612c4910c770..da21f3aac4abc4f63d4223daaaa0cde98df80dbe 100644 (file)
--- a/wcfsetup/install/files/style/ui/userProfile.scss
+++ b/wcfsetup/install/files/style/ui/userProfile.scss
@@ -15,16 +15,6 @@
                margin-top: 20px;
        }
 
-       @include screen-sm-md {
-               .contentHeaderNavigation {
-                       .button {
-                               .invisible {
-                                       display: inline;
-                               }
-                       }
-               }
-       }
-
        @include screen-sm-down {
                display: flex;
                flex-wrap: wrap;
@@ -73,25 +63,6 @@
                        flex-shrink: 0;
                        flex-basis: calc(100% - 58px);
                }
-
-               .contentHeaderNavigation {
-                       .userProfileButtonContainer {
-                               display: flex;
-
-                               > li {
-                                       flex: 1 1 auto;
-                                       margin-top: 0 !important;
-
-                                       &:not(:last-child) {
-                                               margin-right: 1px;
-                                       }
-
-                                       .invisible {
-                                               display: none !important;
-                                       }
-                               }
-                       }
-               }
        }
 
        @include screen-md-up {

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 9e2bac8d4f356cbc515dfea4322c7d4967b6499d..a58d759140c09ba69d197c4f2bbb52b10533bcca 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -5475,7 +5475,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
                <item name="wcf.user.profile.report"><![CDATA[Benutzerprofil melden]]></item>
                <item name="wcf.user.profile.protected"><![CDATA[Der Benutzer hat den Zugriff auf sein vollständiges Profil eingeschränkt.]]></item>
                <item name="wcf.user.profile.management"><![CDATA[Verwaltung]]></item>
-               <item name="wcf.user.profile.customization"><![CDATA[Anpassung]]></item>
                <item name="wcf.user.profile.title"><![CDATA[Benutzerprofil von {$user->username}]]></item>
        </category>
        <category name="wcf.user.objectWatch">
@@ -5608,5 +5607,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <item name="wcf.user.panel.markAllAsRead" />
        <item name="wcf.user.panel.markAsRead" />
        <item name="wcf.user.profile.user" />
+       <item name="wcf.user.profile.customization" />
 </delete>
 </language>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 70b21ad651df068889074908b23dda4e95a1e81d..c54ef23a30eee54c8dbf96cfa94c4f19fd146436 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -5477,7 +5477,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
                <item name="wcf.user.profile.report"><![CDATA[Report User Profile]]></item>
                <item name="wcf.user.profile.protected"><![CDATA[This member limits who may view their full profile.]]></item>
                <item name="wcf.user.profile.management"><![CDATA[Management]]></item>
-               <item name="wcf.user.profile.customization"><![CDATA[Customization]]></item>
                <item name="wcf.user.profile.title"><![CDATA[User profile of {$user->username}]]></item>
        </category>
        <category name="wcf.user.objectWatch">
@@ -5610,5 +5609,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
        <item name="wcf.user.panel.markAllAsRead" />
        <item name="wcf.user.panel.markAsRead" />
        <item name="wcf.user.profile.user" />
+       <item name="wcf.user.profile.customization" />
 </delete>
 </language>