[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 15:38:30

Modified files:
	luci/cluster   : form-macros 

Log message:
	icon for fdoms

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

--- conga/luci/cluster/form-macros	2006/08/13 13:49:33	1.31
+++ conga/luci/cluster/form-macros	2006/08/13 14:38:30	1.32
@@ -637,36 +637,52 @@
 					<tr style="padding:10px;margin:10px;border-width:0px;">
 						<td style="padding:10px;margin:10px;border-width:0px;">
               <span tal:condition="python:nd['status'] == '0'">
-							  <h1 style="border:0px;">Node Name: <a href="" tal:attributes="href nd/cfgurl">
+							  <h1 style="border:0px;">Node Name: <a href="" tal:attributes="href nd/configurl">
                   <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">
+							  <h1 style="border:0px;">Node Name: <a href="" tal:attributes="href nd/configurl">
                   <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">
+							  <h1 style="border:0px;">Node Name: <a href="" tal:attributes="href nd/configurl">
                   <font color="gray"><span tal:content="nd/nodename"/></font></a>
                 </h1>
               </span>
 						</td>
-
+            <span tal:condition="python:nodeinfo['nodestate'] == '0'">
 						<td style="margin:10px">
 							<form method="post" onSubmit="return dropdown(this.gourl)">
 								<select name="gourl">
 									<option value="">Choose a Task...</option>
-									<option value="">Have node leave cluster</option>
-									<option value="">Stop all cluster services</option>
+									<option value="" tal:attributes="value nodeinfo/jl_url">Have node leave cluster</option>
 									<option value="">----------</option>
-									<option value="">Fence this node</option>
-									<option value="">Reboot this node</option>
+									<option value="" tal:attributes="value nodeinfo/fence_it_url">Fence this node</option>
+									<option value="" tal:attributes="value nodeinfo/reboot_url">Reboot this node</option>
 									<option value="">----------</option>
-									<option value="">Delete</option>
+									<option value="" tal:attributes="value nodeinfo/delete_url">Delete</option>
 								</select>
 								<input type="submit" value="Go"/>
 							</form>
 						</td>
+            </span>
+            <span tal:condition="python:nodeinfo['nodestate'] == '1'">
+						<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 nodeinfo/jl_url">Have node join cluster</option>
+									<option value="">----------</option>
+									<option value="" tal:attributes="value nodeinfo/fence_it_url">Fence this node</option>
+									<option value="" tal:attributes="value nodeinfo/reboot_url">Reboot this node</option>
+									<option value="">----------</option>
+									<option value="" tal:attributes="value nodeinfo/delete_url">Delete</option>
+								</select>
+								<input type="submit" value="Go"/>
+							</form>
+						</td>
+            </span>
 						<td style="width:30%; text-align:right;">
 							<h3><a href="" tal:attributes="href nd/fenceurl">Manage Fencing for this Node</a></h3>
 						</td>
@@ -692,11 +708,16 @@
 						</td>
 						<td style="width:30%;text-align:right">
 							<h3>Failover Domain Membership: </h3>
+              <span tal:condition="python:len(nd['fdoms']) == 0">
+               <h4><i>This node has no failover domain membership</i></h4>
+              </span>
+              <span tal:condition="python:len(nd['fdoms']) > 0">
 							<ul>
-								<li tal:repeat="fdom nd/fdoms">
+								<li style="list-style-image: url(small_fdom.png);" tal:repeat="fdom nd/fdoms">
 									<a href="" tal:attributes="href fdom/fdomurl"><span tal:content="fdom/name"/></a>
 								</li>
 							</ul>
+              </span>
 						</td>
 					</tr>
 				</table>