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

diff --cc view/theme/frio/css/style.css
Simple merge

diff --cc view/theme/frio/templates/event.tpl
index 38f061d9a44a7b5bc94c2e70de0e832a8c9d5496,dc37f19269d9ab6d9ded805ea2f7b68caecff88d..4189baf3164243b93fcb9f3fe0536ffcba0e84da
--- 1/view/theme/frio/templates/event.tpl
--- 2/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>