Merge branch '5.2' into 5.3

[GitHub/WoltLab/WCF.git] / wcfsetup / install / files / acp / templates / userList.tpl

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index ed812f2703973bbce2246fda3ab8e13d33c73332..c9836f053c8529a5dc2d22885fd967e0078a1918 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -23,17 +23,17 @@
                new WCF.Table.EmptyTableHandler($('#userTableContainer'), 'jsUserRow', options);
                
                WCF.Language.addObject({
-                       'wcf.acp.user.banReason': '{lang}wcf.acp.user.banReason{/lang}',
-                       'wcf.acp.user.banReason.description': '{lang}wcf.acp.user.banReason.description{/lang}',
-                       'wcf.acp.user.ban.sure': '{lang}wcf.acp.user.ban.sure{/lang}',
-                       'wcf.acp.user.ban.expires': '{lang}wcf.acp.user.ban.expires{/lang}',
-                       'wcf.acp.user.ban.expires.description': '{lang}wcf.acp.user.ban.expires.description{/lang}',
-                       'wcf.acp.user.ban.neverExpires': '{lang}wcf.acp.user.ban.neverExpires{/lang}',
-                       'wcf.acp.user.sendNewPassword.workerTitle': '{lang}wcf.acp.user.sendNewPassword.workerTitle{/lang}',
-                       'wcf.acp.worker.abort.confirmMessage': '{lang}wcf.acp.worker.abort.confirmMessage{/lang}',
-                       'wcf.acp.content.removeContent': '{lang}wcf.acp.content.removeContent{/lang}',
-                       'wcf.user.status.banned': '{lang}wcf.user.status.banned{/lang}',
-                       'wcf.user.status.isDisabled': '{lang}wcf.user.status.isDisabled{/lang}'
+                       'wcf.acp.user.banReason': '{jslang}wcf.acp.user.banReason{/jslang}',
+                       'wcf.acp.user.banReason.description': '{jslang}wcf.acp.user.banReason.description{/jslang}',
+                       'wcf.acp.user.ban.sure': '{jslang}wcf.acp.user.ban.sure{/jslang}',
+                       'wcf.acp.user.ban.expires': '{jslang}wcf.acp.user.ban.expires{/jslang}',
+                       'wcf.acp.user.ban.expires.description': '{jslang}wcf.acp.user.ban.expires.description{/jslang}',
+                       'wcf.acp.user.ban.neverExpires': '{jslang}wcf.acp.user.ban.neverExpires{/jslang}',
+                       'wcf.acp.user.sendNewPassword.workerTitle': '{jslang}wcf.acp.user.sendNewPassword.workerTitle{/jslang}',
+                       'wcf.acp.worker.abort.confirmMessage': '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}',
+                       'wcf.acp.content.removeContent': '{jslang}wcf.acp.content.removeContent{/jslang}',
+                       'wcf.user.status.banned': '{jslang}wcf.user.status.banned{/jslang}',
+                       'wcf.user.status.isDisabled': '{jslang}wcf.user.status.isDisabled{/jslang}'
                });
                WCF.ACP.User.BanHandler.init();
                
@@ -47,7 +47,7 @@
                
                require(['Language', 'WoltLabSuite/Core/Acp/Ui/User/Editor'], function (Language, AcpUiUserList) {
                        Language.addObject({
-                               'wcf.acp.user.action.sendNewPassword.confirmMessage': '{lang}wcf.acp.user.action.sendNewPassword.confirmMessage{/lang}'
+                               'wcf.acp.user.action.sendNewPassword.confirmMessage': '{jslang}wcf.acp.user.action.sendNewPassword.confirmMessage{/jslang}'
                        });
                        
                        AcpUiUserList.init();
@@ -107,7 +107,7 @@
                        
                        <tbody>
                                {foreach from=$users item=user}
-                                       <tr class="jsUserRow jsClipboardObject" data-object-id="{@$user->userID}" data-banned="{if $user->banned}true{else}false{/if}" data-enabled="{if !$user->activationCode}true{else}false{/if}">
+                                       <tr class="jsUserRow jsClipboardObject" data-object-id="{@$user->userID}" data-banned="{if $user->banned}true{else}false{/if}" data-enabled="{if !$user->activationCode}true{else}false{/if}" data-email-confirmed="{if $user->isEmailConfirmed()}true{else}false{/if}">
                                                <td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$user->userID}"></td>
                                                <td class="columnIcon">
                                                        <div class="dropdown" id="userListDropdown{@$user->userID}">
@@ -117,6 +117,10 @@
                                                                        {event name='dropdownItems'}
                                                                        
                                                                        {if $user->userID !== $__wcf->user->userID}
+                                                                               {if $user->accessible && $__wcf->session->getPermission('admin.user.canEnableUser')}
+                                                                                       <li><a href="#" class="jsConfirmEmailToggle" data-confirm-email-message="{lang}wcf.acp.user.action.confirmEmail{/lang}" data-unconfirm-email-message="{lang}wcf.acp.user.action.unconfirmEmail{/lang}">{lang}wcf.acp.user.action.{if $user->isEmailConfirmed()}un{/if}confirmEmail{/lang}</a></li>
+                                                                               {/if}
+                                                                               
                                                                                {if $__wcf->session->getPermission('admin.user.canMailUser')}
                                                                                        <li><a href="{link controller='UserMail' id=$user->userID}{/link}">{lang}wcf.acp.user.action.sendMail{/lang}</a></li>
                                                                                {/if}