From: Ivan Kohler Date: Tue, 27 Oct 2015 16:40:45 +0000 (-0700) Subject: progressbar fix for elements/ exclusion, RT#38752 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=59dabb780e7fa25290392bb3c40d3f87b404463d progressbar fix for elements/ exclusion, RT#38752 --- diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index 972625ff6..e1645f04c 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -244,17 +244,13 @@ sub rooturl { $url_string =~ s{ / - (browse|config|docs|edit|graph|misc|search|view|pref|elements|rt|torrus) + (browse|config|docs|edit|graph|misc|search|view|pref|rt|torrus) (/process)? ([\w\-\.\/]*) $ } {}x; - #elements because of progress-popup.html... - #XXX remove anything from elements that is called directly & prevent - #those pages from being served up - $url_string .= '/' unless $url_string =~ /\/$/; $url_string; diff --git a/httemplate/elements/jsrsServer.html b/httemplate/elements/jsrsServer.html deleted file mode 100644 index f37b0aaee..000000000 --- a/httemplate/elements/jsrsServer.html +++ /dev/null @@ -1,4 +0,0 @@ -% -% my $server = new FS::UI::Web::JSRPC '', $cgi; -% -<% $server->process %> diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html index 2728240ef..e38dde65f 100644 --- a/httemplate/elements/progress-init.html +++ b/httemplate/elements/progress-init.html @@ -161,7 +161,7 @@ if ( ref($url_or_message) ) { #its a message or something %dest_info = ( 'url' => $url_or_message ); } -my $progress_url = URI->new($fsurl.'elements/progress-popup.html'); +my $progress_url = URI->new($fsurl.'misc/progress-popup.html'); $progress_url->query_form( 'jobnum' => '_JOBNUM_', 'formname' => $formname, diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html deleted file mode 100644 index a37cf24eb..000000000 --- a/httemplate/elements/progress-popup.html +++ /dev/null @@ -1,135 +0,0 @@ -% -% my $jobnum = $cgi->param('jobnum'); -% my $url = $cgi->param('url'); -% my $message = $cgi->param('message'); -% my $popup_url = $cgi->param('popup_url'); -% my $formname = scalar($cgi->param('formname')); -% my $error_url = $cgi->param('error_url'); -% - - - - - - - -<% include('/elements/xmlhttp.html', - 'url' => $p.'elements/jsrsServer.html', - 'subs' => [ 'job_status' ], - ) -%> - - - - - - - - - - - - - - - -
- Server processing job... -
- -
-
%
-
- (progress of job #<% $jobnum %>) -
- - - - diff --git a/httemplate/misc/jsrsServer.html b/httemplate/misc/jsrsServer.html new file mode 100644 index 000000000..f37b0aaee --- /dev/null +++ b/httemplate/misc/jsrsServer.html @@ -0,0 +1,4 @@ +% +% my $server = new FS::UI::Web::JSRPC '', $cgi; +% +<% $server->process %> diff --git a/httemplate/misc/progress-popup.html b/httemplate/misc/progress-popup.html new file mode 100644 index 000000000..8e2d6760b --- /dev/null +++ b/httemplate/misc/progress-popup.html @@ -0,0 +1,135 @@ +% +% my $jobnum = $cgi->param('jobnum'); +% my $url = $cgi->param('url'); +% my $message = $cgi->param('message'); +% my $popup_url = $cgi->param('popup_url'); +% my $formname = scalar($cgi->param('formname')); +% my $error_url = $cgi->param('error_url'); +% + + + + + + + +<% include('/elements/xmlhttp.html', + 'url' => $p.'misc/jsrsServer.html', + 'subs' => [ 'job_status' ], + ) +%> + + + + + + + + + + + + + + + +
+ Server processing job... +
+ +
+
%
+
+ (progress of job #<% $jobnum %>) +
+ + + +