wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blocks you tooltip

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-02-02 16:25:07 +01:00
parent 949162b258
commit 8abbdeb3c0
29 changed files with 84 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
QvitterPlugin.php
View File

@ -773,9 +773,13 @@ class QvitterPlugin extends Plugin {
$twitter_user['profile_background_color'] = Profile_prefs::getConfigData($profile, 'theme', 'backgroundcolor'); $twitter_user['profile_background_color'] = Profile_prefs::getConfigData($profile, 'theme', 'backgroundcolor');
$twitter_user['profile_banner_url'] = Profile_prefs::getConfigData($profile, 'qvitter', 'cover_photo'); $twitter_user['profile_banner_url'] = Profile_prefs::getConfigData($profile, 'qvitter', 'cover_photo');
// follows me?
if ($scoped) { if ($scoped) {
// follows me?
$twitter_user['follows_you'] = $profile->isSubscribed($scoped); $twitter_user['follows_you'] = $profile->isSubscribed($scoped);
// blocks me?
$twitter_user['blocks_you'] = $profile->hasBlocked($scoped);
} }
// local user? // local user?

9
css/qvitter.css
View File

@ -4335,6 +4335,15 @@ button.shorten:not(.disabled):active {
display:none; display:none;
} }
.user-actions .blocks-you::before {
content:"\f05e";
color: #aaa;
cursor:default;
font-family: FontAwesome;
font-size: 20px;
line-height: 32px;
margin-right: 5px;
}

7
js/dom-functions.js
View File

@ -311,6 +311,12 @@ function buildFollowBlockbutton(obj) {
if(typeof window.loggedIn.screen_name != 'undefined' // if logged in if(typeof window.loggedIn.screen_name != 'undefined' // if logged in
&& window.loggedIn.id != obj.id) { // not if this is me && window.loggedIn.id != obj.id) { // not if this is me
if(!(obj.statusnet_profile_url.indexOf('/twitter.com/')>-1 && obj.following === false)) { // only unfollow twitter users if(!(obj.statusnet_profile_url.indexOf('/twitter.com/')>-1 && obj.following === false)) { // only unfollow twitter users
if(obj.blocks_you) {
var followButton = '<div class="user-actions">\
<div class="blocks-you" data-tooltip="' + window.sL.tooltipBlocksYou.replace('{username}','@' + obj.screen_name) + '"></div>\
</div>';
}
else {
var followButton = '<div class="user-actions">\ var followButton = '<div class="user-actions">\
<button data-follow-user-id="' + obj.id + '" data-follow-user="' + obj.statusnet_profile_url + '" type="button" class="qvitter-follow-button' + followingClass + blockingClass + '">\ <button data-follow-user-id="' + obj.id + '" data-follow-user="' + obj.statusnet_profile_url + '" type="button" class="qvitter-follow-button' + followingClass + blockingClass + '">\
<span class="button-text follow-text"><i class="follow"></i>' + window.sL.userFollow + '</span>\ <span class="button-text follow-text"><i class="follow"></i>' + window.sL.userFollow + '</span>\
@ -322,6 +328,7 @@ function buildFollowBlockbutton(obj) {
</div>'; </div>';
} }
} }
}
return followButton; return followButton;
} }

3
locale/ar.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/ast.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/ca.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/de.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/en.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/eo.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/es.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/es_ahorita.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/eu.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/fa.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/fi.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/fr.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/gl.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/he.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/io.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/it.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/ja.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/nl.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/no.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/pt.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/pt_br.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/ru.json
View File

@ -167,5 +167,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/sq.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/sv.json
View File

@ -169,5 +169,6 @@
"buttonUnblock":"Avblockera", "buttonUnblock":"Avblockera",
"failedBlockingUser":"Misslyckades med att blockera användaren.", "failedBlockingUser":"Misslyckades med att blockera användaren.",
"failedUnblockingUser":"Misslyckades med att avblockera användaren.", "failedUnblockingUser":"Misslyckades med att avblockera användaren.",
"unblockUser": "Avblockera {username}" "unblockUser": "Avblockera {username}",
"tooltipBlocksYou":"Du är blockerad från att följa {username}."
} }

3
locale/zh_cn.json
View File

@ -168,5 +168,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }

3
locale/zh_tw.json
View File

@ -168,5 +168,6 @@
"buttonUnblock":"Unblock", "buttonUnblock":"Unblock",
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}" "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}."
} }