Normalize item comment template variable name

This commit is contained in:
Hypolite Petovan 2020-09-13 19:43:42 -04:00
parent 65b796ed1f
commit 8d5eb61ea3
10 changed files with 41 additions and 41 deletions

View file

@ -628,7 +628,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'vote' => $likebuttons, 'vote' => $likebuttons,
'like' => '', 'like' => '',
'dislike' => '', 'dislike' => '',
'comment' => '', 'comment_html' => '',
'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> DI::l10n()->t('View in context')]), 'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> DI::l10n()->t('View in context')]),
'previewing' => $previewing, 'previewing' => $previewing,
'wait' => DI::l10n()->t('Please wait'), 'wait' => DI::l10n()->t('Please wait'),

View file

@ -349,7 +349,7 @@ class Post
} }
} }
$comment = $this->getCommentBox($indent); $comment_html = $this->getCommentBox($indent);
if (strcmp(DateTimeFormat::utc($item['created']), DateTimeFormat::utc('now - 12 hours')) > 0) { if (strcmp(DateTimeFormat::utc($item['created']), DateTimeFormat::utc('now - 12 hours')) > 0) {
$shiny = 'shiny'; $shiny = 'shiny';
@ -479,7 +479,7 @@ class Post
'responses' => $responses, 'responses' => $responses,
'switchcomment' => DI::l10n()->t('Comment'), 'switchcomment' => DI::l10n()->t('Comment'),
'reply_label' => DI::l10n()->t('Reply to %s', $name_e), 'reply_label' => DI::l10n()->t('Reply to %s', $name_e),
'comment' => $comment, 'comment_html' => $comment_html,
'remote_comment' => $remote_comment, 'remote_comment' => $remote_comment,
'menu' => DI::l10n()->t('More'), 'menu' => DI::l10n()->t('More'),
'previewing' => $conv->isPreview() ? ' preview ' : '', 'previewing' => $conv->isPreview() ? ' preview ' : '',

View file

@ -129,9 +129,9 @@
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
{{if $item.threaded}} {{if $item.threaded}}
{{if $item.comment}} {{if $item.comment_html}}
<div class="wall-item-comment-wrapper {{$item.indent}}" > <div class="wall-item-comment-wrapper {{$item.indent}}" >
{{$item.comment nofilter}} {{$item.comment_html nofilter}}
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}
@ -144,7 +144,7 @@
{{if $item.flatten}} {{if $item.flatten}}
<div class="wall-item-comment-wrapper" > <div class="wall-item-comment-wrapper" >
{{$item.comment nofilter}} {{$item.comment_html nofilter}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

View file

@ -128,7 +128,7 @@
<p class="wall-item-actions"> <p class="wall-item-actions">
{{* Action buttons to interact with the item (like: like, dislike, share and so on *}} {{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
<span class="wall-item-actions-left"> <span class="wall-item-actions-left">
<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}} <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment_html}}
<div id="button-reply" class="pull-left"> <div id="button-reply" class="pull-left">
<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span> <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
</div> </div>
@ -148,20 +148,20 @@
{{if $item.vote.dislike}} {{if $item.vote.dislike}}
<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});">{{$item.vote.dislike.0}}</button> <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});">{{$item.vote.dislike.0}}</button>
{{/if}} {{/if}}
{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}} {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
<span role="presentation" class="separator">•</span> <span role="presentation" class="separator">•</span>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{* Button to open the comment text field *}} {{* Button to open the comment text field *}}
{{if $item.comment}} {{if $item.comment_html}}
<button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button> <button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
{{/if}} {{/if}}
{{* Button for sharing the item *}} {{* Button for sharing the item *}}
{{if $item.vote}} {{if $item.vote}}
{{if $item.vote.share}} {{if $item.vote.share}}
{{if $item.vote.like OR $item.vote.dislike OR $item.comment}} {{if $item.vote.like OR $item.vote.dislike OR $item.comment_html}}
<span role="presentation" class="separator">•</span> <span role="presentation" class="separator">•</span>
{{/if}} {{/if}}
<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.0}}</button> <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.0}}</button>

View file

@ -295,7 +295,7 @@ as the value of $top_child_total (this is done at the end of this file)
<button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;{{$item.vote.dislike.1}}</button> <button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;{{$item.vote.dislike.1}}</button>
{{/if}} {{/if}}
{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}} {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
<span role="presentation" class="separator"></span> <span role="presentation" class="separator"></span>
{{/if}} {{/if}}
{{/if}} {{/if}}
@ -305,14 +305,14 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}} {{/if}}
{{* Button to open the comment text field *}} {{* Button to open the comment text field *}}
{{if $item.comment}} {{if $item.comment_html}}
<button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button> <button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
{{/if}} {{/if}}
{{* Button for sharing the item *}} {{* Button for sharing the item *}}
{{if $item.vote}} {{if $item.vote}}
{{if $item.vote.share}} {{if $item.vote.share}}
{{if $item.vote.like OR $item.vote.dislike OR $item.comment}} {{if $item.vote.like OR $item.vote.dislike OR $item.comment_html}}
<span role="presentation" class="separator"></span> <span role="presentation" class="separator"></span>
{{/if}} {{/if}}
<button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</button> <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</button>
@ -422,7 +422,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}} {{/if}}
{{* Button to open the comment text field *}} {{* Button to open the comment text field *}}
{{if $item.comment}} {{if $item.comment_html}}
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<button type="button" class="btn btn-sm button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i></button> <button type="button" class="btn btn-sm button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i></button>
</div> </div>
@ -536,9 +536,9 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}} {{/if}}
{{* Insert comment box of threaded children *}} {{* Insert comment box of threaded children *}}
{{if $item.threaded && $item.comment && $item.indent==comment}} {{if $item.threaded && $item.comment_html && $item.indent==comment}}
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" data-display="block" style="display: none;"> <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" data-display="block" style="display: none;">
{{$item.comment nofilter}} {{$item.comment_html nofilter}}
</div> </div>
{{/if}} {{/if}}
@ -553,13 +553,13 @@ as the value of $top_child_total (this is done at the end of this file)
{{* Insert the comment box of the top level post at the bottom of the thread. {{* Insert the comment box of the top level post at the bottom of the thread.
Display this comment box if there are any comments. If not hide it. In this Display this comment box if there are any comments. If not hide it. In this
case it could be opend with the "comment" button *}} case it could be opend with the "comment" button *}}
{{if $item.comment && $item.thread_level==1}} {{if $item.comment_html && $item.thread_level==1}}
{{if $item.total_comments_num}} {{if $item.total_comments_num}}
<div class="comment-fake-form" id="comment-fake-form-{{$item.id}}"> <div class="comment-fake-form" id="comment-fake-form-{{$item.id}}">
<textarea id="comment-fake-text-{{$item.id}}" class="comment-fake-text-empty form-control" placeholder="{{$item.reply_label}}" onFocus="commentOpenUI(this, {{$item.id}});" rows="1"></textarea> <textarea id="comment-fake-text-{{$item.id}}" class="comment-fake-text-empty form-control" placeholder="{{$item.reply_label}}" onFocus="commentOpenUI(this, {{$item.id}});" rows="1"></textarea>
</div> </div>
{{/if}} {{/if}}
<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" data-display="block" style="display: none">{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" data-display="block" style="display: none">{{$item.comment_html nofilter}}</div>
{{/if}} {{/if}}
</div><!-- ./panel-body or ./wall-item-container --> </div><!-- ./panel-body or ./wall-item-container -->

View file

@ -58,10 +58,10 @@
{{/if}} {{/if}}
{{* top thread comment box *}} {{* top thread comment box *}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
{{/if}}{{/if}}{{/if}} {{/if}}{{/if}}{{/if}}
{{if $item.flatten}} {{if $item.flatten}}
<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
{{/if}} {{/if}}

View file

@ -161,11 +161,11 @@
{{/if}} {{/if}}
</div> </div>
{{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}} {{if $item.threaded}}{{if $item.comment_html}}{{if $item.indent==comment}}
<div class="wall-item-bottom commentbox"> <div class="wall-item-bottom commentbox">
<div class="wall-item-links"></div> <div class="wall-item-links"></div>
<div class="wall-item-comment-wrapper"> <div class="wall-item-comment-wrapper">
{{$item.comment nofilter}} {{$item.comment_html nofilter}}
</div> </div>
</div> </div>
{{/if}}{{/if}}{{/if}} {{/if}}{{/if}}{{/if}}
@ -189,11 +189,11 @@
{{/if}} {{/if}}
{{* top thread comment box *}} {{* top thread comment box *}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
{{/if}}{{/if}}{{/if}} {{/if}}{{/if}}{{/if}}
{{if $item.flatten}} {{if $item.flatten}}
<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
{{/if}} {{/if}}

View file

@ -147,9 +147,9 @@
<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike nofilter}}</div> <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike nofilter}}</div>
{{if $item.threaded}} {{if $item.threaded}}
{{if $item.comment}} {{if $item.comment_html}}
<div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" > <div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
{{$item.comment nofilter}} {{$item.comment_html nofilter}}
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}
@ -163,7 +163,7 @@
{{if $item.flatten}} {{if $item.flatten}}
<div class="wall-item-comment-wrapper" > <div class="wall-item-comment-wrapper" >
{{$item.comment nofilter}} {{$item.comment_html nofilter}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

View file

@ -58,10 +58,10 @@
{{/if}} {{/if}}
{{* top thread comment box *}} {{* top thread comment box *}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
{{/if}}{{/if}}{{/if}} {{/if}}{{/if}}{{/if}}
{{if $item.flatten}} {{if $item.flatten}}
<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
{{/if}} {{/if}}

View file

@ -109,7 +109,7 @@
<a role="button" title="{{$item.remote_comment.0}}" href="{{$item.remote_comment.2}}"><i class="icon-commenting"><span class="sr-only">{{$item.remote_comment.1}}</span></i></a> <a role="button" title="{{$item.remote_comment.0}}" href="{{$item.remote_comment.2}}"><i class="icon-commenting"><span class="sr-only">{{$item.remote_comment.1}}</span></i></a>
{{/if}} {{/if}}
{{if $item.comment}} {{if $item.comment_html}}
<a role="button" id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment}}"><i class="icon-commenting"><span class="sr-only">{{$item.switchcomment}}</span></i></a> <a role="button" id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment}}"><i class="icon-commenting"><span class="sr-only">{{$item.switchcomment}}</span></i></a>
{{/if}} {{/if}}
@ -181,12 +181,12 @@
</div> </div>
{{if $item.threaded}}{{if $item.comment}} {{if $item.threaded}}{{if $item.comment_html}}
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class="wall-item-links"> <div class="wall-item-links">
</div> </div>
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;"> <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
{{$item.comment nofilter}} {{$item.comment_html nofilter}}
</div> </div>
</div> </div>
{{/if}}{{/if}} {{/if}}{{/if}}
@ -210,19 +210,19 @@
{{/if}} {{/if}}
{{if $item.total_comments_num}} {{if $item.total_comments_num}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment_html nofilter}}</div>
{{/if}}{{/if}}{{/if}} {{/if}}{{/if}}{{/if}}
{{if $item.flatten}} {{if $item.flatten}}
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment_html nofilter}}</div>
{{/if}} {{/if}}
{{else}} {{else}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment_html nofilter}}</div>
{{/if}}{{/if}}{{/if}} {{/if}}{{/if}}{{/if}}
{{if $item.flatten}} {{if $item.flatten}}
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div> <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment_html nofilter}}</div>
{{/if}} {{/if}}
{{/if}} {{/if}}