Merge pull request #13268 from MrPetovan/task/normalize-item-action-label

Normalize item action label key name

diff --cc src/Object/Post.php
index 4c377e946c4220c30af7e0c46dd2c461fe49fe90,915dead9406d521408bef0798d09805911c09a0a..e7a178ef12f699891e638101ceaa6770c1160830
--- 1/src/Object/Post.php
--- 2/src/Object/Post.php
+++ b/src/Object/Post.php
@@@ -278,13 -274,9 +275,13 @@@ class Pos
                        ];
                        $collapse = [
                                'collapsing' => true,
-                               'collapse'   => DI::l10n()->t('Collapse %s', $item['author-name']),
+                               'label'      => DI::l10n()->t('Collapse %s', $item['author-name']),
                                'author_id'  => $item['author-id'],
                        ];
 +                      $report = [
 +                              'label' => DI::l10n()->t('Report post'),
 +                              'href'  => 'moderation/report/create?' . http_build_query(['cid' => $item['author-id'], 'uri-ids' => [$item['uri-id']]]),
 +                      ];
                }
  
                $filer = DI::userSession()->getLocalUserId() ? DI::l10n()->t('Save to folder') : false;

diff --cc view/templates/wall_thread.tpl
index 74e6097b379b492da3654cbae6a91f302918aac9,90218d9119a20f2b2550fd029dd2291949f8fd79..978b3151e8cbf850d9c2799efea3fc4db9430fb0
--- 1/view/templates/wall_thread.tpl
--- 2/view/templates/wall_thread.tpl
+++ b/view/templates/wall_thread.tpl
@@@ -165,11 -166,8 +165,11 @@@
                                                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                  {{/if}}
                                  {{if $item.drop && $item.drop.dropping}}
-                                                                       <a role="button" href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.delete}}</span></i></a>
+                                                                       <a role="button" href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" title="{{$item.drop.label}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.label}}</span></i></a>
                                  {{/if}}
 +                                {{if $item.report}}
 +                                                                      <a href="{{$item.report.href}}" title="{{$item.report.label}}"><i class="icon-flag icon-large"><span class="sr-only">{{$item.report.label}}</span></i></a>
 +                                {{/if}}
                                  {{if $item.edpost}}
                                                                        <a role="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="icon-edit icon-large"><span class="sr-only">{{$item.edpost.1}}</span></i></a>
                                  {{/if}}

diff --cc view/theme/frio/templates/wall_thread.tpl
index 21aac60e8a4a944c2db9d90ecb6a0a5acd7b4602,29e0c64636341aa6fa7e66523cc56178f7b52097..e42225009f05b6828996ab3049916c34c6ac4dec
--- 1/view/theme/frio/templates/wall_thread.tpl
--- 2/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@@ -406,14 -406,10 +406,15 @@@ as the value of $top_child_total (this 
                                          {{/if}}
                                          {{if $item.collapse}}
                                          <li role="menuitem">
-                                                 <a class="btn-link navicon collapse" href="javascript:collapseAuthor('item/collapse/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.collapse.collapse}}"><i class="fa fa-ban" aria-hidden="true"></i> {{$item.collapse.collapse}}</a>
+                                                 <a class="btn-link navicon collapse" href="javascript:collapseAuthor('item/collapse/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.collapse.label}}"><i class="fa fa-ban" aria-hidden="true"></i> {{$item.collapse.label}}</a>
+                                         </li>
                                          </li>
                                          {{/if}}
 +                                        {{if $item.report}}
 +                                        <li role="menuitem">
 +                                                <a class="btn-link navicon ignore" href="{{$item.report.href}}"><i class="fa fa-flag" aria-hidden="true"></i> {{$item.report.label}}</a>
 +                                        </li>
 +                                        {{/if}}
                                      </ul>
                              </span>
                          </span>