twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-03-13 05:51:03 +00:00
Code Issues Projects Releases Wiki Activity

quibbling to Erkan's latest activity

Browse Source
This commit is contained in:
Simon Grim 2016-09-27 04:04:35 +05:00
parent c5e8c650f4
commit 8662401d0d
5 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/style.css
View File

@ -891,19 +891,19 @@ textarea.splited-post {
} }
.followers, .followers,
.last-activity .latest-activity {
{
font-size: 12px; font-size: 12px;
color: rgba( 0, 0, 0, .6 ); color: rgba( 0, 0, 0, .6 );
margin-left: 58px; margin-left: 58px;
} }
.followed-by, .followed-by,
.user-status-time .latest-activity .time {
{
color: #e34f42; color: #e34f42;
font-size: 13px; font-size: 13px;
cursor: pointer; cursor: pointer;
} }
.twister-user-name, .twister-user-name,
.twister-by-user-name .twister-by-user-name
{ {
@ -2389,12 +2389,13 @@ ol.toptrends-list {
right: 32px; right: 32px;
} }
.following-own-modal .following-list .last-activity { .following-own-modal .following-list .latest-activity {
position: absolute; position: absolute;
top: 110px; top: 110px;
right: 32px; right: 32px;
margin: 0; margin: 0;
} }
/************************************* /*************************************
*********** AUTOCOMPLETING *********** *********** AUTOCOMPLETING ***********
**************************************/ **************************************/

12
home.html
View File

@ -302,9 +302,9 @@
</a> </a>
</div> </div>
<a class="twister-user-remove">&times;</a> <a class="twister-user-remove">&times;</a>
<div class="last-activity"> <div class="latest-activity" data-screen-name="" data-id="" data-time="0">
<span class="label">Last activity</span> <span class="label">Last activity</span>
<span class="user-status-time" data-time="0" data-screen-name="" data-id=""></span> <span class="time"></span>
</div> </div>
<button class="follow">Follow</button> <button class="follow">Follow</button>
</div> </div>
@ -780,11 +780,9 @@
<div> <div>
<span class="swarm-status" style="display: none;"></span> <span class="swarm-status" style="display: none;"></span>
</div> </div>
<div> <div class="latest-activity" data-screen-name="" data-id="" data-time="0">
<span class="last-activity"> <span class="label">Last activity</span>
<span class="label">Last activity</span> <span class="time"></span>
<span class="user-status-time" data-time="0" data-screen-name="" data-id=""></span>
</span>
</div> </div>
</div> </div>
</li> </li>

7
js/interface_common.js
View File

@ -711,7 +711,7 @@ function addPeerToFollowingList(list, peerAlias) {
.on('mouseup', {route: $.MAL.mentionsUrl(peerAlias)}, routeOnClick); .on('mouseup', {route: $.MAL.mentionsUrl(peerAlias)}, routeOnClick);
getAvatar(peerAlias, item.find('.mini-profile-photo')); getAvatar(peerAlias, item.find('.mini-profile-photo'));
getFullname(peerAlias, item.find('.mini-profile-name')); getFullname(peerAlias, item.find('.mini-profile-name'));
getStatusTime(peerAlias, item.find('.user-status-time')); getStatusTime(peerAlias, item.find('.latest-activity .time'));
if (peerAlias === defaultScreenName) if (peerAlias === defaultScreenName)
item.find('.following-config').hide(); item.find('.following-config').hide();
@ -752,7 +752,7 @@ function fillWhoToFollowModal(list, hlist, start) {
getFullname(utf, item.find('.twister-user-full')); getFullname(utf, item.find('.twister-user-full'));
getBioToElem(utf, item.find('.bio')); getBioToElem(utf, item.find('.bio'));
getFullname(followingUsers[i], item.find('.followed-by').text(followingUsers[i])); getFullname(followingUsers[i], item.find('.followed-by').text(followingUsers[i]));
getStatusTime(utf,item.find('.user-status-time')); getStatusTime(utf, item.find('.latest-activity .time'));
item.find('.twister-user-remove').remove(); item.find('.twister-user-remove').remove();
@ -2623,7 +2623,8 @@ function initInterfaceCommon() {
displayQueryPending($('.hashtag-modal .postboard-posts')); displayQueryPending($('.hashtag-modal .postboard-posts'));
}); });
$('.user-status-time').on('mouseup', {feeder: '.user-status-time'}, handleClickOpenConversation); getElem('.latest-activity', true).on('mouseup',
{feeder: '.latest-activity'}, handleClickOpenConversation);
replaceDashboards(); replaceDashboards();
$(window).resize(replaceDashboards); $(window).resize(replaceDashboards);

2
js/twister_following.js
View File

@ -515,7 +515,7 @@ function processWhoToFollowSuggestion(suggestion, followedBy) {
getAvatar(suggestion, item.find('.twister-user-photo')); getAvatar(suggestion, item.find('.twister-user-photo'));
getFullname(followedBy, item.find('.followed-by').text(followedBy)); getFullname(followedBy, item.find('.followed-by').text(followedBy));
getStatusTime(suggestion,item.find('.user-status-time')); getStatusTime(suggestion, item.find('.latest-activity .time'));
item.find('.twister-user-remove').on('click', function() { item.find('.twister-user-remove').on('click', function() {
item.remove(); item.remove();

23
js/twister_io.js
View File

@ -524,19 +524,16 @@ function getPostsCount(peerAlias, elem) {
function getStatusTime(peerAlias, elem) { function getStatusTime(peerAlias, elem) {
dhtget(peerAlias, 'status', 's', dhtget(peerAlias, 'status', 's',
function(req, v) { function (req, ret) {
var time = 0; if (!ret || !ret.userpost)
var k = -1; return;
if (v && v.userpost) {
time = v.userpost.time; req.elem.text(timeGmtToText(ret.userpost.time))
k = v.userpost.k; .closest('.latest-activity')
} .attr('data-screen-name', req.peerAlias)
elem.text(timeGmtToText(time)); .attr('data-id', ret.userpost.k)
elem.attr('data-time', time); .attr('data-time', ret.userpost.time)
if (k > -1) { ;
elem.attr('data-screen-name', peerAlias);
elem.attr('data-id', k);
}
}, {peerAlias: peerAlias, elem: elem} }, {peerAlias: peerAlias, elem: elem}
); );
} }