diff options
| author | Mario <mario@mariovavti.com> | 2019-05-05 14:14:07 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-05-05 14:14:07 +0200 |
| commit | b9c8b6ba235a7bbecfd63c04c376eef539a7b829 (patch) | |
| tree | 0a39e2ebcc093c9e0ede4c364384cb1d5e25949f /view/tpl | |
| parent | 2aa76d257ccd29144234408563c46d5af10a83c0 (diff) | |
| parent | 6cd968b53bc12ccc2125f062e42851bf1e501efe (diff) | |
| download | volse-hubzilla-b9c8b6ba235a7bbecfd63c04c376eef539a7b829.tar.gz volse-hubzilla-b9c8b6ba235a7bbecfd63c04c376eef539a7b829.tar.bz2 volse-hubzilla-b9c8b6ba235a7bbecfd63c04c376eef539a7b829.zip | |
Merge branch 'dev' into 'dev'
Add arrows to scroll between related comments
See merge request hubzilla/core!1629
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 5df706b20..86b84de14 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -1,12 +1,12 @@ {{if $item.comment_firstcollapsed}} -<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});"> +<div id="hide-comments-outer-{{$item.parent}}" class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});"> <span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span> <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> </div> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> {{/if}} <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}"> <a name="item_{{$item.id}}" ></a> - <div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > + <div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" data-mid="{{$item.mid}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}"> {{if $item.photo}} <div class="wall-photo-item{{if $item.is_new && !$item.title}} wall-item-head-new rounded-top{{/if}}" id="wall-photo-item-{{$item.id}}"> @@ -26,8 +26,11 @@ <hr class="m-0"> {{/if}} {{/if}} - <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment && !$item.photo}} wall-item-head-new rounded-top{{/if}}"> - <div class="wall-item-info " id="wall-item-info-{{$item.id}}" > + <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment && !$item.photo}} wall-item-head-new rounded-top{{/if}}" > + {{if $item.thr_parent}} + <a href="javascript:doscroll('{{$item.thr_parent}}',{{$item.parent}});" title="{{$item.reply_to.3}}"><i class="fa fa-angle-double-up float-right"></i></a> + {{/if}} + <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /> {{if $item.thread_author_menu}} @@ -36,7 +39,6 @@ {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> {{/foreach}} - </div> {{/if}} </div> @@ -103,7 +105,7 @@ </button> {{/if}} {{if $item.reply_to}} - <button type="button" title="{{$item.reply_to.0}}" class="btn btn-outline-secondary btn-sm" onclick="doreply({{$item.parent}},{{$item.id}},'{{$item.author_id}}', '{{$item.reply_to.2}} {{$item.name}}'); return false;"> + <button type="button" title="{{$item.reply_to.0}}" class="btn btn-outline-secondary btn-sm" onclick="doreply({{$item.parent}}, {{$item.id}}, '{{$item.author_id}}', '{{$item.reply_to.2}} {{$item.name}}'); return false;"> <i class="fa fa-reply" ></i> </button> {{/if}} diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index f7425ba98..0a9cf9519 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -33,6 +33,7 @@ 'name_empty' : "{{$name_empty}}", 'name_ok1' : "{{$name_ok1}}", 'name_ok2' : "{{$name_ok2}}", + 'to_reply' : "{{$to_reply}}", 'plural_func' : "{{$plural_func}}", |