diff --git a/apps/federation/css/settings-admin.css b/apps/federation/css/settings-admin.css
index 55b1dd64d1..150412c156 100644
--- a/apps/federation/css/settings-admin.css
+++ b/apps/federation/css/settings-admin.css
@@ -17,10 +17,13 @@
cursor: pointer;
}
-#listOfTrustedServers li:hover {
- cursor: pointer;
-}
-
#listOfTrustedServers .status {
margin-right: 10px;
}
+
+#listOfTrustedServers .icon {
+ cursor: pointer;
+ display: inline-block;
+ vertical-align: middle;
+ margin-left: 10px;
+}
diff --git a/apps/federation/js/settings-admin.js b/apps/federation/js/settings-admin.js
index 7d531b39d8..45d5d62a5a 100644
--- a/apps/federation/js/settings-admin.js
+++ b/apps/federation/js/settings-admin.js
@@ -42,8 +42,9 @@ $(document).ready(function () {
$('ul#listOfTrustedServers').prepend(
$('
')
.attr('id', data.id)
- .attr('class', 'icon-delete')
- .html('' + data.url)
+ .html('' +
+ data.url +
+ '')
);
OC.msg.finishedSuccess('#ocFederationAddServer .msg', data.message);
})
@@ -56,10 +57,10 @@ $(document).ready(function () {
}
});
- // remove trusted server from list
- $( "#listOfTrustedServers" ).on('click', 'li', function() {
- var id = $(this).attr('id');
- var $this = $(this);
+// remove trusted server from list
+ $( "#listOfTrustedServers" ).on('click', 'li > .icon-delete', function() {
+ var $this = $(this).parent();
+ id = $this.attr('id');
$.ajax({
url: OC.generateUrl('/apps/federation/trusted-servers/' + id),
type: 'DELETE',
diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php
index 704fc9a9ac..ce66214de7 100644
--- a/apps/federation/templates/settings-admin.php
+++ b/apps/federation/templates/settings-admin.php
@@ -23,7 +23,7 @@ style('federation', 'settings-admin')