* [Cluster-devel] conga/luci/storage form-macros
@ 2006-10-06 22:59 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-10-06 22:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-10-06 22:59:26
Modified files:
luci/storage : form-macros
Log message:
luci storage: display allowed size range
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&r1=1.6&r2=1.7
--- conga/luci/storage/form-macros 2006/10/06 22:08:13 1.6
+++ conga/luci/storage/form-macros 2006/10/06 22:59:26 1.7
@@ -189,10 +189,6 @@
</td>
<td>
<select name="preferred_size_units" onchange="this.form.submit()">
- <option value="bytes"
- tal:attributes="selected python:preferred_size_units == 'bytes'">Bytes</option>
- <option value="KB"
- tal:attributes="selected python:preferred_size_units == 'KB'">KB - KiloBytes</option>
<option value="MB"
tal:attributes="selected python:preferred_size_units == 'MB'">MB - MegaBytes</option>
<option value="GB"
@@ -827,13 +823,19 @@
- <input tal:condition="python:prop_type == 'int' and prop_units != 'bytes'"
- tal:attributes="name p;
- type string:text;
- value prop/value;
- onblur python:'validate_int(this, 2, ' + str(prop['validation']['min']) + ', ' + str(prop['validation']['max']) + ', ' + str(prop['validation']['step']) + ', \'' + prop_units + '\', \'' + form_submit_button_id + '\')'"
- onkeypress="return validate_int_keypress(this, event, 2)"/>
- <span tal:condition="python:prop_type == 'int' and prop_units == 'bytes'">
+ <span tal:omit-tag=""
+ tal:condition="python:prop_type == 'int' and prop_units != 'bytes'">
+ <input tal:attributes="name p;
+ type string:text;
+ size string:15;
+ value prop/value;
+ onblur python:'validate_int(this, 2, ' + str(prop['validation']['min']) + ', ' + str(prop['validation']['max']) + ', ' + str(prop['validation']['step']) + ', \'' + prop_units + '\', \'' + form_submit_button_id + '\')'"
+ onkeypress="return validate_int_keypress(this, event, 2)"/>
+ (<span tal:replace="prop/validation/min"/> - <span tal:replace="prop/validation/max"/>)
+ <span tal:replace="prop_units"/>
+ </span>
+ <span tal:omit-tag=""
+ tal:condition="python:prop_type == 'int' and prop_units == 'bytes'">
<span tal:define="bytes prop/value;
dummy python:here.bytes_to_value_prefunits(bytes);
value python:dummy[0];
@@ -841,11 +843,13 @@
minim python:here.convert_bytes(prop['validation']['min'], units);
maxim python:here.convert_bytes(prop['validation']['max'], units);
step python:here.convert_bytes(prop['validation']['step'], units)">
- <input tal:attributes="name p;
- type string:text;
+ <input tal:attributes="name p;
+ type string:text;
+ size string:15;
value value;
onblur python:'validate_float(this, 2, ' + str(minim) + ', ' + str(maxim) + ', ' + str(step) + ', \'' + units + '\', \'' + form_submit_button_id + '\')'"
onkeypress="return validate_float_keypress(this, event, 2)"/>
+ (<span tal:replace="minim"/> - <span tal:replace="maxim"/>)
<span tal:replace="units"/>
</span>
</span>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/storage form-macros
@ 2006-10-16 20:57 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-10-16 20:57 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-10-16 20:57:13
Modified files:
luci/storage : form-macros
Log message:
luci storage: reboot and log
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&r1=1.16&r2=1.17
--- conga/luci/storage/form-macros 2006/10/16 15:30:02 1.16
+++ conga/luci/storage/form-macros 2006/10/16 20:57:13 1.17
@@ -420,10 +420,44 @@
<div metal:define-macro="view-mappers-all-form">
+
+
+<script language="javascript" type="text/javascript">
+
+function popup_log(mylink, windowname)
+{
+ //Thanks to htmlcodetutorial.com
+ if (!window.focus) return true;
+ var href;
+ if (typeof(mylink) == 'string')
+ href=mylink;
+ else
+ href=mylink.href;
+ window.open(href, windowname, 'width=400,height=200,scrollbars=yes');
+ return false;
+}
+
+</script>
+
+
<div metal:use-macro="here/form-macros/macros/tree-css"/>
<div metal:use-macro="here/form-macros/macros/content-scripts"/>
<div metal:use-macro="here/form-macros/macros/single-visible-span"/>
<div metal:use-macro="here/form-macros/macros/form-scripts"/>
+
+ <a tal:define="main_log_URL context/cluster/index_html/absolute_url"
+ tal:attributes="href python:main_log_URL + '?nodename=' + storagename + '&pagetype=17'"
+ onClick="return popup_log(this, 'notes')">
+ View recent log activity
+ </a>
+ <br/>
+ <a tal:define="main_reboot_URL python:'./?storagename=' + storagename + '&pagetype=44'"
+ tal:attributes="href main_reboot_URL">
+ Reboot this machine
+ </a>
+ <br/>
+ <br/>
+
<span tal:omit-tag=""
tal:define="mappers_all python:here.get_mappers_data(storage_report)">
<span tal:omit-tag=""
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/storage form-macros
@ 2006-10-25 16:03 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-10-25 16:03 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: kupcevic at sourceware.org 2006-10-25 16:03:05
Modified files:
luci/storage : form-macros
Log message:
luci storage: remove "reboot" link that will not be able to work in this release (bz211373)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17&r2=1.17.2.1
--- conga/luci/storage/form-macros 2006/10/16 20:57:13 1.17
+++ conga/luci/storage/form-macros 2006/10/25 16:03:03 1.17.2.1
@@ -451,11 +451,6 @@
View recent log activity
</a>
<br/>
- <a tal:define="main_reboot_URL python:'./?storagename=' + storagename + '&pagetype=44'"
- tal:attributes="href main_reboot_URL">
- Reboot this machine
- </a>
- <br/>
<br/>
<span tal:omit-tag=""
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/storage form-macros
@ 2006-10-25 16:26 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-10-25 16:26 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: kupcevic at sourceware.org 2006-10-25 16:26:13
Modified files:
luci/storage : form-macros
Log message:
luci storage: finish 211370
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.1&r2=1.17.2.2
--- conga/luci/storage/form-macros 2006/10/25 16:03:03 1.17.2.1
+++ conga/luci/storage/form-macros 2006/10/25 16:26:13 1.17.2.2
@@ -445,8 +445,8 @@
<div metal:use-macro="here/form-macros/macros/single-visible-span"/>
<div metal:use-macro="here/form-macros/macros/form-scripts"/>
- <a tal:define="main_log_URL context/cluster/index_html/absolute_url"
- tal:attributes="href python:main_log_URL + '?nodename=' + storagename + '&pagetype=17'"
+ <a tal:define="main_log_URL context/logs/index_html/absolute_url"
+ tal:attributes="href python:main_log_URL + '?nodename=' + storagename"
onClick="return popup_log(this, 'notes')">
View recent log activity
</a>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/storage form-macros
@ 2007-08-08 22:35 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-08-08 22:35 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-08-08 22:35:03
Modified files:
luci/storage : form-macros
Log message:
Fix 250837: grammar error when attempting to add physical volumes to a volume group
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.7&r2=1.17.2.8
--- conga/luci/storage/form-macros 2007/06/27 06:40:45 1.17.2.7
+++ conga/luci/storage/form-macros 2007/08/08 22:35:02 1.17.2.8
@@ -896,7 +896,7 @@
<div metal:use-macro="here/form-macros/macros/form-scripts"/>
<span tal:omit-tag=""
tal:condition="not: mapper/new_sources">
- There is no available <span tal:replace="mapper/pretty_sources_name"/> to be added to <span tal:replace="mapper/pretty_type"/> '<span tal:replace="mapper/pretty_name"/>'.
+ There are no available <span tal:replace="mapper/pretty_sources_name"/> to be added to <span tal:replace="mapper/pretty_type"/> '<span tal:replace="mapper/pretty_name"/>'.
<br/>
<br/>
<a tal:define="go_to_mapper_url python:'./?pagetype=52&mapper_type=' + mapper['mapper_type'] + '&mapper_id=' + mapper['mapper_id'] + '&storagename=' + storagename"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/storage form-macros
@ 2007-10-20 1:36 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-10-20 1:36 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-10-20 01:36:54
Modified files:
luci/storage : form-macros
Log message:
Fix 340101 (Storage redirection after probe does not work on WinXP with FF2)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.20.2.2&r2=1.20.2.3
--- conga/luci/storage/form-macros 2007/08/20 16:27:22 1.20.2.2
+++ conga/luci/storage/form-macros 2007/10/20 01:36:54 1.20.2.3
@@ -114,14 +114,10 @@
<script language="javascript" type="text/javascript">
-function strip_left(txt) {
- for (i=0; i<txt.length; i++) {
- if (txt[i] == " " || txt[i] == "\n")
- continue;
- return txt.substr(i);
- }
- return txt;
+function strip_left(res_txt) {
+ return(res_txt.replace(/^\s+/g, ""));
}
+
function check_batch_callback() {
if (xmlHttp_object.readyState == 4) {
var err_url = (window.location + '').split("?")[1].split("&");
@@ -136,6 +132,7 @@
var msg = xmlHttp_object.responseText;
msg = strip_left(msg);
var res = msg.split('\n');
+ res[0] = strip_left(res[0]);
if (res[0] == "DONE") {
window.location = res[1];
} else if (res[0] == "NOT_DONE") {
@@ -144,11 +141,11 @@
var m = '';
if (res[0] == "FAILURE") {
err_url = res[1];
- m = res[2];
+ m = strip_left(res[2]);
} else {
m = msg;
}
- alert('An error has occured while committing changes:\n\n' + m);
+ alert('An error has occurred while committing changes:\n\n' + m);
window.location = err_url;
}
} else {
@@ -198,26 +195,22 @@
<div metal:define-macro="wait-probing-storage">
- <script>
-function strip_left(txt) {
- for (i=0; i<txt.length; i++) {
- if (txt[i] == " " || txt[i] == "\n")
- continue;
- return txt.substr(i);
- }
- return txt;
+
+<script type="text/javascript">
+function strip_left(res_txt) {
+ return(res_txt.replace(/^\s+/g, ""));
}
+
function cache_report_callback() {
if (xmlHttp_object.readyState == 4) {
var i = (window.location + '').indexOf('?');
var list_URL = (window.location + '').substr(0, i);
if (xmlHttp_object.status == 200) {
- res = xmlHttp_object.responseText;
- res = strip_left(res);
+ var res = strip_left(xmlHttp_object.responseText);
if (res.substr(0, 2) == "OK") {
- window.location.reload();
+ window.location = window.location;
} else {
- alert('An error has occured while probing storage:\n\n' + res);
+ alert('An error has occurred while probing storage:\n\n' + res);
window.location = list_URL;
}
} else {
@@ -350,7 +343,7 @@
<div metal:define-macro="error-form">
<h2>Error Form</h2>
- An error has occured, more details once implemented :)
+ An error has occurred.
</div>
@@ -1489,20 +1482,10 @@
}
-
-
-
-
-function strip_left(txt) {
- for (i=0; i<txt.length; i++) {
- if (txt[i] == " " || txt[i] == "\n")
- continue;
- return txt.substr(i);
- }
- return txt;
+function strip_left(res_txt) {
+ return(res_txt.replace(/^\s+/g, ""));
}
-
// Apply is button, other ones are submits
var tmp_submit_URL = "";
@@ -1513,7 +1496,7 @@
function validate_and_submit_form_callback() {
if (xmlHttp_object.readyState == 4) {
if (xmlHttp_object.status == 200) {
- res = xmlHttp_object.responseText;
+ var res = xmlHttp_object.responseText;
res = strip_left(res);
if (res.substr(0, 2) == "OK") {
if (confirm(tmp_prompt_msg)) {
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/storage form-macros
@ 2007-10-22 19:30 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-10-22 19:30 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-10-22 19:30:41
Modified files:
luci/storage : form-macros
Log message:
Fix browser issues (Firefox and IE Windows) with the redirection in the storage tab
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.10&r2=1.17.2.11
--- conga/luci/storage/form-macros 2007/08/15 14:38:18 1.17.2.10
+++ conga/luci/storage/form-macros 2007/10/22 19:30:41 1.17.2.11
@@ -114,14 +114,10 @@
<script language="javascript" type="text/javascript">
-function strip_left(txt) {
- for (i=0; i<txt.length; i++) {
- if (txt[i] == " " || txt[i] == "\n")
- continue;
- return txt.substr(i);
- }
- return txt;
+function strip_left(res_txt) {
+ return(res_txt.replace(/^\s+/g, ""));
}
+
function check_batch_callback() {
if (xmlHttp_object.readyState == 4) {
var err_url = (window.location + '').split("?")[1].split("&");
@@ -136,6 +132,7 @@
var msg = xmlHttp_object.responseText;
msg = strip_left(msg);
var res = msg.split('\n');
+ res[0] = strip_left(res[0]);
if (res[0] == "DONE") {
window.location = res[1];
} else if (res[0] == "NOT_DONE") {
@@ -144,11 +141,11 @@
var m = '';
if (res[0] == "FAILURE") {
err_url = res[1];
- m = res[2];
+ m = strip_left(res[2]);
} else {
m = msg;
}
- alert('An error has occured while committing changes:\n\n' + m);
+ alert('An error has occurred while committing changes:\n\n' + m);
window.location = err_url;
}
} else {
@@ -198,26 +195,22 @@
<div metal:define-macro="wait-probing-storage">
- <script>
-function strip_left(txt) {
- for (i=0; i<txt.length; i++) {
- if (txt[i] == " " || txt[i] == "\n")
- continue;
- return txt.substr(i);
- }
- return txt;
+
+<script type="text/javascript">
+function strip_left(res_txt) {
+ return(res_txt.replace(/^\s+/g, ""));
}
+
function cache_report_callback() {
if (xmlHttp_object.readyState == 4) {
var i = (window.location + '').indexOf('?');
var list_URL = (window.location + '').substr(0, i);
if (xmlHttp_object.status == 200) {
- res = xmlHttp_object.responseText;
- res = strip_left(res);
+ var res = strip_left(xmlHttp_object.responseText);
if (res.substr(0, 2) == "OK") {
- window.location.reload();
+ window.location = window.location;
} else {
- alert('An error has occured while probing storage:\n\n' + res);
+ alert('An error has occurred while probing storage:\n\n' + res);
window.location = list_URL;
}
} else {
@@ -350,7 +343,7 @@
<div metal:define-macro="error-form">
<h2>Error Form</h2>
- An error has occured, more details once implemented :)
+ An error has occurred.
</div>
@@ -1489,20 +1482,10 @@
}
-
-
-
-
-function strip_left(txt) {
- for (i=0; i<txt.length; i++) {
- if (txt[i] == " " || txt[i] == "\n")
- continue;
- return txt.substr(i);
- }
- return txt;
+function strip_left(res_txt) {
+ return(res_txt.replace(/^\s+/g, ""));
}
-
// Apply is button, other ones are submits
var tmp_submit_URL = "";
@@ -1513,7 +1496,7 @@
function validate_and_submit_form_callback() {
if (xmlHttp_object.readyState == 4) {
if (xmlHttp_object.status == 200) {
- res = xmlHttp_object.responseText;
+ var res = xmlHttp_object.responseText;
res = strip_left(res);
if (res.substr(0, 2) == "OK") {
if (confirm(tmp_prompt_msg)) {
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-10-22 19:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-25 16:26 [Cluster-devel] conga/luci/storage form-macros kupcevic
-- strict thread matches above, loose matches on Subject: below --
2007-10-22 19:30 rmccabe
2007-10-20 1:36 rmccabe
2007-08-08 22:35 rmccabe
2006-10-25 16:03 kupcevic
2006-10-16 20:57 kupcevic
2006-10-06 22:59 kupcevic
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).