commit 7e62f64cc80770b08d0a47178c358e8d3dccd5fe Author: cypherpunks <cypherpunks@torproject.org> Date: Mon Apr 17 13:58:24 2017 +0000 Merge the current status and properties columns Moving the relay and bridge status next to its name made the current status column contain a single item (the uptime or downtime). Because this is a waste of screen space the current status column is merged into the properties column. The merge includes some reordering to ensure the fingerprint of the relay and bridge is always the first item. --- templates/details/bridge.html | 33 +++++++++++++-------------------- templates/details/router.html | 33 +++++++++++++-------------------- 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/templates/details/bridge.html b/templates/details/bridge.html index 4ca0f96..dae5a6b 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -11,7 +11,7 @@ <hr/> <div class="row"> - <div class="span4"> + <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> @@ -28,20 +28,27 @@ </div> - <div class="span4"> + <div class="span6"> <% if (relay.get('running') === true) { %> <h3>Properties</h3> - <dl> <% } else { %> <h3>Last Known Properties</h3> - <dl> - <dt><span class="tip" title="Timestamp when the bridge was last seen in the consensus." data-original-title="Last seen">Last Seen</span></dt> - <dd><%= relay.get('last_seen') %></dd> <% } %> + <dl> <dt><span class="tip" title="Hash of 20-byte unique identifier of the bridge." data-original-title="Hashed Fingerprint">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> + <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> + <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> + <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> <dd><% _.each(relay.get('flags'), function(flag) { %> <span class="tip flags" title="<%= flag[2] %>"> @@ -76,20 +83,6 @@ </dl> </div> - <div class="span4"> - <h3>Current Status</h3> - <dl> - - <% if (relay.get('running') === false) { %> - <dt><span class="tip" title="The time since this bridge was last seen online." data-original-title="Downtime">Downtime</span></dt> - <dd><%= relay.get('downtime') %></dd> - <% } else {%> - <dt><span class="tip" title="The time since this bridge is online." data-original-title="Uptime">Uptime</span></dt> - <dd><%= relay.get('uptime_hrfull') %></dd> - <% } %> - - </dl> - </div> </div> <div class="row"> diff --git a/templates/details/router.html b/templates/details/router.html index e66c5a0..5ffec67 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -11,7 +11,7 @@ <hr/> <div class="row"> - <div class="span4"> + <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> @@ -60,20 +60,27 @@ </div> - <div class="span4"> + <div class="span6"> <% if (relay.get('running') === true) { %> <h3>Properties</h3> - <dl> <% } else { %> <h3>Last Known Properties</h3> - <dl> - <dt><span class="tip" title="Timestamp when the relay was last seen in the consensus." data-original-title="Last seen">Last Seen</span></dt> - <dd><%= relay.get('last_seen') %></dd> <% } %> + <dl> <dt><span class="tip" title="20-byte unique identifier of the relay." data-original-title="Fingerprint">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> + <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> + <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> + <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> <dd><% _.each(relay.get('flags'), function(flag) { %> <span class="tip flags" title="<%= flag[2] %>"> @@ -130,20 +137,6 @@ </dl> </div> - <div class="span4"> - <h3>Current Status</h3> - <dl> - - <% if (relay.get('running') === false) { %> - <dt><span class="tip" title="The time since this relay was last seen online." data-original-title="Downtime">Downtime</span></dt> - <dd><%= relay.get('downtime') %></dd> - <% } else {%> - <dt><span class="tip" title="The time since this relay is online." data-original-title="Uptime">Uptime</span></dt> - <dd><%= relay.get('uptime_hrfull') %></dd> - <% } %> - - </dl> - </div> </div> <div class="row">