CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2007-09-25 03:51:02
Modified files:
luci/cluster : form-macros index_html resource-form-macros
validate_config_qdisk.js
Removed files:
luci/cluster : 100wait.gif 16services.png arrow_down.png
arrow_right.png configured.png fDom.png
installed.png joined.png node_active.png
node_inactive.png node_unknown.png
notstarted.png rebooted.png small_fdom.png
small_node_active.png small_node_inactive.png
small_node_unknown.png small_svc.png
small_svc_stopped.png
Log message:
- Move all images into the site custom directory so they can be cached
by the server
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.212&r2=1.213
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.37&r2=1.38
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.41&r2=1.42
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_qdisk.js.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/100wait.gif.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/16services.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/arrow_down.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/arrow_right.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/configured.png.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fDom.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/installed.png.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/joined.png.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/node_active.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/node_inactive.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/node_unknown.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/notstarted.png.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/rebooted.png.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/small_fdom.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/small_node_active.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/small_node_inactive.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/small_node_unknown.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/small_svc.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/small_svc_stopped.png.diff?cvsroot=cluster&r1=1.1&r2=NONE
--- conga/luci/cluster/form-macros 2007/09/21 03:11:53 1.212
+++ conga/luci/cluster/form-macros 2007/09/25 03:51:02 1.213
@@ -33,7 +33,7 @@
<h2><span tal:content="nodereport/desc" /></h2>
<em tal:content="nodereport/statusmessage | nothing"/><br/>
<span tal:condition="python: nodereport['statusindex'] < 1">
- <img src="notstarted.png"/>
+ <img src="notstarted.png" />
</span>
<span tal:condition="
@@ -425,7 +425,7 @@
<td tal:condition="add_cluster"
class="systemsTable">
<img
tal:attributes="
- src python:
'trusted' in sys and '/luci/lock-ok.png' or ('fp' in sys and
'/luci/lock-closed.png' or '/luci/lock-open.png');
+ src python:
'trusted' in sys and 'lock-ok.png' or ('fp' in sys and 'lock-closed.png' or
'lock-open.png');
title sys/fp |
string:no key fingerprint available" />
<input type="hidden"
tal:condition="exists:
sys/fp"
@@ -443,7 +443,7 @@
/>
</td>
<td class="systemsTable">
- <img src="/luci/delete-row.png"
class="deleteRow"
+ <img src="delete-row.png"
class="deleteRow"
title="delete this row"
tal:attributes="
onclick python:
'delete_element_id(\'__SYSTEM_ROW_%d\')' % cur_sysnum" />
@@ -466,7 +466,7 @@
id="__SYSTEM0:Passwd"
name="__SYSTEM0:Passwd" />
</td>
<td class="systemsTable">
- <img src="/luci/delete-row.png"
class="deleteRow"
+ <img src="delete-row.png"
class="deleteRow"
title="delete this row"
onclick="delete_element_id('__SYSTEM_ROW_0')" />
</td>
@@ -484,7 +484,7 @@
id="__SYSTEM1:Passwd"
name="__SYSTEM1:Passwd" />
</td>
<td class="systemsTable">
- <img src="/luci/delete-row.png"
class="deleteRow"
+ <img src="delete-row.png"
class="deleteRow"
title="delete this row"
onclick="delete_element_id('__SYSTEM_ROW_1')" />
</td>
@@ -502,7 +502,7 @@
id="__SYSTEM2:Passwd"
name="__SYSTEM2:Passwd" />
</td>
<td class="systemsTable">
- <img src="/luci/delete-row.png"
class="deleteRow"
+ <img src="delete-row.png"
class="deleteRow"
title="delete this row"
onclick="delete_element_id('__SYSTEM_ROW_2')" />
</td>
@@ -636,7 +636,7 @@
<table tal:condition="python: os_version and os_version ==
'rhel5'">
<tr class="systemsTable">
<td class="systemsTable" colspan="2">
- <img
src="/luci/cluster/arrow_right.png" alt="[+]"
+ <img src="arrow_right.png" alt="[+]"
onclick="toggle_visible(this,
'genprops_advanced', 'genprops_advanced_label')">
<span
id="genprops_advanced_label">Show</span>
advanced cluster properties
@@ -1293,7 +1293,7 @@
<td class="systemsTable">
<img class="qdisk deleteRow"
id="heuristic0:hdel"
name="heuristic0:hdel"
-
src="/luci/delete-row.png"
+ src="delete-row.png"
title="delete this
heuristic"
onClick="delete_qdisk_heur(this, document.quorum_partition);">
</td>
@@ -1337,7 +1337,7 @@
</td>
<td class="systemsTable">
<img class="qdisk deleteRow"
-
src="/luci/homebase/delete-row.png"
+ src="delete-row.png"
title="delete this
heuristic"
onClick="delete_qdisk_heur(this, document.quorum_partition);"
tal:attributes="
@@ -3883,7 +3883,7 @@
<td tal:condition="add_cluster"
class="systemsTable">
<img
tal:attributes="
- src python:
'trusted' in sys and '/luci/lock-ok.png' or ('fp' in sys and
'/luci/lock-closed.png' or '/luci/lock-open.png');
+ src python:
'trusted' in sys and 'lock-ok.png' or ('fp' in sys and 'lock-closed.png' or
'lock-open.png');
title sys/fp |
string:no key fingerprint available" />
<input type="hidden"
tal:condition="exists:
sys/fp"
@@ -3901,7 +3901,7 @@
/>
</td>
<td class="systemsTable">
- <img src="/luci/delete-row.png"
class="deleteRow"
+ <img src="delete-row.png"
class="deleteRow"
title="delete this row"
tal:attributes="
onclick python:
'delete_element_id(\'__SYSTEM_ROW_%d\')' % cur_sysnum" />
@@ -3924,7 +3924,7 @@
id="__SYSTEM0:Passwd"
name="__SYSTEM0:Passwd" />
</td>
<td class="systemsTable">
- <img src="/luci/delete-row.png"
class="deleteRow"
+ <img src="delete-row.png"
class="deleteRow"
title="delete this row"
onclick="delete_element_id('__SYSTEM_ROW_0')" />
</td>
@@ -4831,7 +4831,7 @@
<div class="cluster fdom" tal:repeat="fdom fdominfo">
<div class="cluster fdom fdomname">
- <img src="fDom.png"/>
+ <img src="fDom.png" />
<strong class="cluster fdom">Failover Domain Name<strong>:
<a class="cluster fdom_link"
tal:attributes="href fdom/cfgurl"
--- conga/luci/cluster/index_html 2007/07/27 16:43:47 1.37
+++ conga/luci/cluster/index_html 2007/09/25 03:51:02 1.38
@@ -203,7 +203,8 @@
<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">
- <img onclick="hide_element('retmsgsdiv')"
src="/luci/homebase/x.png" class="closeBox" title="dismiss" />
+ <img onclick="hide_element('retmsgsdiv')"
+ src="x.png" class="closeBox"
title="dismiss" />
</div>
<p class="retmsgs">Status messages:</p>
<ul class="statusmsg">
@@ -215,7 +216,8 @@
<div id="errmsgsdiv" class="errmsgs" tal:condition="python:(ret
and 'errors' in ret and len(ret['errors']))">
<div class="hbclosebox">
- <img onclick="hide_element('errmsgsdiv')"
src="/luci/homebase/x.png" class="closeBox" title="dismiss" />
+ <img onclick="hide_element('errmsgsdiv')"
+ src="x.png" class="closeBox"
title="dismiss" />
</div>
<p class="errmsgs">The following errors occurred:</p>
<ul class="statusmsg">
--- conga/luci/cluster/resource-form-macros 2007/09/20 21:03:16 1.41
+++ conga/luci/cluster/resource-form-macros 2007/09/25 03:51:02 1.42
@@ -29,7 +29,7 @@
<p tal:attributes="class expclass">
<img class="service_tree" name="arrow_down" alt="[-]"
- src="/luci/cluster/arrow_down.png"
+ src="arrow_down.png"
onClick="collapse_div(this)">
<span class="service_tree expander">Hide Children</span>
</p>
--- conga/luci/cluster/validate_config_qdisk.js 2007/08/24 22:01:41 1.9
+++ conga/luci/cluster/validate_config_qdisk.js 2007/09/25 03:51:02 1.10
@@ -294,7 +294,7 @@
del_img.className = 'qdisk deleteRow';
del_img.setAttribute('name', hstr + ':hdel');
del_img.setAttribute('id', hstr + ':hdel');
- del_img.setAttribute('src', '/luci/delete-row.png');
+ del_img.setAttribute('src', 'delete-row.png');
del_img.setAttribute('title', 'delete this row');
del_img.onclick = new Function('delete_qdisk_heur(this,
document.quorum_partition)');
del_td.appendChild(del_img);
