From: Hypolite Petovan <ben.lort@gmail.com>
Date: Tue, 14 Mar 2017 14:45:17 +0000 (-0400)
Subject: Merge branch 'develop' into improvement/frio-action-links-to-buttons
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=79f14749df35f1063462e1dfef005d2d797f154f;p=friendica.git

Merge branch 'develop' into improvement/frio-action-links-to-buttons

# Conflicts:
#	view/theme/frio/templates/search_item.tpl
#	view/theme/frio/templates/wall_thread.tpl
---

79f14749df35f1063462e1dfef005d2d797f154f
diff --cc view/theme/frio/templates/search_item.tpl
index bf90f8606b,0a6eca0c27..2faa31475c
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@@ -54,7 -54,7 +54,7 @@@
  						{{if $item.drop.dropping}}
  						<li role="separator" class="divider"></li>
  						<li role="menuitem">
- 							<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
 -							<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
++							<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
  						</li>
  						{{/if}}
  					</ul>
diff --cc view/theme/frio/templates/wall_thread.tpl
index 6f7de795fc,85091cf1c6..4024ce7810
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@@ -129,7 -129,7 +129,7 @@@ as the value of $top_child_total (this 
  
  					{{if $item.drop.dropping}}
  					<li role="menuitem">
- 						<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
 -						<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
++						<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
  					</li>
  					{{/if}}
  				</ul>