[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 20:04:38

Modified files:
	luci/cluster   : form-macros 

Log message:
	div check2

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

--- conga/luci/cluster/form-macros	2006/08/13 18:46:11	1.38
+++ conga/luci/cluster/form-macros	2006/08/13 19:04:38	1.39
@@ -521,31 +521,29 @@
 		First table row is status icon, name, and dropdown
 		Second row is daemon macro and failoverdom membership
 		Third row is fencing macro
-		Fourth row is logging
 	</tal:comment>
 
-	<table tal:define="
+	<div tal:define="
 		global ricci_agent python:here.getRicciAgentForCluster(request);
 		global nodestatus python:here.getClusterStatus(ricci_agent);
 		global nodeinfo python:here.getNodeInfo(modelb, nodestatus, request)">
 
-		<tr tal:condition="python:nodeinfo['nodestate'] == '0'">
-			<td>
+		<div tal:condition="python:nodeinfo['nodestate'] == '0'">
+			<div style="margin-left: .0em;">
 				<img src="node_active.png"/>
-			</td>
-
-			<td style="horizontal-align:left;">
-				<table>
+			  <div style="margin-left:100px">
+				 <table>
 					<tr><td>
 						<h2 style="border:0px;">Node name: <span tal:content="nodeinfo/nodename"/></h2>
 					</td></tr>
 					<tr style="horizontal-align:left;"><td>
 						<h2 style="border:0px;">Status: <font color="green">Cluster member</font>
 					</td></tr>
-				</table>
-			</td>
+				 </table>
+			  </div>
+			</div>
 
-			<td style="margin:15px; vertical-align:top">
+			<div style="margin:15px; vertical-align:top">
 			<form method="post" onSubmit="return dropdown(this.gourl)">
 				<select name="gourl">
 					<option value="">Choose a Task...</option>
@@ -558,10 +556,10 @@
 				</select>
 				<input type="submit" value="Go"/>
 			</form>
-			</td>
-		</tr>
+			</div>
+		</div>
 
-		<tr tal:condition="python:nodeinfo['nodestate'] == '1'">
+		<div tal:condition="python:nodeinfo['nodestate'] == '1'">
 			<td>
 				<img src="node_inactive.png"/>
 			</td>
@@ -591,9 +589,9 @@
 					<input type="submit" value="Go"/>
 				</form>
 			</td>
-		</tr>
+		</div>
 
-		<tr tal:condition="python:nodeinfo['nodestate'] == '2'">
+		<div tal:condition="python:nodeinfo['nodestate'] == '2'">
 			<td>
 				<img src="node_unknown.png"/>
 			</td>
@@ -605,7 +603,7 @@
 			<td style="margin:10px;padding:10px;">
 				<h2 style="border:0px;">Status: <font color="gray">This node is not responding</font>
 			</td>
-		</tr>
+		</div>
 
 		<tr><td>
 			<table border="1px">
@@ -623,7 +621,7 @@
 			</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>
+	</div>
     <hr/>
 		<div style="padding:10px;margin:10px">
 							<h2 style="border:0px;">Services on this Node:</h2>