From: ivan Date: Mon, 13 Mar 2006 22:32:51 +0000 (+0000) Subject: fix progress hoohaw for internet exploder again, whew. also make sure error/finish... X-Git-Tag: BEFORE_FINAL_MASONIZE~195 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=c1bc54f7523d2af6114d7445bbbe5618f1429794 fix progress hoohaw for internet exploder again, whew. also make sure error/finish messages are centered, looks better --- diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html index efebe48e9..ec485f438 100644 --- a/httemplate/elements/progress-init.html +++ b/httemplate/elements/progress-init.html @@ -31,7 +31,9 @@ function <%=$key%>process () { //alert('<%=$key%>process for form <%=$formname%>'); - document.<%=$formname%>.submit.disabled=true; + if ( document.<%=$formname%>.submit.disabled == false ) { + document.<%=$formname%>.submit.disabled=true; + } overlib( 'Submitting job to server...', WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 ); diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html index 200f97d9b..544440138 100644 --- a/httemplate/elements/progress-popup.html +++ b/httemplate/elements/progress-popup.html @@ -45,7 +45,9 @@ function updateStatus( status_statustext ) { document.getElementById("progress_bar").innerHTML = ''; document.getElementById("progress_percent").innerHTML = ''; document.getElementById("progress_jobnum").innerHTML = ''; - parent.document.<%=$formname%>.submit.disabled=false; + if ( parent.document.<%=$formname%>.submit.disabled == true ) { + parent.document.<%=$formname%>.submit.disabled=false; + } <% } elsif ( $url ) { %> window.top.location.href = '<%= $url %>'; <% } else { %> @@ -56,7 +58,9 @@ function updateStatus( status_statustext ) { document.getElementById("progress_bar").innerHTML = ''; document.getElementById("progress_percent").innerHTML = ''; document.getElementById("progress_jobnum").innerHTML = ''; - parent.document.<%=$formname%>.submit.disabled=false; + if ( parent.document.<%=$formname%>.submit.disabled == true ) { + parent.document.<%=$formname%>.submit.disabled=false; + } } else { alert('XXX unknown status returned from server: ' + status); } @@ -64,7 +68,7 @@ function updateStatus( status_statustext ) { } - +
Server processing job...