diff options
| -rw-r--r-- | usr/local/www/diag_dump_states_sources.php | 18 | ||||
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 4 | ||||
| -rw-r--r-- | usr/local/www/javascript/filter_log.js | 18 | ||||
| -rwxr-xr-x | usr/local/www/pkg.php | 2 | ||||
| -rw-r--r-- | usr/local/www/widgets/widgets/openvpn.widget.php | 20 |
5 files changed, 31 insertions, 31 deletions
diff --git a/usr/local/www/diag_dump_states_sources.php b/usr/local/www/diag_dump_states_sources.php index c4eda42..6081291 100644 --- a/usr/local/www/diag_dump_states_sources.php +++ b/usr/local/www/diag_dump_states_sources.php @@ -74,18 +74,18 @@ include("head.inc"); <script type="text/javascript"> function removeSource(srcip, dstip) { - var busy = function(icon) { - icon.onclick = ""; - icon.src = icon.src.replace("\.gif", "_d.gif"); - icon.style.cursor = "wait"; + var busy = function(index,icon) { + jQuery(icon).bind("onclick",""); + jQuery(icon).attr('src',jQuery(icon).attr('src').replace("\.gif", "_d.gif")); + jQuery(icon).css("cursor","wait"); } - $A(document.getElementsByName("i:" + srcip + ":" + dstip)).each(busy); + jQuery('img[name="i:' + srcip + ":" + dstip + '"]').each(busy); - new Ajax.Request( + jQuery.ajax( "<?=$_SERVER['SCRIPT_NAME'];?>" + "?action=remove&srcip=" + srcip + "&dstip=" + dstip, - { method: "get", onComplete: removeComplete } + { type: "get", complete: removeComplete } ); } @@ -96,8 +96,8 @@ include("head.inc"); return; } - $A(document.getElementsByName("r:" + values[1] + ":" + values[2])).each( - function(row) { Effect.Fade(row, { duration: 1.0 }); } + jQuery('tr[name="r:' + values[1] + ":" + values[2] + '"]').each( + function(index,row) { jQuery(row).fadeOut(1000); } ); } </script> diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 6b579db..5332d8e 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -315,7 +315,7 @@ function print_info_box_np($msg, $name="apply",$value="Apply changes") { } if(!$savebutton) { - $savebutton = '<td class="infoboxsave"><input value="Close" type="button" onClick="$(\'redboxtable\').hide();"></td>'; + $savebutton = '<td class="infoboxsave"><input value="Close" type="button" onClick="jQuery(\'#redboxtable\').hide();"></td>'; } echo <<<EOFnp @@ -378,7 +378,7 @@ function print_info_box_np_undo($msg, $name="apply",$value="Apply changes", $und if(!$savebutton) { - $savebutton = '<td class="infoboxsave"><input value="Close" type="button" onClick="$(\'redboxtable\').hide();"></td>'; + $savebutton = '<td class="infoboxsave"><input value="Close" type="button" onClick="jQuery(\'#redboxtable\').hide();"></td>'; } echo <<<EOFnp diff --git a/usr/local/www/javascript/filter_log.js b/usr/local/www/javascript/filter_log.js index 04a4d11..1259afb 100644 --- a/usr/local/www/javascript/filter_log.js +++ b/usr/local/www/javascript/filter_log.js @@ -85,9 +85,9 @@ function update_div_rows(data) { } data = data.slice(startat, data.length); - var rows = $$('.log-entry-mini'); - if (rows.length == 0) { - rows = $$('.log-entry'); + var rows = jQuery('.log-entry-mini'); + if (jQuery(rows).length == 0) { + rows = jQuery('.log-entry'); } for(var x=0; x<data.length; x++) { @@ -96,15 +96,15 @@ function update_div_rows(data) { * on the top */ if(isReverse == false) { - for (var i = 1; i < rows.length; i++) { - rows[i-1].innerHTML = rows[i].innerHTML; + for (var i = 1; i < jQuery(rows).length; i++) { + jQuery(rows[i-1]).html(jQuery(rows[i]).html()); } } else { - for (var i = rows.length - 1; i > 0; i--) { - rows[i].innerHTML = rows[i-1].innerHTML; + for (var i = jQuery(rows).length - 1; i > 0; i--) { + jQuery(rows[i]).html(jQuery(rows[i-1]).html()); } } - $('firstrow').update(data[x]); + jQuery('#firstrow').html(data[x]); } } @@ -119,4 +119,4 @@ function toggle_pause() { /* start local AJAX engine */ if (typeof updateDelay != 'undefined') { timer = setInterval('fetch_new_rules()', updateDelay); -}
\ No newline at end of file +} diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php index 0a119d9..c6556b3 100755 --- a/usr/local/www/pkg.php +++ b/usr/local/www/pkg.php @@ -180,7 +180,7 @@ if ($pkg['tabs'] <> "") { ?> <script> function setFilter(filtertext) { - $('pkg_filter').value = filtertext; + jQuery('#pkg_filter').val(filtertext); document.pkgform.submit(); } </script> diff --git a/usr/local/www/widgets/widgets/openvpn.widget.php b/usr/local/www/widgets/widgets/openvpn.widget.php index 9b5df89..3c460b2 100644 --- a/usr/local/www/widgets/widgets/openvpn.widget.php +++ b/usr/local/www/widgets/widgets/openvpn.widget.php @@ -63,18 +63,18 @@ $clients = openvpn_get_active_clients(); <br/> <script type="text/javascript"> function killClient(mport, remipp) { - var busy = function(icon) { - icon.onclick = ""; - icon.src = icon.src.replace("\.gif", "_d.gif"); - icon.style.cursor = "wait"; + var busy = function(index,icon) { + jQuery(icon).bind("onclick",""); + jQuery(icon).attr('src',jQuery(icon).attr('src').replace("\.gif", "_d.gif")); + jQuery(icon).css("cursor","wait"); } - $A(document.getElementsByName("i:" + mport + ":" + remipp)).each(busy); + jQuery('img[name="i:' + mport + ":" + remipp + '"]').each(busy); - new Ajax.Request( + jQuery.ajax( "<?=$_SERVER['SCRIPT_NAME'];?>" + "?action=kill&port=" + mport + "&remipp=" + remipp, - { method: "get", onComplete: killComplete } + { type: "get", complete: killComplete } ); } @@ -85,8 +85,8 @@ $clients = openvpn_get_active_clients(); return; } - $A(document.getElementsByName("r:" + values[1] + ":" + values[2])).each( - function(row) { Effect.Fade(row, { duration: 1.0 }); } + jQuery('tr[name="r:' + values[1] + ":" + values[2] + '"]').each( + function(index,row) { jQuery(row).fadeOut(1000); } ); } </script> @@ -249,4 +249,4 @@ if ($DisplayNote) { if ((empty($clients)) && (empty($servers))) { echo "No OpenVPN instance defined"; } -?>
\ No newline at end of file +?> |
