Style node names consistently on the Overview page

Regardless whether it's one node or many, we want the same style

[#151455442]

deps/rabbitmq_management/priv/www/css/main.css

@@ -1,5 +1,5 @@
 body { font: 12px Verdana, sans-serif; color: #484848; padding: 8px 35px; }
-input, button { font: 12px Verdana, sans-serif; }
+input, button, a.button { font: 12px Verdana, sans-serif; }
 
 #login table { margin: auto; }
 #login p { text-align: center; }
@@ -22,10 +22,8 @@ input, button { font: 12px Verdana, sans-serif; }
 #menu a { color: #444; font-weight: bold; text-decoration: none; padding: 5px; }
 #menu a:hover { background-color: #444; color: white; -moz-border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0; }
 #menu a.selected { background-color: #F60; color: white; -moz-border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0; }
-#main a { color: #F60; font-weight: bold; text-decoration: none; }
-#main table th a { color: black; }
-#main table td a { font-weight: normal; }
-#main a:hover { text-decoration: underline; }
+a { color: #F60; text-decoration: none; }
+a:hover { text-decoration: underline; }
 #vhost-form { float: right; padding: 0; margin: 0; }
 
 #main.with-rhs { margin-right: 210px; }
@@ -92,8 +90,8 @@ table.list { border-width: 1px; margin-bottom: 1em; }
 table.list th, table.list td { border: 1px solid #ccc; }
 table.list th { text-align: left; }
 table.list th.plus-minus { border: none; min-width: 2em; }
-table.list td a { display: block; width: 100%; }
-table.list th a.sort { display: block; width: 100%; cursor: pointer; }
+table.list td a { display: block; }
+table.list th a.sort { display: block; width: 100%; cursor: pointer; color: black; font-weight: bold; }
 table.list th a.sort .arrow { color: #F60; }
 table.list td p { margin: 0; padding: 1px 0 0 0; }
 table.list td p.warning { margin: 0; padding: 5px; }
@@ -297,20 +295,21 @@ label.radio, label.checkbox { padding: 5px; border: 1px solid #eee; cursor: poin
 table.two-col-layout { width: 100%; }
 table.two-col-layout > tbody > tr > td { width: 50%; vertical-align: top; }
 
-input[type=submit], button { padding: 8px; border-radius: 5px; -moz-border-radius: 5px; text-decoration: none; cursor: pointer; }
-table.list input[type=submit], table.list button { padding: 3px 7px; margin: 0 0 3px 0; }
+input[type=submit], button, a.button { padding: 8px; border-radius: 5px; -moz-border-radius: 5px; text-decoration: none; cursor: pointer; }
+table.list input[type=submit], table.list button, table.list a.button { padding: 3px 7px; margin: 0 0 3px 0; }
 
-input[type=submit], button {
+input[type=submit], button, a.button {
     background: #F60;
-    color: white;
+    color: white !important;
     border: 0;
 }
-input[type=submit]:hover, button:hover {
+input[type=submit]:hover, button:hover, a.button:hover {
     background: #444;
+    text-decoration: none !important;
 }
 
-input[type=submit][disabled], button[disabled] { background: #aac; }
-input[type=submit][disabled]:hover, button[disabled]:hover { background: #aac; }
+input[type=submit][disabled], button[disabled] { background: #444; }
+input[type=submit][disabled]:hover, button[disabled]:hover { background: #444; }
 
 h3 { padding: 0 0 2px 0; margin: 1em 0 1em 0; font-size: 1em; border-bottom: 1px solid #E4E4E4; font-weight: normal; }
 

deps/rabbitmq_management/priv/www/js/tmpl/node.ejs

@@ -32,9 +32,38 @@
        <% } %>
       </td>
     </tr>
+    <tr>
+      <th>
+        <a href="http://www.rabbitmq.com/configure.html" target="_blank">Config file</a>
+      </th>
+      <td>
+  <%
+     for (var i = 0; i < node.config_files.length; i++) {
+       var config = node.config_files[i];
+  %>
+        <code><%= config %></code>
+  <% } %>
+      </td>
+    </tr>
+    <tr>
+      <th>Database directory</th>
+      <td>
+        <code><%= node.db_dir %></code>
+      </td>
+    </tr>
+    <tr>
+      <th>Log file</th>
+      <td>
+        <code><%= node.log_file %></code>
+      </td>
+    </tr>
+    <tr>
+      <th>SASL log file</th>
+      <td>
+        <code><%= node.sasl_log_file %></code>
+      </td>
+    </tr>
   </table>
-
-  <%= format('paths', {node: node}) %>
   </div>
 </div>
 </div>

deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs

@@ -64,23 +64,13 @@
 
 <% if (user_monitor) { %>
 <div class="section">
-<% if (nodes.length == 1) { %>
-<h2>Node</h2>
-<% } else { %>
 <h2>Nodes</h2>
-<% } %>
 
 <div class="hider updatable">
-<% if (nodes.length == 1) { %>
-    <p>Node: <%= fmt_node(nodes[0].name) %> (<a href="#/nodes/<%= esc(nodes[0].name) %>">more node stats</a>)</p>
-<% } %>
 
 <table class="list">
   <tr>
-<% if (nodes.length > 1) { %>
     <th>Name</th>
-<% } %>
-
   <% if (show_column('overview', 'file_descriptors')) { %>
     <th>File descriptors <span class="help" id="file-descriptors"></span></th>
   <% } %>
@@ -114,15 +104,12 @@
                    group_count('overview', 'General', []);
 %>
    <tr<%= alt_rows(i)%>>
-<% if (nodes.length > 1) { %>
      <td>
-       <%= fmt_node(node.name) %>
-       <%= _link_to('more stats', '#/nodes/' + esc(node.name)) %>
+       <a href="#/nodes/<%= esc(node.name) %>" class="button"><%= fmt_node(node.name) %></a>
        <% if (rabbit_versions_interesting) { %>
          <sub>RabbitMQ <%= fmt_rabbit_version(node.applications) %></sub>
        <% } %>
      </td>
-<% } %>
 <% if (!node.running) { %>
      <td colspan="<%= colspan %>">
        <div class="status-red">
@@ -211,11 +198,6 @@
 <% } %>
 </table>
 
-<% if (nodes.length == 1 && nodes[0].os_pid != undefined) { %>
-    <h3>Paths</h3>
-    <%= format('paths', {node: nodes[0]}) %>
-<% } %>
-
 </div>
 </div>
 

deps/rabbitmq_management/priv/www/js/tmpl/paths.ejs

@@ -1,33 +0,0 @@
-<table class="facts facts-l">
-  <tr>
-    <th>
-      <a href="http://www.rabbitmq.com/configure.html" target="_blank">Config file</a>
-    </th>
-    <td>
-<%
-   for (var i = 0; i < node.config_files.length; i++) {
-     var config = node.config_files[i];
-%>
-      <code><%= config %></code>
-<% } %>
-    </td>
-  </tr>
-  <tr>
-    <th>Database directory</th>
-    <td>
-      <code><%= node.db_dir %></code>
-    </td>
-  </tr>
-  <tr>
-    <th>Log file</th>
-    <td>
-      <code><%= node.log_file %></code>
-    </td>
-  </tr>
-  <tr>
-    <th>SASL log file</th>
-    <td>
-      <code><%= node.sasl_log_file %></code>
-    </td>
-  </tr>
-</table>