mirror of
https://github.com/friendica/friendica
synced 2024-11-17 22:23:41 +00:00
add link to parent of comment
This commit is contained in:
parent
eb50618fe8
commit
268d441c48
3 changed files with 18 additions and 2 deletions
|
@ -164,7 +164,7 @@ class Post
|
|||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @throws \ImagickException
|
||||
*/
|
||||
public function getTemplateData(array $conv_responses, string $formSecurityToken, int $thread_level = 1)
|
||||
public function getTemplateData(array $conv_responses, string $formSecurityToken, int $thread_level = 1, string $parent_guid = "", string $parent_username = "")
|
||||
{
|
||||
$item = $this->getData();
|
||||
$edited = false;
|
||||
|
@ -497,6 +497,8 @@ class Post
|
|||
}
|
||||
|
||||
$tmp_item = [
|
||||
'parentguid' => $parent_guid,
|
||||
'isanswerto' => DI::l10n()->t('is answer to %s', $parent_username),
|
||||
'template' => $this->getTemplate(),
|
||||
'type' => implode('', array_slice(explode('/', $item['verb']), -1)),
|
||||
'comment_firstcollapsed' => false,
|
||||
|
@ -610,7 +612,7 @@ class Post
|
|||
$nb_children = count($children);
|
||||
if ($nb_children > 0) {
|
||||
foreach ($children as $child) {
|
||||
$result['children'][] = $child->getTemplateData($conv_responses, $formSecurityToken, $thread_level + 1);
|
||||
$result['children'][] = $child->getTemplateData($conv_responses, $formSecurityToken, $thread_level + 1, $tmp_item['guid'], $tmp_item['name']);
|
||||
}
|
||||
|
||||
// Collapse
|
||||
|
|
|
@ -184,6 +184,7 @@ $(document).ready(function () {
|
|||
if (typeof searchValue !== "undefined") {
|
||||
$("#nav-search-input-field").val(searchValue);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// move the "Save the search" button to the second navbar
|
||||
|
@ -941,4 +942,13 @@ function toggleDropdownText(elm) {
|
|||
function hasClass(elem, cls) {
|
||||
return (" " + elem.className + " ").indexOf(" " + cls + " ") > -1;
|
||||
}
|
||||
|
||||
// Go to parent for "is answer to <user>" link in comments below username
|
||||
function goToParentItem(plink, pguid) {
|
||||
history.pushState({},"",plink);
|
||||
var loc = plink.split("/");
|
||||
loc.pop();
|
||||
loc.push(pguid);
|
||||
location.href = loc.join("/");
|
||||
}
|
||||
// @license-end
|
||||
|
|
|
@ -214,6 +214,10 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
<span class="text-muted">
|
||||
</h5>
|
||||
<small>
|
||||
{{if !$item.parentguid==""}}
|
||||
<a id="btn-{{$item.id}}" class="time" href="javascript:;" onclick="goToParentItem('{{$item.plink.orig}}', '{{$item.parentguid}}');">{{$item.isanswerto}}</a>
|
||||
•
|
||||
{{/if}}
|
||||
<a href="{{$item.plink.orig}}">
|
||||
<time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
|
||||
</a>
|
||||
|
|
Loading…
Reference in a new issue