From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 26 Jul 2007 20:31:06 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20070726203106.7046.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
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-07-26 20:31:06

Modified files:
	luci/cluster   : form-macros 

Log message:
	Allow fence devices to be configured for nodes that are unresponsive

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.90.2.26&r2=1.90.2.27

--- conga/luci/cluster/form-macros	2007/07/26 04:16:46	1.90.2.26
+++ conga/luci/cluster/form-macros	2007/07/26 20:31:05	1.90.2.27
@@ -3191,9 +3191,15 @@
 		</tr>
 	</table>
 
-	<tal:block tal:condition="python: not 'ricci_error' in nodeinfo">
 	<hr/>
 
+	<tal:block tal:condition="python: 'ricci_error' in nodeinfo">
+		<strong class="errmsgs">
+			The ricci agent for this node is unresponsive. Node-specific information is not available at this time.
+		</strong>
+	</tal:block>
+
+	<tal:block tal:condition="python: not 'ricci_error' in nodeinfo">
 	<tal:block
 		tal:condition="python: nodeinfo['nodestate'] == '0' or nodeinfo['nodestate'] == '1'">
 
@@ -3244,8 +3250,9 @@
 
 	<input type="hidden" name="pagetype" value="55" />
 	</form>
-	<hr/>
 	</tal:block>
+</tal:block>
+	<hr/>
 
 	<div>
 		<h3>Services on this Node</h3>
@@ -3503,14 +3510,6 @@
 		</tr>
 		</tbody>
 	</table>
-	</tal:block>
-
-	<tal:block tal:condition="python: 'ricci_error' in nodeinfo">
-		<hr/>
-		<strong class="errmsgs">
-			The ricci agent for this node is unresponsive. Node-specific information is not available at this time.
-		</strong>
-	</tal:block>
 </div>
 
 <div metal:define-macro="nodes-form">