[Cluster-devel] conga/luci/cluster form-macros

[jparsons@sourceware.org <jparsons@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-08-13 14:49:33

Modified files:
	luci/cluster   : form-macros 

Log message:
	node list fixes

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.30&r2=1.31

--- conga/luci/cluster/form-macros	2006/08/12 17:52:26	1.30
+++ conga/luci/cluster/form-macros	2006/08/13 13:49:33	1.31
@@ -636,14 +636,26 @@
 				<table width="800px">
 					<tr style="padding:10px;margin:10px;border-width:0px;">
 						<td style="padding:10px;margin:10px;border-width:0px;">
-							<h1 style="border:0px;">Node Name: <span tal:content="nd/nodename"/></h1>
+              <span tal:condition="python:nd['status'] == '0'">
+							  <h1 style="border:0px;">Node Name: <a href="" tal:attributes="href nd/cfgurl">
+                  <font color="green"><span tal:content="nd/nodename"/></font></a>
+                </h1>
+              </span>
+              <span tal:condition="python:nd['status'] == '1'">
+							  <h1 style="border:0px;">Node Name: <a href="" tal:attributes="href nd/cfgurl">
+                  <font color="red"><span tal:content="nd/nodename"/></font></a></h1>
+              </span>
+              <span tal:condition="python:nd['status'] == '2'">
+							  <h1 style="border:0px;">Node Name: <a href="" tal:attributes="href nd/cfgurl">
+                  <font color="gray"><span tal:content="nd/nodename"/></font></a>
+                </h1>
+              </span>
 						</td>
 
 						<td style="margin:10px">
 							<form method="post" onSubmit="return dropdown(this.gourl)">
 								<select name="gourl">
 									<option value="">Choose a Task...</option>
-									<option value="" tal:attributes="value nd/configurl">Configure</option>
 									<option value="">Have node leave cluster</option>
 									<option value="">Stop all cluster services</option>
 									<option value="">----------</option>
@@ -661,17 +673,22 @@
 					</tr>
 
 					<tr style="padding:10px;margin:10px"><td style="padding:10px;margin:10px">
-						<h2 style="border:0px;">Status: <i><span tal:content="nd/status"/></i></h2>
+						<h2 style="border:0px;">Status: <i><span tal:content="nd/status_str"/></i></h2>
 					</td></tr>
 
 					<tr style="padding:10px;margin:10px">
 						<td style="padding:10px;margin:10px">
-							<h2 style="border:0px;">Currently Hosting:</h2>
+							<h2 style="border:0px;">Services on this Node:</h2>
+              <span tal:condition="python:len(nd['currentservices']) == 0">
+                <h3><i>No cluster services are currently running here</i></h3>
+              </span>
+              <span tal:condition="python:len(nd['currentservices']) > 0">
 							<ul>
-								<li tal:repeat="svc nd/currentservices">
-									<a href="" tal:attributes="href svc/svcurl"><span tal:replace="svc/servicename"/></a>
+								<li style="list-style-image: url(small_svc.png);" tal:repeat="svc nd/currentservices">
+									<a href="" tal:attributes="href svc/svcurl"><font color="green"><span tal:replace="svc/servicename"/></font></a>
 								</li>
 							</ul>
+              </span>
 						</td>
 						<td style="width:30%;text-align:right">
 							<h3>Failover Domain Membership: </h3>