Merge pull request #13596 from Raroun/Issue_#13577_Remove_button_descriptions

Fix Issue #13577 remove button descriptions

diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index ba396fbfd9a3b27b37667ceb89f8f6ad6098dbd5..513ee0a1c290c6247f97d73b3dc2ca3655fabac3 100644 (file)
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -143,20 +143,19 @@
 
                        <p class="wall-item-actions">
                                {{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
-                               <span class="wall-item-actions-left">
                                        {{if $item.threaded}}{{/if}}
 
                                        {{* Buttons for like and dislike *}}
                                        {{if $item.vote}}
                                                {{if $item.vote.like}}
-                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});">{{$item.vote.like.0}}</button>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});"></button>
                                                {{/if}}
                                                {{if $item.vote.like AND $item.vote.dislike}}
                                        <span role="presentation" class="separator">•</span>
                                                {{/if}}
 
                                                {{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="doActivityItemAction({{$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="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});"></button>
                                                {{/if}}
                                                {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
                                        <span role="presentation" class="separator">•</span>
@@ -165,7 +164,7 @@
 
                                        {{* Button to open the comment text field *}}
                                        {{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}});"></button>
                                        {{/if}}
 
                                        {{* Button for sharing the item *}}
@@ -174,7 +173,7 @@
                                                        {{if $item.vote.like OR $item.vote.dislike OR $item.comment_html}}
                                        <span role="presentation" class="separator">•</span>
                                                        {{/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></button>
                                                {{/if}}
                                        {{/if}}
 
@@ -258,7 +257,6 @@
                                {{else}}
                                        <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                                {{/if}}
-                               </span>
 
 
                                <span class="wall-item-actions-right">

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 1fa5ed8451a05c72267811654c87f767d299966c..b439c8807887848a2f6e6e9769e70ec80f59d66f 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -303,18 +303,17 @@ as the value of $top_child_total (this is done at the end of this file)
                <!-- <hr /> -->
                <div class="wall-item-actions">
                        {{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
-                        <span class="wall-item-actions-left hidden-xs">
 
                        {{* Buttons for like and dislike *}}
                        {{if $item.vote}}
                                {{if $item.vote.like}}
-                               <button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});" ><i class="fa fa-thumbs-up" aria-hidden="true"></i>&nbsp;{{$item.vote.like.1}}</button>
+                               <button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});" ><i class="fa fa-thumbs-up" aria-hidden="true"></i></button>
                                {{/if}}
                                {{if $item.vote.like AND $item.vote.dislike}}
                                <span role="presentation" class="separator"></span>
                                {{/if}}
                                {{if $item.vote.dislike}}
-                               <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="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" ><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="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" ><i class="fa fa-thumbs-down" aria-hidden="true"></i></button>
                                {{/if}}
 
                                {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
@@ -323,12 +322,12 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{/if}}
 
                        {{if $item.remote_comment}}
-                               <a href="{{$item.remote_comment.2}}" class="btn-link button-comments" title="{{$item.remote_comment.0}}"><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.remote_comment.1}}</a>
+                               <a href="{{$item.remote_comment.2}}" class="btn-link button-comments" title="{{$item.remote_comment.0}}"><i class="fa fa-commenting" aria-hidden="true"></i></a>
                        {{/if}}
 
                        {{* Button to open the comment text field *}}
                        {{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></button>
                        {{/if}}
 
                        {{* Button for sharing the item *}}
@@ -339,11 +338,11 @@ as the value of $top_child_total (this is done at the end of this file)
                                        {{/if}}
                                {{/if}}
                                {{if $item.vote.announce}}
-                               <button type="button" class="btn-link button-announces{{if $item.responses.announce.self}} active" aria-pressed="true{{/if}}" id="announce-{{$item.id}}" title="{{$item.vote.announce.0}}" onclick="doActivityItemAction({{$item.id}}, 'announce'{{if $item.responses.announce.self}}, true{{/if}});" ><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.announce.1}}</button>
+                               <button type="button" class="btn-link button-announces{{if $item.responses.announce.self}} active" aria-pressed="true{{/if}}" id="announce-{{$item.id}}" title="{{$item.vote.announce.0}}" onclick="doActivityItemAction({{$item.id}}, 'announce'{{if $item.responses.announce.self}}, true{{/if}});" ><i class="fa fa-retweet" aria-hidden="true"></i></button>
                                <span role="presentation" class="separator"></span>
                                {{/if}}
                                {{if $item.vote.share}}
-                               <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-share" 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-share" aria-hidden="true"></i></button>
                                {{/if}}
                        {{/if}}
 
@@ -447,7 +446,6 @@ as the value of $top_child_total (this is done at the end of this file)
                                         </li>
                                         {{/if}}
                                     </ul>
-                            </span>
                         </span>
 
                        <span class="wall-item-actions-right hidden-xs">