harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix timeago on search items, and bring back app display for wall items - which took a bit of re-arranging of a lot of other stuff

Browse Source
This commit is contained in:
friendica 2013-05-09 22:04:30 -07:00
parent d75be6dbe6
commit e1c6b776c4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/main.js
View File

@ -353,7 +353,7 @@ function updateConvItems(mode,data) {
$(this).attr('src',$(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$('#' + prev).after($(this)); $('#' + prev).after($(this));
$("div.wall-item-ago").timeago(); $(".autotime").timeago();
// divgrow doesn't prevent itself from attaching a second (or 500th) // divgrow doesn't prevent itself from attaching a second (or 500th)
// "show more" div to a content region - it also has a few other // "show more" div to a content region - it also has a few other
// issues related to how we're trying to use it. // issues related to how we're trying to use it.
@ -365,7 +365,7 @@ function updateConvItems(mode,data) {
$(this).attr('src',$(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$('#' + ident).replaceWith($(this)); $('#' + ident).replaceWith($(this));
$("div.wall-item-ago").timeago(); $(".autotime").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 }); // $("div.wall-item-body").divgrow({ initialHeight: 400 });
} }
@ -382,7 +382,7 @@ function updateConvItems(mode,data) {
$(this).attr('src',$(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$('#threads-end').before($(this)); $('#threads-end').before($(this));
$("div.wall-item-ago").timeago(); $(".autotime").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 }); // $("div.wall-item-body").divgrow({ initialHeight: 400 });
} }
@ -391,7 +391,7 @@ function updateConvItems(mode,data) {
$(this).attr('src',$(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$('#' + ident).replaceWith($(this)); $('#' + ident).replaceWith($(this));
$("div.wall-item-ago").timeago(); $(".autotime").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 }); // $("div.wall-item-body").divgrow({ initialHeight: 400 });
} }
}); });
@ -410,7 +410,7 @@ function updateConvItems(mode,data) {
$(this).attr('src',$(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$('#' + prev).after($(this)); $('#' + prev).after($(this));
$("div.wall-item-ago").timeago(); $(".autotime").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 }); // $("div.wall-item-body").divgrow({ initialHeight: 400 });
} }
@ -893,7 +893,7 @@ jQuery.timeago.settings.strings = {
}; };
$("div.wall-item-ago").timeago(); $(".autotime").timeago();
//$("div.wall-item-body").divgrow({ initialHeight: 400 }); //$("div.wall-item-body").divgrow({ initialHeight: 400 });
//reCalcHeight(); //reCalcHeight();

2
view/tpl/conv_item.tpl
View File

@ -43,7 +43,7 @@
</div> </div>
<div class="wall-item-author"> <div class="wall-item-author">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br /> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.isotime}}">{{$item.localtime}}</div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>

2
view/tpl/search_item.tpl
View File

@ -30,7 +30,7 @@
<div class="wall-item-author"> <div class="wall-item-author">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago"><abbr class="wall-item-ago-time" title="{{$item.isotime}}">{{$item.localtime}}</abbr>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >