From: Marcel Werk Date: Thu, 28 Apr 2022 13:28:22 +0000 (+0200) Subject: Made use of content interaction dropdown in user profiles X-Git-Tag: 5.5.0_Alpha_5~2^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=859f6f9ff54c801cd2e2999a193a13abab8b1483;p=GitHub%2FWoltLab%2FWCF.git Made use of content interaction dropdown in user profiles --- diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl index a05569881a..0f0c0416b7 100644 --- a/com.woltlab.wcf/templates/user.tpl +++ b/com.woltlab.wcf/templates/user.tpl @@ -264,27 +264,6 @@ {/hascontent} - {hascontent} -
  • - - -
    • - {/hascontent} - {hascontent}
  • @@ -318,12 +297,25 @@ {event name='contentHeaderNavigation'} - {/capture} {include file='userSidebar' assign='sidebarRight'} +{capture assign='contentInteractionDropdownItems'} + {event name='menuInteraction'} + + {if $user->userID != $__wcf->user->userID} + {if $user->isAccessible('canViewEmailAddress') || $__wcf->session->getPermission('admin.user.canEditMailAddress')} +
  • {lang}wcf.user.button.mail{/lang}
    • + {/if} + {/if} + + {if $user->userID != $__wcf->user->userID && $__wcf->session->getPermission('user.profile.canReportContent')} +
  • {lang}wcf.user.profile.report{/lang}
    • + {/if} +{/capture} + {include file='header'} {if !$user->isProtected()} diff --git a/ts/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract.ts b/ts/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract.ts index d25574af91..275750ccd2 100644 --- a/ts/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract.ts +++ b/ts/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract.ts @@ -37,7 +37,7 @@ abstract class UiUserProfileMenuItemAbstract implements AjaxCallbackObject { this._button.addEventListener("click", (ev) => this._toggle(ev)); this._listItem.appendChild(this._button); - const menu = document.querySelector(`.userProfileButtonMenu[data-menu="interaction"]`) as HTMLElement; + const menu = document.querySelector(".contentInteractionDropdownItems") as HTMLElement; menu.insertAdjacentElement("afterbegin", this._listItem); } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract.js index 44c47f6ac5..7bcf26c1e1 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract.js @@ -30,7 +30,7 @@ define(["require", "exports", "tslib", "../../../../../Ajax", "../../../../../Co this._button.href = "#"; this._button.addEventListener("click", (ev) => this._toggle(ev)); this._listItem.appendChild(this._button); - const menu = document.querySelector(`.userProfileButtonMenu[data-menu="interaction"]`); + const menu = document.querySelector(".contentInteractionDropdownItems"); menu.insertAdjacentElement("afterbegin", this._listItem); } /** diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index a9c99744db..c1d0047507 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -5474,7 +5474,6 @@ Benachrichtigungen auf {PAGE_TITLE|phra {$commentAuthor->username} an der Pinnwand von {$user->username} geantwortet.]]> - username}]]> @@ -5608,5 +5607,6 @@ Benachrichtigungen auf {PAGE_TITLE|phra + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index ee52c36ebf..61abe81ae7 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -5476,7 +5476,6 @@ your notifications on {PAGE_TITLE|phras {$commentAuthor->username} on {$user->username}’s wall.]]> - username}]]> @@ -5610,5 +5609,6 @@ your notifications on {PAGE_TITLE|phras +