From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 11 Oct 2006 16:25:29 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20061011162529.31931.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-10-11 16:25:28

Modified files:
	luci/cluster   : form-macros 

Log message:
	fixes for cluster and node creation busywait page

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

--- conga/luci/cluster/form-macros	2006/10/09 17:12:28	1.79
+++ conga/luci/cluster/form-macros	2006/10/11 16:25:28	1.80
@@ -18,9 +18,39 @@
 		<tr><td>
 			<img src="100wait.gif"/>
 		</td></tr>
-		<tr><td>
-			<h2><span tal:content="isBusy/desc" /></h2>
-		</td></tr>
+    <span tal:define="global nodereports isBusy/nodereports"/>
+    <span tal:repeat="nodereport nodereports">
+		 <tr><td>
+      <span tal:condition="python: nodereport['isnodecreation'] == False">
+			  <h2><span tal:content="nodereport/desc" /></h2>
+      </span>
+      <span tal:condition="python: nodereport['isnodecreation'] == True">
+       <span tal:condition="python: nodereport['iserror'] == True">
+			  <h2><span tal:content="nodereport/desc" /></h2>
+         <font color="red"><span tal:content="nodereport/errormessage"/></font>
+       </span>
+       <span tal:condition="python: nodereport['iserror'] == False">
+			  <h2><span tal:content="nodereport/desc" /></h2>
+         <i><span tal:content="nodereport/statusmessage"/></i><br/>
+          <span tal:condition="python: nodereport['statusindex'] == 0">
+           <img src="notstarted.png"/>
+          </span>
+          <span tal:condition="python: nodereport['statusindex'] == 1">
+           <img src="installed.png"/>
+          </span>
+          <span tal:condition="python: nodereport['statusindex'] == 2">
+           <img src="rebooted.png"/>
+          </span>
+          <span tal:condition="python: nodereport['statusindex'] == 3">
+           <img src="configured.png"/>
+          </span>
+          <span tal:condition="python: nodereport['statusindex'] == 4">
+           <img src="joined.png"/>
+          </span>
+       </span>
+      </span>
+		 </td></tr>
+    </span>
 	</table>
 </div>