[tor-commits] [atlas/master] Move the relay and bridge status next to its name

[irl at torproject.org]

commit 940fa902df5bf55d9ef3b11a6598b58afe7907c2
Author: cypherpunks <cypherpunks at torproject.org>
Date:   Mon Apr 17 13:41:59 2017 +0000

    Move the relay and bridge status next to its name
    
    Closes #21752.
---
 templates/details/bridge.html | 19 ++++++++-----------
 templates/details/router.html | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/templates/details/bridge.html b/templates/details/bridge.html
index 4d4d666..4ca0f96 100644
--- a/templates/details/bridge.html
+++ b/templates/details/bridge.html
@@ -1,11 +1,11 @@
-<h1>Details for: <span id="relay_name"><%= relay.get('nickname') %></span></h1>
-<!-- div class="subnav">
-    <ul class="nav nav-pills">
-        <li><a href="#general">General</a></li>
-        <li><a href="#graphs">Graphs</a></li>
-        <li><a href="#misc">Misc</a></li>
-    </ul>
-</div-->
+<h1>
+    Details for: <%= relay.get('nickname') %>
+    <% if (relay.get('running') === false) { %>
+    <img class="tip" src="img/properties/offline_16x16.png" alt="Offline" title="This bridge is offline."/>
+    <% } else { %>
+    <img class="tip" src="img/properties/online_16x16.png" alt="Running" title="This bridge is running."/>
+    <% } %>
+</h1>
 
 <h2>General <small>Overall information on the Tor bridge</small></h2>
 <hr/>
@@ -88,9 +88,6 @@
     <dd><%= relay.get('uptime_hrfull') %></dd>
     <% } %>
 
-    <dt><span class="tip" title="Whether this bridge is listed in the current Tor directory or not." data-original-title="Running">Running</span></dt>
-    <dd><%= relay.get('running') %></dd>
-
     </dl>
     </div>
 </div>
diff --git a/templates/details/router.html b/templates/details/router.html
index c915a51..e66c5a0 100644
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@ -1,11 +1,11 @@
-<h1>Details for: <span id="relay_name"><%= relay.get('nickname') %></span></h1>
-<!-- div class="subnav">
-    <ul class="nav nav-pills">
-        <li><a href="#general">General</a></li>
-        <li><a href="#graphs">Graphs</a></li>
-        <li><a href="#misc">Misc</a></li>
-    </ul>
-</div-->
+<h1>
+    Details for: <%= relay.get('nickname') %>
+    <% if (relay.get('running') === false) { %>
+    <img class="tip" src="img/properties/offline_16x16.png" alt="Offline" title="This relay is offline."/>
+    <% } else { %>
+    <img class="tip" src="img/properties/online_16x16.png" alt="Running" title="This relay is running."/>
+    <% } %>
+</h1>
 
 <h2>General <small>Overall information on the Tor relay</small></h2>
 <hr/>
@@ -142,9 +142,6 @@
     <dd><%= relay.get('uptime_hrfull') %></dd>
     <% } %>
 
-    <dt><span class="tip" title="Whether this relay is listed in the current Tor directory or not." data-original-title="Running">Running</span></dt>
-    <dd><%= relay.get('running') %></dd>
-
     </dl>
     </div>
 </div>