From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 13 Aug 2006 18:35:22 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20060813183522.20315.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-08-13 19:35:22

Modified files:
	luci/cluster   : form-macros 

Log message:
	Fix some problems in node-info

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

--- conga/luci/cluster/form-macros	2006/08/13 16:16:17	1.35
+++ conga/luci/cluster/form-macros	2006/08/13 18:35:21	1.36
@@ -622,7 +622,39 @@
 				</tr>
 			</table>
 		</td></tr>
+          <tr><td><a href="" tal:attributes="href nodeinfo/logurl" onClick="return popup_log(this, 'notes')">Show recent log activity for this node</a></td></tr>
 	</table>
+    <hr/>
+		<div style="padding:10px;margin:10px">
+							<h2 style="border:0px;">Services on this Node:</h2>
+              <span tal:condition="python:len(nodeinfo['currentservices']) == 0">
+                <h3><i>No cluster services are currently running here</i></h3>
+              </span>
+              <span tal:condition="python:len(nodeinfo['currentservices']) > 0">
+							<ul>
+								<li style="list-style-image: url(small_svc.png);" tal:repeat="svc nodeinfo/currentservices">
+									<a href="" tal:attributes="href svc/svcurl"><font color="green"><span tal:replace="svc/servicename"/></font></a>
+								</li>
+							</ul>
+              </span>
+			</div>
+  <hr/>
+  <h3>Failover Domain Membership</h3>
+    <div class=fdomblock>
+							<h3>Failover Domain Membership: </h3>
+              <span tal:condition="python:len(nodeinfo['fdoms']) == 0">
+               <h4><i>This node has no failover domain membership</i></h4>
+              </span>
+              <span tal:condition="python:len(nodeinfo['fdoms']) > 0">
+							<ul>
+								<li style="list-style-image: url(small_fdom.png);" tal:repeat="fdom nodeinfo/fdoms">
+									<a href="" tal:attributes="href fdom/fdomurl"><span tal:content="fdom/name"/></a>
+								</li>
+							</ul>
+              </span>
+     </div>
+  <hr/>
+  <h3>Fencing</h3>
 </div>
 
 <div metal:define-macro="nodes-form">
@@ -720,7 +752,7 @@
               </span>
 						</td>
 					</tr>
-          <tr><td><a href="" tal:attributes="href nd/logurl" onClick="return popup_log(this, 'notes')">Show recent log activity for this node</a>
+          <tr><td><a href="" tal:attributes="href nd/logurl" onClick="return popup_log(this, 'notes')">Show recent log activity for this node</a></td></tr>
 				</table>
 			</td>
 		</tr>