summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/authgui.inc8
-rwxr-xr-xusr/local/www/load_balancer_virtual_server_edit.php2
-rwxr-xr-xusr/local/www/status_queues.php2
-rw-r--r--usr/local/www/widgets/javascript/cpu_graphs.js15
4 files changed, 13 insertions, 14 deletions
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index e374ad3..ae59197 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -117,8 +117,8 @@ function display_error_form($http_code, $desc) {
<!--
function page_load() {}
function clearError() {
- if($('inputerrors'))
- $('inputerrors').innerHTML='';
+ if($('#inputerrors'))
+ $('#inputerrors').html('');
}
<?php
require("headjs.php");
@@ -221,8 +221,8 @@ $have_cookies = isset($_COOKIE["cookie_test"]);
<!--
function page_load() {}
function clearError() {
- if($('inputerrors'))
- $('inputerrors').innerHTML='';
+ if($('#inputerrors'))
+ $('#inputerrors').html('');
}
<?php
require("headjs.php");
diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php
index b9b4634..7a2d792 100755
--- a/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/usr/local/www/load_balancer_virtual_server_edit.php
@@ -157,7 +157,7 @@ function updateRelay(m) {
}
}
-document.observe("dom:loaded", function() {
+jQuery(document).ready( function() {
// Setup some observers
jQuery('#redirect_mode').bind('click', function(){
updateRelay('redirect');
diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php
index 32dfd09..192cd6a 100755
--- a/usr/local/www/status_queues.php
+++ b/usr/local/www/status_queues.php
@@ -126,7 +126,7 @@ if(!is_array($config['shaper']['queue']) && count($config['shaper']['queue']) <
function activitycallback(transport) {
setTimeout('getqueueactivity()', 5100);
}
- document.observe('dom:loaded', function(){
+ jQuery(document).ready(function(){
setTimeout('getqueueactivity()', 150);
});
</script>
diff --git a/usr/local/www/widgets/javascript/cpu_graphs.js b/usr/local/www/widgets/javascript/cpu_graphs.js
index 3d91b5f..c7b6e8b 100644
--- a/usr/local/www/widgets/javascript/cpu_graphs.js
+++ b/usr/local/www/widgets/javascript/cpu_graphs.js
@@ -36,7 +36,7 @@ var GL_DYNAMIC = 1;
function GraphInitialize(element_id, width, height, bar_width) {
// Find the page element which will contain the graph
var owner;
- if((owner = $(element_id)) == null) {
+ if((owner = jQuery('#' + element_id)) == null) {
alert("GraphLink Error: Element ID '" + element_id + "' not found.");
return false;
}
@@ -71,14 +71,13 @@ function GraphInitialize(element_id, width, height, bar_width) {
}
graph_html += '</div>';
- owner.innerHTML = graph_html;
- graph['element_id'] = $('GraphLinkData' + graph['id']);
+ owner.html(graph_html);
+ graph['element_id'] = jQuery('#GraphLinkData' + graph['id']);
for(i = 0; i < bar_count; i++) {
- graph['spans'][i] = $('GraphLinkBar' + graph['id'] +
- '_' + i);
- graph['spans'][i].style.width = bar_width + 'px';
- graph['spans'][i].style.marginTop = height + 'px';
+ graph['spans'][i] = jQuery('#GraphLinkBar' + graph['id'] + '_' + i);
+ graph['spans'][i].css('width',bar_width + 'px');
+ graph['spans'][i].css('margin-top',height + 'px');
}
return graph;
@@ -243,4 +242,4 @@ function GraphDraw(graph) {
graph['spans'][i].style.marginTop = getMargin(i);
// jQuery('#' + graph['spans'][count - 1]).fadeIn(500);
-} \ No newline at end of file
+}
OpenPOWER on IntegriCloud