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

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	EXPERIMENTAL
Changes by:	rmccabe at sourceware.org	2007-06-12 15:21:46

Modified files:
	luci/cluster   : form-macros index_html 

Log message:
	Fix 239389: conga cluster: make 'enable shared storage' the default

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.198.2.4&r2=1.198.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.32.2.1&r2=1.32.2.2

--- conga/luci/cluster/form-macros	2007/06/07 06:41:04	1.198.2.4
+++ conga/luci/cluster/form-macros	2007/06/12 15:21:46	1.198.2.5
@@ -3701,7 +3701,7 @@
 				<tr class="systemsTable"><td colspan="2" class="systemsTable">
 					<input type="checkbox" name="enable_storage"
 						tal:attributes="
-							checked add_cluster/shared_storage | nothing" />
+							checked add_cluster/shared_storage | string:checked" />
 					Enable Shared Storage Support
 				</td></tr>
 				<tr class="systemsTable"><td colspan="2" class="systemsTable">
@@ -4436,13 +4436,14 @@
 		global global_resources python: here.getResourcesInfo(modelb, request);
 		global sstat python: here.getClusterStatus(request, ricci_agent);
 		global sinfo python: here.getServiceInfo(sstat, modelb, request);
+		global resource_list sinfo/resource_list | python:[];
 		global running sinfo/running | nothing" />
 
 	<tal:block tal:replace="structure python: '<script type='+chr(0x22)+'text/javascript'+chr(0x22)+'>'" />
 		var uuid_list = <tal:block tal:replace="sinfo/uuid_list | nothing" />;
 		var global_resources = <tal:block tal:replace="python: map(lambda x: str(x['name']), global_resources) or 'null'" />;
-		var active_resources = <tal:block tal:replace="python: map(lambda x: str(x['name']), sinfo['resource_list']) or 'null'" />;
-		var resource_names = <tal:block tal:replace="python: (map(lambda x: str(x['name']), global_resources) + map(lambda x: str(x['name']), sinfo['resource_list'])) or 'null'" />;
+		var active_resources = <tal:block tal:replace="python: map(lambda x: str(x['name']), resource_list) or 'null'" />;
+		var resource_names = <tal:block tal:replace="python: (map(lambda x: str(x['name']), global_resources) + map(lambda x: str(x['name']), resource_list)) or 'null'" />;
 	<tal:block tal:replace="structure string: </script>" />
 </div>
 
@@ -4550,7 +4551,7 @@
 	</div>
 
 	<div class="service_comp_list" tal:attributes="id sinfo/root_uuid">
-	<div tal:repeat="res sinfo/resource_list"
+	<div tal:repeat="res resource_list"
 		tal:attributes="
 			class python: 'service_comp rc_indent' + str(res['indent_ctr']);
 			id python: res['uuid']">
--- conga/luci/cluster/index_html	2007/06/07 06:41:05	1.32.2.1
+++ conga/luci/cluster/index_html	2007/06/12 15:21:46	1.32.2.2
@@ -38,14 +38,7 @@
 				resmap python:here.getClusterOS(ri_agent);
 				global isVirtualized resmap/isVirtualized | nothing;
 				global os_version resmap/os | nothing;
-				global isBusy python:here.isClusterBusy(request);
-				global firsttime request/busyfirst | nothing" />
-
-			<tal:block tal:condition="firsttime">
-				<tal:block tal:define="global busywaiting python:True" />
-				<meta http-equiv="refresh"
-					tal:attributes="content isBusy/refreshurl | string:." />
-			</tal:block>
+				global isBusy python:here.isClusterBusy(request)" />
 
 			<tal:block tal:define="global busy isBusy/busy | nothing" />
 
@@ -233,23 +226,6 @@
               </metal:block>
             </td>
             <tal:comment replace="nothing"> End of main content block </tal:comment>
-
-<!--
-            <tal:comment replace="nothing"> Start of right column </tal:comment>
-            <td id="portal-column-two"
-                metal:define-slot="column_two_slot"
-                tal:condition="sr">
-              <div class="visualPadding">
-                <metal:portlets define-slot="portlets_two_slot">
-                  <metal:rightportlets use-macro="here/portlets_fetcher/macros/right_column">
-                    This instruction gets the portlets (boxes) for the right column.
-                  </metal:rightportlets>
-                </metal:portlets>
-                 
-              </div>
-            </td>
-            <tal:comment replace="nothing"> End of the right column </tal:comment>
--->
           </tr>
         </tbody>
       </table>