From d2ff11c76cde78c6aea2b6c132a818ee5e465529 Mon Sep 17 00:00:00 2001
From: "Iain R. Learmonth" <irl@fsfe.org>
Date: Fri, 3 Mar 2017 00:48:44 +0000
Subject: [PATCH] Remove Not Recommended psuedoflag and instead add warning
next to platform text
---
js/models/relay.js | 6 ------
templates/details/router.html | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/js/models/relay.js b/js/models/relay.js
index c69288a..a578e99 100644
--- a/js/models/relay.js
+++ b/js/models/relay.js
@@ -55,9 +55,6 @@ define([
if (flag == "Exit") {
output.push([flag,"cloud_download_"+size[0], "This relay is more useful for building general-purpose exit circuits than for relay circuits."]);
}
- if (flag == "Not Recommended") {
- output.push([flag,"not_recommended_"+size[0], "This relay is running a software version that is not recommended by the directory authorities."]);
- }
});
return output;
},
@@ -194,9 +191,6 @@ define([
relay.fingerprint = relay.hashed_fingerprint ? relay.hashed_fingerprint : relay.fingerprint;
model.set({badexit: false});
var size = ['16x16', '14x16', '8x16'];
- if (relay.recommended_version===false) {
- relay.flags.push("Not Recommended");
- }
relay.flags = model.parseflags(relay.flags, size);
model.set(relay, options);
success(model, relay);
diff --git a/templates/details/router.html b/templates/details/router.html
index 24bcb2b..83807e3 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -110,7 +110,7 @@
<dd><%= relay.get('desc_published') ? relay.get('desc_published') : 'never' %></dd>
<dt><span class="tip" title="What OS and Tor version the relay is using" data-original-title="Platform">Platform</span></dt>
- <dd><%= _.escape(relay.get('platform')) %></dd>
+ <dd><%= _.escape(relay.get('platform')) %> <% if (relay.get('recommended_version') == false) { %><span class="tip" title="This relay is running a Tor version that is not currently recommended by the Directory Authorities"><img src="img/flags/not_recommended_16x16.png"><% } %></span></dd>
<dt><span class="tip" title="Weight assigned to this relay by the directory authorities that clients use in their path selection algorithm. The unit is arbitrary; currently it's kilobytes per second, but that might change in the future." data-original-title="Consensus Weight">Consensus Weight</span></dt>
<dd><%= relay.get('consensus_weight') %></dd>
--
GitLab