* [Cluster-devel] conga/luci/cluster form-macros index_html
@ 2006-11-07 20:28 rmccabe
0 siblings, 0 replies; 4+ messages in thread
From: rmccabe @ 2006-11-07 20:28 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-11-07 20:28:36
Modified files:
luci/cluster : form-macros index_html
Log message:
fixes for model builder disappearing
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.99&r2=1.100
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.25&r2=1.26
--- conga/luci/cluster/form-macros 2006/11/07 01:31:41 1.99
+++ conga/luci/cluster/form-macros 2006/11/07 20:28:36 1.100
@@ -61,18 +61,17 @@
<div id="cluster_list">
<div class="cluster" tal:repeat="clu clusystems">
-
<tal:block tal:define="
- global ragent python: here.getRicciAgent(clu[0])" />
+ global ricci_agent python: here.getRicciAgent(clu[0])" />
- <div tal:condition="python: not ragent">
+ <div tal:condition="python: not ricci_agent">
<strong class="errmsgs">An error occurred when trying to contact any of the nodes in the <span tal:replace="python: clu[0]"/> cluster.</strong>
<hr/>
</div>
- <tal:block tal:condition="python: ragent">
+ <tal:block tal:condition="python: ricci_agent">
<tal:block tal:define="
- global stat python: here.getClusterStatus(ragent);
+ global stat python: here.getClusterStatus(ricci_agent);
global cstatus python: here.getClustersInfo(stat, request);
global cluster_status python: 'cluster ' + (('running' in cstatus and cstatus['running'] == 'true') and 'running' or 'stopped');"
/>
@@ -352,7 +351,13 @@
set_page_title('Luci ??? cluster ??? Configure cluster properties');
</script>
- <span tal:define="global ricci_agent python: here.getRicciAgentForCluster(request)" />
+ <tal:block tal:define="
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block tal:condition="not: exists: modelb">
+ <tal:block tal:define="global modelb python: None" />
+ </tal:block>
+
<tal:block
tal:define="global clusterinfo python: here.getClusterInfo(modelb, request)" />
@@ -361,25 +366,25 @@
<ul class="configTab">
<li class="configTab">
<a tal:attributes="
- href python: request['URL'] + '?pagetype=' + request['pagetype'] + '&clustername=' + request['clustername'] + '&tab=1';
+ href clusterinfo/basecluster_url | nothing;
class python: 'configTab' + (configTabNum == 1 and ' configTabActive' or '');
">General</a>
</li>
<li class="configTab">
<a tal:attributes="
- href python: request['URL'] + '?pagetype=' + request['pagetype'] + '&clustername=' + request['clustername'] + '&tab=2';
+ href clusterinfo/fencedaemon_url | nothing;
class python: 'configTab' + (configTabNum == 2 and ' configTabActive' or '');
">Fence</a>
</li>
<li class="configTab">
<a tal:attributes="
- href python: request['URL'] + '?pagetype=' + request['pagetype'] + '&clustername=' + request['clustername'] + '&tab=3';
+ href clusterinfo/multicast_url | nothing;
class python: 'configTab' + (configTabNum == 3 and ' configTabActive' or '');
">Multicast</a>
</li>
<li class="configTab">
<a tal:attributes="
- href python: request['URL'] + '?pagetype=' + request['pagetype'] + '&clustername=' + request['clustername'] + '&tab=4';
+ href clusterinfo/quorumd_url | nothing;
class python: 'configTab' + (configTabNum == 4 and ' configTabActive' or '');
">Quorum Partition</a>
</li>
@@ -399,7 +404,9 @@
<input type="hidden" name="pagetype"
tal:attributes="value request/pagetype | request/form/pagetype"
/>
- <input type="hidden" name="configtype" value="general" />
+ <input type="hidden" name="configtype" value="general" />
+ <input type="hidden" name="clustername"
+ tal:attributes="value request/clustername | clusterinfo/clustername | nothing" />
<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
<thead class="systemsTable">
@@ -705,11 +712,16 @@
</div>
<div id="configTabContent" tal:condition="python: configTabNum == 2">
- <form name="fencedaemon" method="post">
+ <form name="fencedaemon" method="post" action="">
<input type="hidden" name="configtype" value="fence" />
<input type="hidden" name="pagetype"
tal:attributes="value request/pagetype | request/form/pagetype"
/>
+ <input type="hidden" name="cluster_version"
+ tal:attributes="value os_version | nothing" />
+ <input type="hidden" name="clustername"
+ tal:attributes="value request/clustername | clusterinfo/clustername | nothing" />
+
<script type="text/javascript"
src="/luci/homebase/homebase_common.js">
</script>
@@ -770,6 +782,10 @@
<input type="hidden" name="pagetype"
tal:attributes="value request/pagetype | request/form/pagetype"
/>
+ <input type="hidden" name="cluster_version"
+ tal:attributes="value os_version | nothing" />
+ <input type="hidden" name="clustername"
+ tal:attributes="value request/clustername | clusterinfo/clustername | nothing" />
<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
<thead class="systemsTable">
<tr class="systemsTable"><td class="systemsTable" colspan="1">
@@ -836,6 +852,10 @@
tal:attributes="value request/pagetype | request/form/pagetype"
/>
<input type="hidden" name="configtype" value="qdisk" />
+ <input type="hidden" name="cluster_version"
+ tal:attributes="value os_version | nothing" />
+ <input type="hidden" name="clustername"
+ tal:attributes="value request/clustername | clusterinfo/clustername | nothing" />
<div class="configTabContent">
<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
<thead class="systemsTable">
@@ -1048,8 +1068,11 @@
</div>
<div metal:define-macro="clusterprocess-form">
- <span tal:define="global r_agent python: here.getRicciAgentForCluster(request)"/>
- <span tal:define="res python: here.processClusterProps(r_agent, request)"/>
+ <tal:block tal:define="
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block
+ tal:define="res python: here.processClusterProps(ricci_agent, request)" />
</div>
<div metal:define-macro="fence-option-list">
@@ -1678,7 +1701,9 @@
</tal:comment>
<tal:block tal:define="
- global ricci_agent python: here.getRicciAgentForCluster(request);
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block tal:define="
global nodestatus python: here.getClusterStatus(ricci_agent);
global nodeinfo python: here.getNodeInfo(modelb, nodestatus, request);
global status_class python: 'node_' + (nodeinfo['nodestate'] == '0' and 'active' or (nodeinfo['nodestate'] == '1' and 'inactive' or 'unknown'));
@@ -1870,10 +1895,13 @@
set_page_title('Luci ??? cluster ??? nodes');
</script>
-<div id="node_list" tal:define="
- global ricci_agent python: here.getRicciAgentForCluster(request);
- global status python: here.getClusterStatus(ricci_agent);
- global nds python: here.getNodesInfo(modelb, status, request)">
+<div id="node_list">
+ <tal:block tal:define="
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block tal:define="
+ global status python: here.getClusterStatus(ricci_agent);
+ global nds python: here.getNodesInfo(modelb, status, request)" />
<div tal:repeat="nd nds">
<tal:block
@@ -2086,12 +2114,13 @@
set_page_title('Luci ??? cluster ??? services');
</script>
- <tal:block tal:omit-tag=""
- tal:define="
- global ricci_agent python: here.getRicciAgentForCluster(request);
- global svcstatus python: here.getClusterStatus(ricci_agent);
- global svcinf python: here.getServicesInfo(svcstatus,modelb,request);
- global svcs svcinf/services" />
+ <tal:block tal:define="
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block tal:define="
+ global svcstatus python: here.getClusterStatus(ricci_agent);
+ global svcinf python: here.getServicesInfo(svcstatus,modelb,request);
+ global svcs svcinf/services" />
<tal:block tal:repeat="svc svcs">
<table class="cluster service" width="100%"
@@ -2240,7 +2269,9 @@
</script>
<tal:block tal:define="
- global ricci_agent python: here.getRicciAgentForCluster(request);
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block tal:define="
result python: here.serviceStart(ricci_agent, request)" />
<!-- <span metal:use-macro="here/form-macros/macros/serviceconfig-form"/> -->
@@ -2253,7 +2284,9 @@
</script>
<tal:block tal:define="
- global ricci_agent python: here.getRicciAgentForCluster(request);
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block tal:define="
result python: here.serviceRestart(ricci_agent, request)" />
<!-- <span metal:use-macro="here/form-macros/macros/serviceconfig-form"/> -->
@@ -2264,15 +2297,17 @@
set_page_title('Luci ??? cluster ??? services ??? Stop a service');
</script>
+ <tal:block tal:define="
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
<span tal:define="
- global ricci_agent python: here.getRicciAgentForCluster(request);
result python: here.serviceStop(ricci_agent, request)" />
<!-- <span metal:use-macro="here/form-macros/macros/serviceconfig-form"/> -->
</div>
<div metal:define-macro="serviceconfig-type-macro" tal:omit-tag="">
- <span tal:omit-tag="" tal:condition="python: type == 'IP Address: '">
+ <span tal:omit-tag="" tal:condition="python: type == 'ip'">
<tal:block metal:use-macro="here/resource-form-macros/macros/ip_macro" />
</span>
<span tal:omit-tag="" tal:condition="python: type == 'fs'">
@@ -2293,7 +2328,7 @@
<span tal:omit-tag="" tal:condition="python: type == 'smb'">
<tal:block metal:use-macro="here/resource-form-macros/macros/smb_macro" />
</span>
- <span tal:omit-tag="" tal:condition="python: type == 'Script: '">
+ <span tal:omit-tag="" tal:condition="python: type == 'script'">
<tal:block metal:use-macro="here/resource-form-macros/macros/scr_macro" />
</span>
</div>
@@ -2307,7 +2342,9 @@
</script>
<tal:block tal:define="
- global ricci_agent python: here.getRicciAgentForCluster(request);
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block tal:define="
global global_resources python: here.getResourcesInfo(modelb, request);
global sstat python: here.getClusterStatus(ricci_agent);
global sinfo python: here.getServiceInfo(sstat, modelb, request);
@@ -2475,8 +2512,10 @@
</script>
<tal:block tal:define="
- global ragent python: here.getRicciAgentForCluster(request);
- global sta python: here.getClusterStatus(ragent);
+ global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
+
+ <tal:block tal:define="
+ global sta python: here.getClusterStatus(ricci_agent);
global fdominfo python: here.getFdomsInfo(modelb, request, sta);" />
<div class="cluster fdom" tal:repeat="fdom fdominfo">
--- conga/luci/cluster/index_html 2006/11/03 19:13:57 1.25
+++ conga/luci/cluster/index_html 2006/11/07 20:28:36 1.26
@@ -9,11 +9,6 @@
xml:lang language">
<head metal:use-macro="here/header/macros/html_header">
-
-
-
-
-
<metal:fillbase fill-slot="base">
<metal:baseslot define-slot="base">
<base href="" tal:attributes="href here/renderBase" />
@@ -29,47 +24,54 @@
</metal:cache>
<metal:headslot define-slot="head_slot" />
- <tal:block tal:define="global sinfo nothing" />
- <div tal:define="global hascluster request/clustername |nothing; global busywaiting python:None;"/>
- <span tal:condition="not: hascluster">
- <meta googaa="ooo"/>
- </span>
-
- <span tal:condition="hascluster">
- <span tal:define="ri_agent python:here.getRicciAgentForCluster(request)">
-
- <span tal:define="resmap python:here.getClusterOS(ri_agent);
- global isVirtualized resmap/isVirtualized | nothing;
- global os_version resmap/os | nothing"/>
- </span>
- <span tal:define="global isBusy python:here.isClusterBusy(request)"/>
- <span tal:define="global firsttime request/busyfirst |nothing"/>
- <span tal:condition="firsttime">
- <span tal:define="global busywaiting python:True"/>
- <meta http-equiv="refresh" content="" tal:attributes="content isBusy/refreshurl"/>
- </span>
- <span tal:define="global busy isBusy/busy |nothing"/>
- <span tal:condition="busy">
- <span tal:define="global busywaiting python:True"/>
- <meta http-equiv="refresh" content="" tal:attributes="content isBusy/refreshurl"/>
- </span>
- </span>
-
- <tal:comment replace="nothing"> A slot where you can insert elements in the header from a template </tal:comment>
+ <tal:block tal:define="
+ global sinfo nothing;
+ global hascluster request/clustername |nothing;
+ global isBusy python: False;
+ global firsttime nothing;
+ global ri_agent nothing;
+ global busywaiting python:None" />
+
+ <tal:block tal:condition="not: hascluster">
+ <meta googaa="ooo"/>
+ </tal:block>
+
+ <tal:block tal:condition="hascluster">
+ <tal:block tal:define="
+ global ri_agent python:here.getRicciAgentForCluster(request);
+ 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>
+
+ <tal:block tal:define="global busy isBusy/busy |nothing"/>
+
+ <tal:block tal:condition="busy">
+ <tal:block tal:define="global busywaiting python:True" />
+ <meta http-equiv="refresh"
+ tal:attributes="content isBusy/refreshurl | string:." />
+ </tal:block>
+ </tal:block>
</metal:headslot>
-
-
<metal:cssslot fill-slot="css_slot">
- <tal:comment replace="nothing"> A slot where you can insert CSS in the header from a template </tal:comment>
-
- <style type="text/css"><!-- @import url(./clusterportlet.css); --></style>
- <style type="text/css"><!-- @import url(/luci/homebase/luci_homebase.css); --></style>
- <metal:cssslot define-slot="css_slot" />
+ <style type="text/css">
+ <!-- @import url(./clusterportlet.css); -->
+ </style>
+ <style type="text/css">
+ <!-- @import url(/luci/homebase/luci_homebase.css); -->
+ </style>
+ <metal:cssslot define-slot="css_slot" />
</metal:cssslot>
<metal:javascriptslot fill-slot="javascript_head_slot">
- <tal:comment replace="nothing"> A slot where you can insert javascript in the header from a template </tal:comment>
<script type="text/javascript" src="/luci/conga.js"></script>
<SCRIPT TYPE="text/javascript">
<!--
@@ -121,7 +123,6 @@
</SCRIPT>
<metal:javascriptslot define-slot="javascript_head_slot" />
</metal:javascriptslot>
-
</head>
<body tal:attributes="class here/getSectionFromURL;
@@ -158,13 +159,12 @@
alternative in the plone_tableless skin layer that you can use if you
prefer layouts that don't use tables.
</tal:comment>
- <!-- <div tal:define="global hascluster request/clustername |nothing"/> -->
<tal:block tal:condition="hascluster">
- <tal:block tal:define="global ricci_agent python: here.getRicciAgentForCluster(request)" />
- <tal:block tal:condition="python: ricci_agent"
- tal:define="
- global modelb python:here.getmodelbuilder(ricci_agent,isVirtualized)" />
+ <tal:block tal:condition="python: ri_agent">
+ <tal:block tal:define="
+ global modelb python:here.getmodelbuilder(ri_agent, isVirtualized)" />
+ </tal:block>
</tal:block>
<table id="portal-columns">
@@ -214,8 +214,8 @@
<metal:main-form-content use-macro="here/form-chooser/macros/main-form">
</metal:main-form-content>
- <tal:block tal:condition="python: request.SESSION.has_key('checkRet')"
- tal:define="ret python: request.SESSION.get('checkRet')">
+ <tal:block tal:condition="python: request.SESSION.has_key('checkRet')">
+ <tal:block tal:define="ret python: request.SESSION.get('checkRet')">
<div class="retmsgs" id="retmsgsdiv" tal:condition="python:(ret and 'messages' in ret and len(ret['messages']))">
<div class="hbclosebox">
<a href="javascript:hide_element('retmsgsdiv');"><img src="../homebase/x.png"></a>
@@ -238,6 +238,7 @@
</tal:block>
</ul>
</div>
+ </tal:block>
</tal:block>
</div>
^ permalink raw reply [flat|nested] 4+ messages in thread* [Cluster-devel] conga/luci/cluster form-macros index_html
@ 2007-06-12 15:21 rmccabe
0 siblings, 0 replies; 4+ messages in thread
From: rmccabe @ 2007-06-12 15:21 UTC (permalink / raw)
To: cluster-devel.redhat.com
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>
^ permalink raw reply [flat|nested] 4+ messages in thread* [Cluster-devel] conga/luci/cluster form-macros index_html
@ 2006-11-27 19:56 rmccabe
0 siblings, 0 replies; 4+ messages in thread
From: rmccabe @ 2006-11-27 19:56 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-11-27 19:56:12
Modified files:
luci/cluster : form-macros index_html
Log message:
add fence instance forms
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.107&r2=1.108
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.27&r2=1.28
--- conga/luci/cluster/form-macros 2006/11/20 20:21:34 1.107
+++ conga/luci/cluster/form-macros 2006/11/27 19:56:12 1.108
@@ -1115,6 +1115,8 @@
<option name="fence_rps10" value="fence_rps10">RPS10 Serial Switch</option>
<option name="fence_drac" value="fence_drac">Dell DRAC</option>
<option name="fence_ipmilan" value="fence_ipmilan">IPMI Lan</option>
+ <option name="fence_xvm" value="fence_xvm">Virtual Machine Fencing</option>
+ <option name="fence_scsi" value="fence_scsi">SCSI Fencing</option>
<option name="fence_manual" value="fence_manual">Manual Fencing</option>
</div>
@@ -1129,21 +1131,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1169,21 +1171,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fendev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1209,14 +1211,14 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
@@ -1242,21 +1244,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>Hostname</td>
<td>
<input name="hostname" type="text"
- tal:attributes="cur_fencedev/hostname | nothing" />
+ tal:attributes="value cur_fencedev/hostname | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1282,21 +1284,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1321,21 +1323,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>Hostname</td>
<td>
<input name="hostname" type="text"
- tal:attributes="cur_fencedev/hostname | nothing" />
+ tal:attributes="value cur_fencedev/hostname | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1361,21 +1363,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1401,7 +1403,7 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
@@ -1412,7 +1414,7 @@
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1438,14 +1440,14 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
@@ -1471,14 +1473,14 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>Servers (whitespace separated list)</td>
<td>
<input name="servers" type="text"
- tal:attributes="cur_fencedev/servers | nothing" />
+ tal:attributes="value cur_fencedev/servers | nothing" />
</td>
</tr>
</table>
@@ -1497,21 +1499,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>CServer</td>
<td>
<input name="cserver" type="text"
- tal:attributes="cur_fencedev/cserver | nothing" />
+ tal:attributes="value cur_fencedev/cserver | nothing" />
</td>
</tr>
<tr>
<td>ESH Path (Optional)</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | string:/opt/pan-mgr/bin/esh" />
+ tal:attributes="value cur_fencedev/login | string:/opt/pan-mgr/bin/esh" />
</td>
</tr>
</table>
@@ -1530,21 +1532,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1570,21 +1572,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1610,21 +1612,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>Device Name</td>
<td>
<input name="device" type="text"
- tal:attributes="cur_fencedev/device | nothing" />
+ tal:attributes="value cur_fencedev/device | nothing" />
</td>
</tr>
<tr>
<td>Port</td>
<td>
<input name="port" type="text"
- tal:attributes="cur_fencedev/port| nothing" />
+ tal:attributes="value cur_fencedev/port| nothing" />
</td>
</tr>
</table>
@@ -1632,6 +1634,18 @@
</div>
</div>
+<div metal:define-macro="fence-form-xvm">
+ <div id="fence_xvm" class="fencedev">
+ -
+ </div>
+</div>
+
+<div metal:define-macro="fence-form-scsi">
+ <div id="fence_scsi" class="fencedev">
+ -
+ </div>
+</div>
+
<div metal:define-macro="fence-form-ipmilan">
<div id="fence_ipmilan" class="fencedev">
<table>
@@ -1643,21 +1657,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1687,7 +1701,7 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<input type="hidden" name="fence_type" value="fence_manual" />
@@ -1731,6 +1745,183 @@
<tal:block metal:use-macro="here/form-macros/macros/fence-form-scsi" />
</div>
+<div metal:define-macro="fence-instance-form-apc">
+ <div id="fence_apc_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ <tr>
+ <td>Switch</td>
+ <td>
+ <input name="switch" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-egenera">
+ <div id="fence_egenera_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>lpan</td>
+ <td>
+ <input name="lpan" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ <tr>
+ <td>pserver</td>
+ <td>
+ <input name="pserver" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-wti">
+ <div id="fence_wti_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-brocade">
+ <div id="fence_brocade_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-vixel">
+ <div id="fence_vixel_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-sanbox2">
+ <div id="fence_sanbox2_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-mcdata">
+ <div id="fence_mcdata_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-gndb">
+ <div id="fence_gnbd_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>IP Address</td>
+ <td>
+ <input name="ipaddress" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-bladecenter">
+ <div id="fence_bladecenter_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Blade</td>
+ <td>
+ <input name="ipaddress" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-bullpap">
+ <div id="fence_bullpap_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Domain</td>
+ <td>
+ <input name="domain" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-list">
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-apc" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-egenera" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-wti" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-brocade" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-vixel" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-sanbox2" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-mcdata" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-gndb" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-bullpap" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-bladecenter" />
+</div>
+
<div metal:define-macro="node-form">
<script type="text/javascript">
set_page_title('Luci ??? cluster ??? nodes ??? properties');
@@ -1749,7 +1940,8 @@
global nodeinfo python: here.getNodeInfo(modelb, nodestatus, request);
global status_class python: 'node_' + (nodeinfo['nodestate'] == '0' and 'active' or (nodeinfo['nodestate'] == '1' and 'inactive' or 'unknown'));
global cluster_node_status_str python: (nodeinfo['nodestate'] == '0' and 'Cluster member' or (nodeinfo['nodestate'] == '1' and 'Currently not a cluster participant' or 'This node is not responding'));
- global fenceinfo python: here.getFenceInfo(modelb, request)"
+ global fenceinfo python: here.getFenceInfo(modelb, request);
+ global fencedevinfo python: here.getFencesInfo(modelb, request)"
/>
<table class="cluster node" width="100%">
@@ -1891,7 +2083,6 @@
<tal:block metal:use-macro="here/form-macros/macros/fence-form-list" />
</div>
- <h3>Fencing</h3>
<table id="fence_devices" class="cluster node fencedev">
<tfoot class="fencedev">
<tr class="cluster node fencedev"><td class="cluster node fencedev">
@@ -1918,6 +2109,8 @@
<select name="select_div"
onChange="swap_fence_div('fence_container',
this.options[this.selectedIndex].value)">
+ <option value="fence-form-new-device">------ Use an existing Fence Device ------</option>
+ <option value="fence-form-new-instance">------ Create a new Fence Device ------</option>
<tal:block metal:use-macro="here/form-macros/macros/fence-option-list" />
</select>
</form>
@@ -1929,6 +2122,8 @@
<select name="select_div"
onChange="swap_fence_div('fence_container_backup',
this.options[this.selectedIndex].value)">
+ <option value="fence-form-new-device">------ Use an existing Fence Device ------</option>
+ <option value="fence-form-new-instance">------ Create a new Fence Device ------</option>
<tal:block metal:use-macro="here/form-macros/macros/fence-option-list" />
</select>
</form>
--- conga/luci/cluster/index_html 2006/11/07 21:33:52 1.27
+++ conga/luci/cluster/index_html 2006/11/27 19:56:12 1.28
@@ -104,15 +104,16 @@
function swap_fence_div(container_id, element_id) {
var container_element = document.getElementById(container_id)
if (!container_element) {
- alert('Can\'t find element with id = ' + container_id);
return (-1);
}
var child_element = document.getElementById(element_id);
if (!child_element) {
- alert('Can\'t find element with id = ' + element_id);
+ if (container_element.firstChild)
+ container_element.removeChild(container_element.firstChild);
return (-1);
}
+
if (container_element.firstChild)
container_element.removeChild(container_element.firstChild);
var target = child_element.cloneNode(1);
^ permalink raw reply [flat|nested] 4+ messages in thread* [Cluster-devel] conga/luci/cluster form-macros index_html
@ 2006-10-04 16:10 jparsons
0 siblings, 0 replies; 4+ messages in thread
From: jparsons @ 2006-10-04 16:10 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: jparsons at sourceware.org 2006-10-04 16:10:22
Modified files:
luci/cluster : form-macros index_html
Log message:
minor additions
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.75&r2=1.76
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.16&r2=1.17
--- conga/luci/cluster/form-macros 2006/10/02 20:21:47 1.75
+++ conga/luci/cluster/form-macros 2006/10/04 16:10:22 1.76
@@ -893,6 +893,7 @@
global ricci_agent python: here.getRicciAgentForCluster(request);
global nodestatus python: here.getClusterStatus(ricci_agent);
global nodeinfo python: here.getNodeInfo(modelb, nodestatus, request);
+ global fenceinfo python: here.getFenceInfo(modelb, request);
global status_class python: 'node_' + (nodeinfo['nodestate'] == '0' and 'active' or (nodeinfo['nodestate'] == '1' and 'inactive' or 'unknown'));
global cluster_node_status_str python: (nodeinfo['nodestate'] == '0' and 'Cluster member' or (nodeinfo['nodestate'] == '1' and 'Currently not a cluster participant' or 'This node is not responding'));"
/>
@@ -1022,6 +1023,10 @@
</div>
<h3>Fencing</h3>
+ <span tal:define="global fencelevelone python:fenceinfo[0];
+ global fenceleveltwo python:fenceinfo[1]"/>
+ <h4>Main fencing has <span tal:content="python:len(fencelevelone)"/> fences</h4>
+ <h4>Backup fencing has <span tal:content="python:len(fenceleveltwo)"/> fences</h4>
<table id="fence_devices" class="cluster node fencedev">
<tfoot class="fencedev">
<tr class="cluster node fencedev"><td class="cluster node fencedev">
--- conga/luci/cluster/index_html 2006/09/27 22:24:11 1.16
+++ conga/luci/cluster/index_html 2006/10/04 16:10:22 1.17
@@ -35,6 +35,11 @@
<meta googaa="ooo"/>
</span>
<span tal:condition="hascluster">
+ <span tal:define="ri_agent python:here.getRicciAgentForCluster(request)">
+ <span tal:define="resmap python:here.getClusterOS(ri_agent,request);
+ global isVirtualized resmap/isVirtualized;
+ global os_version resmap/os;"/>
+ </span>
<span tal:define="global isBusy python:here.isClusterBusy(request)"/>
<span tal:define="global firsttime request/busyfirst |nothing"/>
<span tal:condition="firsttime">
@@ -44,12 +49,7 @@
<span tal:define="global busy isBusy/busy |nothing"/>
<span tal:condition="busy">
<span tal:define="global busywaiting python:True"/>
- <meta http-equiv="refresh" content="" tal:attributes="content isBusy/refreshurl"/>
- <span tal:define="ri_agent python:here.getRicciAgent(request/clustername)">
- <span tal:define="resmap python:here.getClusterOS(ri_agent);
- global isVirtualized resmap/isVirtualized;
- global os_version resmap/os;"/>
- </span>
+ <meta http-equiv="refresh" content="" tal:attributes="content isBusy/refreshurl"/>
</span>
</span>
<tal:comment replace="nothing"> A slot where you can insert elements in the header from a template </tal:comment>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-06-12 15:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-07 20:28 [Cluster-devel] conga/luci/cluster form-macros index_html rmccabe
-- strict thread matches above, loose matches on Subject: below --
2007-06-12 15:21 rmccabe
2006-11-27 19:56 rmccabe
2006-10-04 16:10 jparsons
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).