commit 7b0f624a3f2c69231570dd964400fade8510ec30
Author: cypherpunks <cypherpu...@torproject.org>
Date: Sun Apr 23 19:38:05 2017 +0000
Remove the data-original-title attribute
The Bootstrap Tooltip plugin overwrites the data-original-title
attribute when the title attribute is specified. All of the elements
that specify the data-original-title attribute also specify the title
attribute which makes the former serve no purpose.
Also the title attribute has been standardized while the
data-original-title attribute is not.
Closes #22047.
---
templates/details/bridge.html | 24 +++++++++++-----------
templates/details/router.html | 46 +++++++++++++++++++++----------------------
2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/templates/details/bridge.html b/templates/details/bridge.html
index dae5a6b..fda73f6 100644
--- a/templates/details/bridge.html
+++ b/templates/details/bridge.html
@@ -14,14 +14,14 @@
<div class="span6">
<h3>Configuration</h3>
<dl>
- <dt><span class="tip" title="This is the nickname that the Tor bridge
operator chose." data-original-title="Nickname">Nickname</span></dt>
+ <dt><span class="tip" title="This is the nickname that the Tor bridge
operator chose.">Nickname</span></dt>
<dd><%= _.escape(relay.get('nickname')) %></dd>
- <dt><span class="tip" title="Ports (addresses are hidden) where the
bridge listens for incoming connections from clients and other relays."
data-original-title="Onion-routing addresses">OR Addresses</span></dt>
+ <dt><span class="tip" title="Ports (addresses are hidden) where the
bridge listens for incoming connections from clients and other relays.">OR
Addresses</span></dt>
<dd><%= relay.get('or_addresses') %></dd>
<dt>
- <span class="tip" title="Bandwidth that the bridge is willing and able
to provide in bytes per second." data-original-title="Advertised
bandwidth">Advertised Bandwidth</span>
+ <span class="tip" title="Bandwidth that the bridge is willing and able
to provide in bytes per second.">Advertised Bandwidth</span>
</dt>
<dd><%= relay.get('bandwidth_hr') ? relay.get('bandwidth_hr') : 'not
defined' %></dd>
</dl>
@@ -36,20 +36,20 @@
<% } %>
<dl>
- <dt><span class="tip" title="Hash of 20-byte unique identifier of the
bridge." data-original-title="Hashed Fingerprint">Hashed Fingerprint</span></dt>
+ <dt><span class="tip" title="Hash of 20-byte unique identifier of the
bridge.">Hashed Fingerprint</span></dt>
<dd><pre><%= relay.get('fingerprint') %></pre></dd>
<% if (relay.get('running') === true) { %>
- <dt><span class="tip" title="The time since this bridge is online."
data-original-title="Uptime">Uptime</span></dt>
+ <dt><span class="tip" title="The time since this bridge is
online.">Uptime</span></dt>
<dd><%= relay.get('uptime_hrfull') %></dd>
<% } else { %>
- <dt><span class="tip" title="The time since this bridge was last seen
online." data-original-title="Downtime">Downtime</span></dt>
+ <dt><span class="tip" title="The time since this bridge was last seen
online.">Downtime</span></dt>
<dd><%= relay.get('downtime') %></dd>
- <dt><span class="tip" title="Timestamp when the bridge was last seen in
the consensus." data-original-title="Last seen">Last Seen</span></dt>
+ <dt><span class="tip" title="Timestamp when the bridge was last seen in
the consensus.">Last Seen</span></dt>
<dd><%= relay.get('last_seen') %></dd>
<% } %>
- <dt><span class="tip" title="Flags that the directory authorities assigned
to this bridge." data-original-title="Bridge flags">Flags</span></dt>
+ <dt><span class="tip" title="Flags that the directory authorities assigned
to this bridge.">Flags</span></dt>
<dd><% _.each(relay.get('flags'), function(flag) { %>
<span class="tip flags" title="<%= flag[2] %>">
<img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/>
@@ -58,7 +58,7 @@
<% }); %>
</dd>
- <dt><span class="tip" title=""
data-original-title="Properties">Properties</span></dt>
+ <dt>Properties</dt>
<dd>
<% var propertyCount = 0; %>
<% if (relay.get('recommended_version') === false) {
@@ -72,13 +72,13 @@
<%=propertyCount==0?'none':''%>
</dd>
- <dt><span class="tip" title="Date and time when the bridge was last
(re-)started." data-original-title="Last restarted">Last Restarted</span></dt>
+ <dt><span class="tip" title="Date and time when the bridge was last
(re-)started.">Last Restarted</span></dt>
<dd><%= relay.get('last_restarted') %></dd>
- <dt><span class="tip" title="What OS and Tor version the bridge is using"
data-original-title="Platform">Platform</span></dt>
+ <dt><span class="tip" title="What OS and Tor version the bridge is
using">Platform</span></dt>
<dd><%= _.escape(relay.get('platform')) %></dd>
- <dt><span class="tip" title="Transport protocols supported by this
bridge." data-original-title="Transport protocols">Transport
protocols</span></dt>
+ <dt><span class="tip" title="Transport protocols supported by this
bridge.">Transport protocols</span></dt>
<dd><%= relay.get('transports') ? relay.get('transports') : 'none' %></dd>
</dl>
diff --git a/templates/details/router.html b/templates/details/router.html
index 5ffec67..430091b 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -14,23 +14,23 @@
<div class="span6">
<h3>Configuration</h3>
<dl>
- <dt><span class="tip" title="This is the nickname that the Tor relay
operator chose." data-original-title="Nickname">Nickname</span></dt>
+ <dt><span class="tip" title="This is the nickname that the Tor relay
operator chose.">Nickname</span></dt>
<dd><%= _.escape(relay.get('nickname')) %></dd>
- <dt><span class="tip" title="Addresses and ports where the relay listens
for incoming connections from clients and other relays."
data-original-title="Onion-routing addresses">OR Addresses</span></dt>
+ <dt><span class="tip" title="Addresses and ports where the relay listens
for incoming connections from clients and other relays.">OR
Addresses</span></dt>
<dd><%= relay.get('or_addresses') %></dd>
- <dt><span class="tip" title="These are the contact details of the Tor
relay operator" data-original-title="ContactInfo">Contact</span></dt>
+ <dt><span class="tip" title="These are the contact details of the Tor
relay operator">Contact</span></dt>
<dd><%= _.escape( relay.get('contact')!='undefined' ?
relay.get('contact') : 'none' ) %></dd>
- <dt><span class="tip" title="Address and port where the relay listens
for directory requests." data-original-title="Directory port">Dir
Address</span></dt>
+ <dt><span class="tip" title="Address and port where the relay listens
for directory requests.">Dir Address</span></dt>
<dd><%= relay.get('dir_address') ? relay.get('dir_address') : 'none'
%></dd>
<dt>
- <span class="tip" title="Bandwidth that the relay is willing and able to
provide in bytes per second." data-original-title="Advertised
bandwidth">Advertised Bandwidth</span>
+ <span class="tip" title="Bandwidth that the relay is willing and able to
provide in bytes per second.">Advertised Bandwidth</span>
</dt>
- <dd><span class="tip" title="Bandwidth rate: <%= relay.get('bandwidthr')
%><br>Bandwidth burst: <%= relay.get('bandwidthb') %><br>Observed bandwidth:
<%= relay.get('obandwidth') %>" data-original-title="Bandwidth values"><%=
relay.get('bandwidth_hr') %></span></dd>
- <dt><span class="tip" title="Port summary of IPv4 exit connections that
the relay is going to accept or reject." data-original-title="IPv4 exit policy
summary">IPv4 Exit Policy Summary</span></dt>
+ <dd><span class="tip" title="Bandwidth rate: <%= relay.get('bandwidthr')
%><br>Bandwidth burst: <%= relay.get('bandwidthb') %><br>Observed bandwidth:
<%= relay.get('obandwidth') %>"><%= relay.get('bandwidth_hr') %></span></dd>
+ <dt><span class="tip" title="Port summary of IPv4 exit connections that
the relay is going to accept or reject.">IPv4 Exit Policy Summary</span></dt>
<dd>
<% if ('accept' in relay.get('exit_policy_summary')) { %>
<pre class="pre-scrollable">accept<%
_.each(relay.get('exit_policy_summary')['accept'],
@@ -39,7 +39,7 @@
<pre class="pre-scrollable">reject<%
_.each(relay.get('exit_policy_summary')['reject'],
function(ports) { %><br> <%= $.trim(ports) %><% });} %></pre>
</dd>
- <dt><span class="tip" title="Port summary of IPv6 exit connections that
the relay is going to accept or reject." data-original-title="IPv6 exit policy
summary">IPv6 Exit Policy Summary</span></dt>
+ <dt><span class="tip" title="Port summary of IPv6 exit connections that
the relay is going to accept or reject.">IPv6 Exit Policy Summary</span></dt>
<dd>
<% if (relay.get('exit_policy_v6_summary') && ('accept' in
relay.get('exit_policy_v6_summary'))) { %>
<pre class="pre-scrollable">accept<%
_.each(relay.get('exit_policy_v6_summary')['accept'],
@@ -51,7 +51,7 @@
<pre class="pre-scrollable">reject<br> 1-65535</pre>
<% } %>
</dd>
- <dt><span class="tip" title="Policy of exit connections that the relay
is going to accept or reject." data-original-title="Exit policy">Exit
Policy</span></dt>
+ <dt><span class="tip" title="Policy of exit connections that the relay
is going to accept or reject.">Exit Policy</span></dt>
<dd>
<pre class="pre-scrollable"><% _.each(relay.get('exit_policy'),
function(line) { %>
<%= $.trim(line) %><% }); %></pre>
@@ -68,20 +68,20 @@
<% } %>
<dl>
- <dt><span class="tip" title="20-byte unique identifier of the relay."
data-original-title="Fingerprint">Fingerprint</span></dt>
+ <dt><span class="tip" title="20-byte unique identifier of the
relay.">Fingerprint</span></dt>
<dd><pre><%= relay.get('fingerprint') %></pre></dd>
<% if (relay.get('running') === true) { %>
- <dt><span class="tip" title="The time since this relay is online."
data-original-title="Uptime">Uptime</span></dt>
+ <dt><span class="tip" title="The time since this relay is
online.">Uptime</span></dt>
<dd><%= relay.get('uptime_hrfull') %></dd>
<% } else { %>
- <dt><span class="tip" title="The time since this relay was last seen
online." data-original-title="Downtime">Downtime</span></dt>
+ <dt><span class="tip" title="The time since this relay was last seen
online.">Downtime</span></dt>
<dd><%= relay.get('downtime') %></dd>
- <dt><span class="tip" title="Timestamp when the relay was last seen in the
consensus." data-original-title="Last seen">Last Seen</span></dt>
+ <dt><span class="tip" title="Timestamp when the relay was last seen in the
consensus.">Last Seen</span></dt>
<dd><%= relay.get('last_seen') %></dd>
<% } %>
- <dt><span class="tip" title="Flags that the directory authorities assigned
to this relay." data-original-title="Relay flags">Flags</span></dt>
+ <dt><span class="tip" title="Flags that the directory authorities assigned
to this relay.">Flags</span></dt>
<dd><% _.each(relay.get('flags'), function(flag) { %>
<span class="tip flags" title="<%= flag[2] %>">
<img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/>
@@ -90,7 +90,7 @@
<% }); %>
</dd>
- <dt><span class="tip" title=""
data-original-title="Properties">Properties</span></dt>
+ <dt>Properties</dt>
<dd>
<% var propertyCount = 0; %>
<% if (relay.get('recommended_version') === false) {
@@ -104,35 +104,35 @@
<%=propertyCount==0?'none':''%>
</dd>
- <dt><span class="tip" title="Country as found in a GeoIP database by
resolving the relay's first onion-routing address."
data-original-title="Country">Country</span></dt>
+ <dt><span class="tip" title="Country as found in a GeoIP database by
resolving the relay's first onion-routing address.">Country</span></dt>
<dd><% if (relay.get('country')) { %><img class="inline country"
title="<%= relay.get('countryname') %>" alt="" src="img/cc/<%=
relay.get('country') %>.png"/> <%= relay.get('countryname') %><% } else {
%>Unknown<% } %></dd>
- <dt><span class="tip" title="Autonomous System Number"
data-original-title="AS Number">AS Number</span></dt>
+ <dt><span class="tip" title="Autonomous System Number">AS
Number</span></dt>
<dd><%= relay.get('as_no') ? _.escape(relay.get('as_no')) : "unknown"
%></dd>
- <dt><span class="tip" title="Autonomous System Name"
data-original-title="AS Name">AS Name</span></dt>
+ <dt><span class="tip" title="Autonomous System Name">AS Name</span></dt>
<dd><%= relay.get('as_name') ? _.escape(relay.get('as_name')) : "unknown"
%></dd>
- <dt><span class="tip" title="Date and time when the relay was last
(re-)started." data-original-title="Last restarted">Last Restarted</span></dt>
+ <dt><span class="tip" title="Date and time when the relay was last
(re-)started.">Last Restarted</span></dt>
<dd><%= relay.get('last_restarted') %></dd>
- <dt><span class="tip" title="Relays that are part of this relay's family
and consider this relay to be part of their family."
data-original-title="Effective Family Members">Effective Family
Members</span></dt>
+ <dt><span class="tip" title="Relays that are part of this relay's family
and consider this relay to be part of their family.">Effective Family
Members</span></dt>
<dd>
<pre><% if (relay.get('effective_family') !== null) { %><%
_.each(relay.get('effective_family'), function(member) { %><% var valid =
member.match(RegExp("^\$[A-F0-9]{40}$")); %>
<% if (valid) { %><a href="#details/<%= member.replace('$', '') %>"
title="Effective family member"><% } %><%= member %><% if (valid) { %></a><%
}}); %>
<% } else { %>none<% } %></pre>
</dd>
- <dt><span class="tip" title="Relays that are part of this relay's family
but don't consider this relay to be part of their family."
data-original-title="Alleged Members">Alleged Family Members</span></dt>
+ <dt><span class="tip" title="Relays that are part of this relay's family
but don't consider this relay to be part of their family.">Alleged Family
Members</span></dt>
<dd>
<pre><% if (relay.get('alleged_family') !== null) { %><%
_.each(relay.get('alleged_family'), function(member) { %><% var valid =
member.match(RegExp("^\$[A-F0-9]{40}$")); %>
<% if (valid) { %><a href="#details/<%= member.replace('$', '') %>"
title="Alleged family member" class="alleged"><% } %><%= member %><% if (valid)
{ %></a><% }}); %>
<% } else { %>none<% } %></pre>
</dd>
- <dt><span class="tip" title="What OS and Tor version the relay is using"
data-original-title="Platform">Platform</span></dt>
+ <dt><span class="tip" title="What OS and Tor version the relay is
using">Platform</span></dt>
<dd><%= _.escape(relay.get('platform')) %></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>
+ <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.">Consensus Weight</span></dt>
<dd><%= relay.get('consensus_weight') %></dd>
</dl>
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
