[Cluster-devel] conga/luci/cluster form-macros

[jparsons at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-07-21 17:16:50

Modified files:
	luci/cluster   : form-macros 

Log message:
	added links in cluster list

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

--- conga/luci/cluster/form-macros	2006/07/21 14:49:46	1.7
+++ conga/luci/cluster/form-macros	2006/07/21 17:16:50	1.8
@@ -34,26 +34,34 @@
        <tr width="100%" STYLE="border-bottom: blue 3px groove;">
         <td width="100%" STYLE="border-bottom: #8cacbb 3px solid;">
          <table width="800px">
-          <tr STYLE="padding:10px;margin:10px;border-width:0px;"><td STYLE="padding:10px;margin:10px;border-width:0px;"><h1 STYLE="border:0px;">Cluster Name: <span tal:content="cstatus/clustername"/></h1></td>
+          <tr STYLE="padding:10px;margin:10px;border-width:0px;">
+            <span tal:condition="python:cstatus['running'] == 'true'">
+            <td STYLE="padding:10px;margin:10px;border-width:0px;"><h1 STYLE="border:0px;">Cluster Name: <a href="" tal:attributes="href cstatus/clucfg"><font color="green"><span tal:content="cstatus/clusteralias"/></font></a></h1></td>
+            </span>
+            <span tal:condition="python:cstatus['running'] == 'false'">
+            <td STYLE="padding:10px;margin:10px;border-width:0px;"><h1 STYLE="border:0px;">Cluster Name: <a href="" tal:attributes="href cstatus/clucfg"><font color="red"><span tal:content="cstatus/clusteralias"/></font></a></h1></td>
+            </span>
             <td STYLE="margin:10px"><form METHOD=POST onSubmit="return dropdown(this.gourl)">
               <SELECT NAME="gourl">
                <span tal:condition="python:cstatus['running'] == 'true'">
                <OPTION VALUE="">This cluster is running...</OPTION>
                <OPTION VALUE=""><font color="red">Stop this cluster</font></OPTION>
+               <OPTION VALUE="">Restart this cluster</OPTION>
                </span>
                <span tal:condition="python:cstatus['running'] == 'false'">
                <OPTION VALUE="">This cluster is stopped...</OPTION>
                <OPTION VALUE=""><font color="green">Start this cluster</font></OPTION>
+               <OPTION VALUE="">Restart this cluster</OPTION>
                </span>
               </SELECT>
               <INPUT TYPE=SUBMIT VALUE="Go"/>
              </FORM>
             </td>
-            <td STYLE="width:30%; text-align:right;"><h1 STYLE="border:0px;">Pretty Name: <span tal:content="cstatus/clusteralias"/></h1></td>
        </tr>
-       <tr STYLE="padding:10px;margin:10px"><td STYLE="padding:10px;margin:10px"><h2 STYLE="border:0px;">Status:  <i><span tal:content="cstatus/status"/></i></h2></td>
-                                            <td STYLE="padding:10px;margin:10px"><h2 STYLE="border:0px;">Total Cluster Votes:  <i><span tal:content="cstatus/votes"/></i></h2></td>
-                                            <td STYLE="padding:10px;margin:10px"><h2 STYLE="border:0px;">Minimum Required Quorum:  <i><span tal:content="cstatus/minquorum"/></i></h2></td>
+       <tr STYLE="padding:10px;margin:10px">
+            <td STYLE="padding:10px;margin:10px"><h2 STYLE="border:0px;">Status:  <i><span tal:content="cstatus/status"/></i></h2></td>
+            <td STYLE="padding:10px;margin:10px"><h2 STYLE="border:0px;">Total Cluster Votes:  <i><span tal:content="cstatus/votes"/></i></h2></td>
+            <td STYLE="padding:10px;margin:10px"><h2 STYLE="border:0px;">Minimum Required Quorum:  <i><span tal:content="cstatus/minquorum"/></i></h2></td>
        </tr>
        <tr STYLE="padding:10px;margin:10px"><td STYLE="padding:10px;margin:10px"><h2 STYLE="border:0px;">Nodes:</h2>  <ul>
           <span tal:repeat="nd cstatus/currentnodes">
@@ -220,6 +228,8 @@
 	</form>
   </div>
   <div metal:define-macro="clusterconfig-form">
+  <!-- <span tal:define="global ricci_agent python:here.getRicciAgentForCluster(request)"/> -->
+  <!-- <span tal:define="global clusterinfo python:here.getClusterInfo(modelb, request)"/> -->
    <h2>Cluster Configuration Form</h2>
   </div>
   <div metal:define-macro="node-form">