CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2007-08-09 21:05:28
Modified files:
luci/cluster : form-macros
luci/homebase : form-macros luci_homebase.css
Log message:
Fixes from the RHEL5 branch
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.207&r2=1.208
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.58&r2=1.59
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.41&r2=1.42
--- conga/luci/cluster/form-macros 2007/08/09 04:37:20 1.207
+++ conga/luci/cluster/form-macros 2007/08/09 21:05:28 1.208
@@ -3291,21 +3291,28 @@
</td></tr>
</tfoot>
<tbody class="systemsTable">
- <tr class="systemsTable" tal:repeat="demon
nodeinfo/d_states">
- <td class="systemsTable"><span
tal:replace="demon/name"/></td>
- <td class="systemsTable"><span
tal:replace="python: demon['running'] == 'true' and 'yes' or 'no'" /></td>
+ <tr class="systemsTable" tal:repeat="daemon
nodeinfo/d_states">
+ <td class="systemsTable"><span
tal:replace="daemon/name"/></td>
+ <td class="systemsTable">
+ <tal:block
tal:condition="python:daemon['name'] == 'cman'">
+ <span tal:replace="python:
(daemon['running'] == 'true' or nodeinfo['nodestate'] == '0') and 'yes' or
'no'" />
+ </tal:block>
+ <tal:block
tal:condition="python:daemon['name'] != 'cman'">
+ <span tal:replace="python:
daemon['running'] == 'true' and 'yes' or 'no'" />
+ </tal:block>
+ </td>
<td class="systemsTable">
<input type="hidden" tal:attributes="
- name python: '__daemon__:' +
demon['name'] + ':';
- value demon/name" />
+ name python: '__daemon__:' +
daemon['name'] + ':';
+ value daemon/name" />
<input type="hidden" tal:attributes="
- name python: '__daemon__:' +
demon['name'] + ':';
- value python: demon['enabled']
== 'true' and '1' or '0'" />
+ name python: '__daemon__:' +
daemon['name'] + ':';
+ value python: daemon['enabled']
== 'true' and '1' or '0'" />
<input type="checkbox" tal:attributes="
- name python: '__daemon__:' +
demon['name'] + ':';
- checked python:
demon['enabled'] == 'true' and 'checked'" />
+ name python: '__daemon__:' +
daemon['name'] + ':';
+ checked python:
daemon['enabled'] == 'true' and 'checked'" />
</td>
</tr>
</tbody>
--- conga/luci/homebase/form-macros 2007/07/11 22:47:07 1.58
+++ conga/luci/homebase/form-macros 2007/08/09 21:05:28 1.59
@@ -493,8 +493,9 @@
Clusters
</h3>
- <tal:block tal:repeat="c python:systems[0]">
- <div class="hbcheckdiv"
+ <ul class="vanilla">
+ <li class="vanilla" tal:repeat="c python:systems[0]">
+ <tal:block
tal:define="cfname python:
here.strFilter('[^0-9A-Za-z_-]', '_', c)"
tal:attributes="id python: cfname">
@@ -509,15 +510,17 @@
tal:attributes="
name python:'__CLUSTER:X___' +
cfname"
/>
- <span tal:omit-tag="" tal:content="python:c" />
- </div>
- </tal:block>
+ <span tal:content="python:c" />
+ </tal:block>
+ </li>
+ </ul>
- <div tal:omit-tag="" tal:condition="python: systems[1] and
len(systems[1]) > 0">
+ <tal:block tal:condition="python: systems[1] and
len(systems[1]) > 0">
<h3 class="homebase">Storage Systems</h3>
- <tal:block tal:repeat="s python: systems[1]">
- <div class="hbcheckdiv"
+ <ul class="vanilla">
+ <li class="vanilla" tal:repeat="s python: systems[1]">
+ <tal:block
tal:define="sfname python:
here.strFilter('[^0-9A-Za-z_-]', '_', s)">
<input type="checkbox" class="homebase"
tal:define="global num_systems
python:num_systems + 1"
@@ -530,9 +533,10 @@
<input type="hidden" value=""
tal:attributes="name
python:'__SYSTEM:X___' + sfname" />
<span class="hbText" tal:omit-tag=""
tal:content="python:s"/>
- </div>
- </tal:block>
- </div>
+ </tal:block>
+ </li>
+ </ul>
+ </tal:block>
<input type="hidden" id="num_storage"
tal:attributes="value python: num_systems + 1" />
--- conga/luci/homebase/luci_homebase.css 2007/06/28 16:02:50 1.41
+++ conga/luci/homebase/luci_homebase.css 2007/08/09 21:05:28 1.42
@@ -12,12 +12,17 @@
float: left ! important;
vertical-align: middle;
background: #dee7ec;
+ margin-right: +.3333em;
}
input.pad_left {
margin-left: +.3333em;
}
+input.pad_right {
+ margin-right: +.3333em;
+}
+
td.pad_right {
padding-right: +.6666em;
}
