Remove 'block' button from 'userInformationButtons'

It still uses the legacy jQuery based JavaScript which does not work well with
the new `type` parameter. Additionally it distracts from more useful buttons.
It's not like users are going to ignore other users en masse.

diff --git a/com.woltlab.wcf/templates/groupedUserList.tpl b/com.woltlab.wcf/templates/groupedUserList.tpl
index 89c21e99415f998f90605e2c7ac83da42c2e4ad5..284fbf83558f026c19fe81f9b1b96c14cbc47a69 100644 (file)
--- a/com.woltlab.wcf/templates/groupedUserList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserList.tpl
@@ -25,12 +25,9 @@
                $(function() {
                        WCF.Language.addObject({
                                'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-                               'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
                                'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-                               'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
                        });
                        
                        new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
-                       new WCF.User.Action.Ignore($('.jsGroupedUserList > li'));
                });
 </script>

diff --git a/com.woltlab.wcf/templates/groupedUserReactionList.tpl b/com.woltlab.wcf/templates/groupedUserReactionList.tpl
index e55095362c425c28bc5cefa767ee5ae23cf8aadd..315123e10ec62b001d9ea4c689e45e518cb15818 100644 (file)
--- a/com.woltlab.wcf/templates/groupedUserReactionList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserReactionList.tpl
@@ -25,12 +25,9 @@
                $(function() {
                        WCF.Language.addObject({
                                'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-                               'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
                                'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-                               'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
                        });
                        
                        new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
-                       new WCF.User.Action.Ignore($('.jsGroupedUserList > li'));
                });
 </script>

diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index 2ef674f4b5a750841eddfcb6e420021b44c6feef..3465f5634cfc8681030256b56be5e02d2f45819f 100644 (file)
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -134,13 +134,10 @@
        $(function() {
                WCF.Language.addObject({
                        'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-                       'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
                        'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-                       'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
                });
                
                new WCF.User.Action.Follow($('.userList > li'));
-               new WCF.User.Action.Ignore($('.userList > li'));
        });
        
        require(['WoltLabSuite/Core/Ui/User/Search/Input'], (UiUserSearchInput) => {

diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl
index e8b47c96de10cf17f98eb9b2c6bc866291606a51..2bef480345f7dc3b05bcbf033ba4d7ed0c9975da 100644 (file)
--- a/com.woltlab.wcf/templates/team.tpl
+++ b/com.woltlab.wcf/templates/team.tpl
@@ -29,13 +29,10 @@
        $(function() {
                WCF.Language.addObject({
                        'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-                       'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
                        'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-                       'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
                });
                
                new WCF.User.Action.Follow($('.userList > li'));
-               new WCF.User.Action.Ignore($('.userList > li'));
        });
 </script>
 

diff --git a/com.woltlab.wcf/templates/userBirthdayList.tpl b/com.woltlab.wcf/templates/userBirthdayList.tpl
index 6951a1b657b55d2ade5d183746d81bfcdff24cbc..dc042f6fe3edaa488cc56a236a419883b6d1ce37 100644 (file)
--- a/com.woltlab.wcf/templates/userBirthdayList.tpl
+++ b/com.woltlab.wcf/templates/userBirthdayList.tpl
@@ -40,12 +40,9 @@
        $(function() {
                WCF.Language.addObject({
                        'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-                       'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
                        'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-                       'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
                });
                
                new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
-               new WCF.User.Action.Ignore($('.jsGroupedUserList > li'));
        });
 </script>

diff --git a/com.woltlab.wcf/templates/userInformationButtons.tpl b/com.woltlab.wcf/templates/userInformationButtons.tpl
index 066564ce60602b13852914283dd8e130ce97a58f..63bdbfd20585c61f6365d0b022d5e1d47a3a9819 100644 (file)
--- a/com.woltlab.wcf/templates/userInformationButtons.tpl
+++ b/com.woltlab.wcf/templates/userInformationButtons.tpl
@@ -20,12 +20,6 @@
                                                        <li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}"><span class="icon icon16 fa-plus"></span> <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
                                                {/if}
                                        {/if}
-                                       
-                                       {if $__wcf->getUserProfileHandler()->isIgnoredUser($user->userID)}
-                                               <li class="jsOnly"><a href="#" data-ignored="1" data-object-id="{@$user->userID}" class="jsIgnoreButton jsTooltip" title="{lang}wcf.user.button.unignore{/lang}"><span class="icon icon16 fa-circle-o"></span> <span class="invisible">{lang}wcf.user.button.unignore{/lang}</span></a></li>
-                                       {else}
-                                               <li class="jsOnly"><a href="#" data-ignored="0" data-object-id="{@$user->userID}" class="jsIgnoreButton jsTooltip" title="{lang}wcf.user.button.ignore{/lang}"><span class="icon icon16 fa-ban"></span> <span class="invisible">{lang}wcf.user.button.ignore{/lang}</span></a></li>
-                                       {/if}
                                {/if}
                                
                                {event name='buttons'}

diff --git a/com.woltlab.wcf/templates/userProfilePreview.tpl b/com.woltlab.wcf/templates/userProfilePreview.tpl
index 217ac915dfe102cf9185440d1cfc5818851e559c..f34f805f074689e0fd691dbf116b76c5de917610 100644 (file)
--- a/com.woltlab.wcf/templates/userProfilePreview.tpl
+++ b/com.woltlab.wcf/templates/userProfilePreview.tpl
@@ -52,16 +52,10 @@
                                $(function() {
                                        WCF.Language.addObject({
                                                'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-                                               'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
                                                'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-                                               'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
                                        });
                                        
                                        new WCF.User.Action.Follow($('.userInformation'));
-                                       
-                                       {if !$user->getPermission('user.profile.cannotBeIgnored')}
-                                               new WCF.User.Action.Ignore($('.userInformation'));
-                                       {/if}
                                });
                        </script>
                {/if}

diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 943e39f42a31aa2837299cbd25c7072fa21127a9..06cde2e02080891892c4d4dbef91326c42afb458 100644 (file)
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -228,13 +228,10 @@
        $(function() {
                WCF.Language.addObject({
                        'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-                       'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
                        'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-                       'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
                });
                
                new WCF.User.Action.Follow($('.userList > li'));
-               new WCF.User.Action.Ignore($('.userList > li'));
        });
 </script>