Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 36a3be8

Browse files
author
ameliagoodman
committed
updated according to rmisio's comments
1 parent a04af34 commit 36a3be8

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

css/obBase.css

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6402,11 +6402,16 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
64026402
}
64036403

64046404

6405-
.js-connectedPeers {
6406-
line-height: 20px;
6405+
.peersList {
64076406
margin-top: 10px;
64086407
display: block;
64096408
color: #9999A0;
64106409
max-height: 200px;
6411-
overflow: scroll;
6410+
overflow: auto;
6411+
6412+
}
6413+
6414+
.peersList>ul{
6415+
list-style-type: none;
6416+
padding-left: 0;
64126417
}

js/templates/settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
12841284
</div>
12851285
</div>
12861286
<div class="flexRow">
1287-
<div style="white-space: pre;"><span class="js-connectedPeers"></span></div>
1287+
<div class="peersList js-connectedPeers"></div>
12881288
</div>
12891289
</div>
12901290
</div>

js/views/settingsVw.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,19 +239,18 @@ module.exports = pageVw.extend({
239239
placeholder_text_multiple: window.polyglot.t('chosenJS.placeHolderTextMultiple')
240240
});
241241

242-
var connectedPeers = "";
242+
var connectedPeers = "<ul>";
243243
$.ajax({
244-
url: self.serverUrl+ "routing_table",
244+
url: self.serverUrl + "routing_table",
245245
success: function(data){
246-
self.$el.find('span.js-numConnectedPeers').text(data.length);
246+
self.$('.js-numConnectedPeers').html("<p>" + data.length + "</p>");
247247
data.forEach(function (peer) {
248-
connectedPeers += (peer['ip'] + ":" + peer['port'] + "\n");
249-
})
250-
self.$el.find('span.js-connectedPeers').text(connectedPeers);
251-
self.$el.find('.js-connectedPeers').hide();
248+
connectedPeers += `<li><a href="#userPage/${peer.guid}">${peer.ip}:${peer.port}</a></li>`;
249+
});
250+
self.$('.js-connectedPeers').html(connectedPeers + "</ul>").hide();
252251
},
253252
error: function(){
254-
self.$el.find('.js-numConnectedPeers').text(window.polyglot.t('errorMessages.peersFail'));
253+
self.$('.js-numConnectedPeers').text(window.polyglot.t('errorMessages.peersFail'));
255254
}
256255
});
257256

0 commit comments

Comments
 (0)