From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Mon, 20 Mar 2017 18:43:37 +0000 (-0400)
Subject: Merge branch 'develop' into improvement/frio-action-links-to-buttons
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8a0b057dc7dbf26ac78393f06a4413bf0512471d;p=friendica.git

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

8a0b057dc7dbf26ac78393f06a4413bf0512471d
diff --cc view/theme/frio/templates/event.tpl
index 38f061d9a4,dc37f19269..4189baf316
--- a/view/theme/frio/templates/event.tpl
+++ b/view/theme/frio/templates/event.tpl
@@@ -16,9 -16,10 +16,10 @@@
  				</div>
  			</div>
  
--			<div class="event-buttons pull-right">
- 				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
 -				{{if $event.edit}}<a onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}" class="edit-event-link btn"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
 -				{{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
++			<div class="event-buttons pull-right">				
 +				{{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
++        {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
+ 				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
  			</div>
  			<div class="clear"></div>
  		</div>