[prev in list] [next in list] [prev in thread] [next in thread] 

List:       luci-commits
Subject:    [Luci-commits] [luci] Add back the node uptime column now that it's being displayed for all nodes
From:       rmccabe () fedoraproject ! org (rmccabe)
Date:       2010-09-29 18:43:32
Message-ID: 20100929184332.36206120332 () lists ! fedorahosted ! org
[Download RAW message or body]

commit 9a74cc27542e6ae00ca85487f770ec6266fe00b7
Author: Ryan McCabe <rmccabe at redhat.com>
Date:   Wed Sep 29 14:43:07 2010 -0400

    Add back the node uptime column now that it's being displayed for all nodes

 luci/templates/node.html |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/luci/templates/node.html b/luci/templates/node.html
index 02e5537..1c0489d 100644
--- a/luci/templates/node.html
+++ b/luci/templates/node.html
@@ -65,6 +65,7 @@
           <th class="node_tlist_id">Node ID</th>
           <th class="node_tlist_votes">Votes</th>
           <th class="node_tlist_status">Status</th>
+          <th class="node_tlist_uptime">Uptime</th>
           <th class="node_tlist_ip">Hostname</th>
         </tr>
       </thead>
@@ -95,6 +96,7 @@
           <td class="node_tlist_id">${nodeobj and nodeobj.getID()}</td>
           <td class="node_tlist_votes">${nodeobj and nodeobj.getVotes()}</td>
           <td class="node_tlist_status">${_('Cluster Member')}</td>
+          <td class="node_tlist_uptime">${node_data and node_data.uptime_str}</td>
           </py:when>
           <!--! 2) Node is inactive. -->
           <py:when test="'false'">
@@ -109,6 +111,7 @@
           <td class="node_tlist_id">${nodeobj and nodeobj.getID()}</td>
           <td class="node_tlist_votes">${nodeobj and nodeobj.getVotes()}</td>
           <td class="node_tlist_status">${_('Not a cluster member')}</td>
+          <td class="node_tlist_uptime">${node_data and node_data.uptime_str}</td>
           </py:when>
           <!--! 3) Status of the node is unknown. -->
           <py:when test="'unknown'">
@@ -123,6 +126,7 @@
           <td class="node_tlist_id">${nodeobj and nodeobj.getID()}</td>
           <td class="node_tlist_votes">${nodeobj and nodeobj.getVotes()}</td>
           <td class="node_tlist_status">${_('The status of this node is unknown')}</td>
+          <td class="node_tlist_uptime">${node_data and node_data.uptime_str}</td>
           </py:when>
           <py:when test="'Removing'">
           <td class="icon">
@@ -136,6 +140,7 @@
           <td class="node_tlist_id">${nodeobj and nodeobj.getID()}</td>
           <td class="node_tlist_votes">${nodeobj and nodeobj.getVotes()}</td>
           <td class="node_tlist_status">${_('Node is being removed')}</td>
+          <td class="node_tlist_uptime"></td>
           </py:when>
           </py:choose>
           <td class="node_tlist_ip">
@@ -158,6 +163,7 @@
           <td class="node_tlist_id"></td>
           <td class="node_tlist_votes"></td>
           <td class="node_tlist_status">${_('This node is currently being added')}</td>
+          <td class="node_tlist_uptime"></td>
         </py:if>
         </tr>
         </py:if>

[prev in list] [next in list] [prev in thread] [next in thread]