From e0aaa21bd8f9e726a5ffe2142116fc0e036cfff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Wed, 8 Jun 2016 09:02:05 +0000
Subject: [PATCH 1/3] Fixed problem about removing trusted servers accidentally

---
 apps/federation/css/settings-admin.css       | 11 +++++++----
 apps/federation/js/settings-admin.js         |  8 ++++----
 apps/federation/templates/settings-admin.php |  3 ++-
 3 files changed, 13 insertions(+), 9 deletions(-)

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..a903cb1530 100644
--- a/apps/federation/js/settings-admin.js
+++ b/apps/federation/js/settings-admin.js
@@ -56,10 +56,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 id = $(this).parent().attr('id');
+		var $this = $(this).parent();
 		$.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')
 	</p>
 	<ul id="listOfTrustedServers">
 		<?php foreach($_['trustedServers'] as $trustedServer) { ?>
-			<li id="<?php p($trustedServer['id']); ?>" class="icon-delete">
+			<li id="<?php p($trustedServer['id']); ?>">
 				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
@@ -36,6 +36,7 @@ style('federation', 'settings-admin')
 					<span class="status error"></span>
 				<?php } ?>
 				<?php p($trustedServer['url']); ?>
+				<span class="icon icon-delete"></span>
 			</li>
 		<?php } ?>
 	</ul>

From b8493629aeb1804c70f70eb72ceeac3103e9f307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Wed, 8 Jun 2016 10:19:18 +0000
Subject: [PATCH 2/3] Improve readability

---
 apps/federation/js/settings-admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/federation/js/settings-admin.js b/apps/federation/js/settings-admin.js
index a903cb1530..fec251ffaf 100644
--- a/apps/federation/js/settings-admin.js
+++ b/apps/federation/js/settings-admin.js
@@ -58,8 +58,8 @@ $(document).ready(function () {
 
 // remove trusted server from list
 	$( "#listOfTrustedServers" ).on('click', 'li > .icon-delete', function() {
-		var id = $(this).parent().attr('id');
 		var $this = $(this).parent();
+		id = $this.attr('id');
 		$.ajax({
 			url: OC.generateUrl('/apps/federation/trusted-servers/' + id),
 			type: 'DELETE',

From 6bc7e3f92f2433f33c2ab58f490760c85ae9194a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Wed, 8 Jun 2016 11:11:30 +0000
Subject: [PATCH 3/3] Removed old html

---
 apps/federation/js/settings-admin.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/federation/js/settings-admin.js b/apps/federation/js/settings-admin.js
index fec251ffaf..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(
 						$('<li>')
 								.attr('id', data.id)
-								.attr('class', 'icon-delete')
-								.html('<span class="status indeterminate"></span>' + data.url)
+								.html('<span class="status indeterminate"></span>' +
+									data.url +
+									'<span class="icon icon-delete"></span>')
 					);
 					OC.msg.finishedSuccess('#ocFederationAddServer .msg', data.message);
 				})