--- loncom/interface/lonrequestcourse.pm	2014/05/14 18:20:09	1.83
+++ loncom/interface/lonrequestcourse.pm	2015/03/26 14:16:11	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.83 2014/05/14 18:20:09 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.86 2015/03/26 14:16:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -172,7 +172,7 @@ sub handler {
                 if ($can_request{'textbook'}) {
                     &process_textbook_request($r,$dom,$action,\%domdefs,\%domconfig,\%can_request);
                 } else {
-                    &textbook_request_disabled($r,$dom,\%can_request);
+                    &textbook_request_disabled($r,$dom,$action,\%can_request);
                 }
             } elsif ($action eq 'display') {
                my ($uname,$udom,$result,$warning) = &domcoord_display($dom);
@@ -194,7 +194,7 @@ sub handler {
                 if ($can_request{'textbook'}) {
                     &print_textbook_form($r,$dom,\@incdoms,\%domdefs,$domconfig{'requestcourses'},\%can_request);
                 } else {
-                    &textbook_request_disabled($r,$dom,\%can_request);
+                    &textbook_request_disabled($r,$dom,$action,\%can_request);
                 }
             }
             return OK;
@@ -311,6 +311,8 @@ sub handler {
             $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
             if ($state eq 'courseinfo') {
                 $jscript .= &cloning_javascript();
+            } elsif ($state eq 'process') {
+                $jscript .= &processing_javascript();
             }
         }
     }
@@ -413,7 +415,7 @@ function setCloneDisplay(courseForm) {
         for (var i=0; i<courseForm.cloning.length; i++) {
             if (courseForm.cloning[i].checked) {
                 if (courseForm.cloning[i].value == 1) {
-                    document.getElementById('cloneoptions').style.display="block";;
+                    document.getElementById('cloneoptions').style.display="block";
                 }
             }
         }
@@ -422,6 +424,17 @@ function setCloneDisplay(courseForm) {
 END
 }
 
+sub processing_javascript {
+    return <<"END";
+function hideProcessing() {
+    if (document.getElementById('processing')) {
+        document.getElementById('processing').style.display="none";
+    }
+}
+
+END
+}
+
 sub get_breadcrumbs {
     my ($dom,$action,$state,$states,$trail) = @_;
     my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
@@ -463,27 +476,29 @@ sub get_breadcrumbs {
                     }
                 }
             }
-            for (my $i=0; $i<@{$states->{$action}}; $i++) {
-                if ($$state eq $states->{$action}[$i]) {
-                    &Apache::lonhtmlcommon::add_breadcrumb(
-                       {text=>"$trail->{$$state}"});
-                    $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
-                    last;
-                } else {
-                    if (($$state eq 'process') || ($$state eq 'removal') || ($$state eq 'reqauthor')) {
+            if (ref($states->{$action}) eq 'ARRAY') {
+                for (my $i=0; $i<@{$states->{$action}}; $i++) {
+                    if ($$state eq $states->{$action}[$i]) {
                         &Apache::lonhtmlcommon::add_breadcrumb(
-                            { href => '/adm/requestcourse',
-                              text => "$trail->{$states->{$action}[$i]}",
-                            }
-                        );
+                           {text=>"$trail->{$$state}"});
+                        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
+                        last;
                     } else {
-                        &Apache::lonhtmlcommon::add_breadcrumb(
+                        if (($$state eq 'process') || ($$state eq 'removal') || ($$state eq 'reqauthor')) {
+                            &Apache::lonhtmlcommon::add_breadcrumb(
+                                { href => '/adm/requestcourse',
+                                  text => "$trail->{$states->{$action}[$i]}",
+                                }
+                           );
+                        } else {
+                            &Apache::lonhtmlcommon::add_breadcrumb(
      { href => "javascript:backPage(document.requestcrs,'$states->{$action}[$i]')",
        text => "$trail->{$states->{$action}[$i]}", }
-                       );
-                   }
-               }
-           }
+                           );
+                        }
+                    }
+                }
+            }
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb(
                     {text=>'Pick Action'});
@@ -697,6 +712,9 @@ sub onload_action {
         if ($state eq 'courseinfo') {
             $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);';
         }
+        if ($state eq 'process') {
+            $loaditems{'onload'} .= 'javascript:hideProcessing();';
+        }
     }
     return \%loaditems;
 }
@@ -1550,7 +1568,7 @@ sub print_request_form {
                                                      \%cat_order,\@code_order);
         }
         my $lonhost = $r->dir_config('lonHostID');
-        my ($storeresult,$result) = &print_request_outcome($lonhost,$dom,\@codetitles,
+        my ($storeresult,$result) = &print_request_outcome($r,$lonhost,$dom,\@codetitles,
                                                            \@code_order,$instcredits);
         $r->print($result);
         if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
@@ -3359,7 +3377,7 @@ sub display_navbuttons {
 }
 
 sub print_request_outcome {
-    my ($lonhost,$dom,$codetitles,$code_order,$instcredits) = @_;
+    my ($r,$lonhost,$dom,$codetitles,$code_order,$instcredits) = @_;
     my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
         %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,
         $uniquecode);
@@ -3604,13 +3622,13 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
-    my ($result,$output) = &process_request($lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,
+    my ($result,$output) = &process_request($r,$lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,
                                             $req_notifylist,\@instsections,\%domconfig);
     return ($result,$output);
 }
     
 sub process_request {
-    my ($lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,
+    my ($r,$lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,
         $domconfig) = @_; 
     my (@inststatuses,$storeresult,$creationresult,$output);
     my $val = 
@@ -3652,6 +3670,11 @@ sub process_request {
                                             $dom,$crstype,$limit,\$message);
         } elsif ($val eq 'validate') {
             my ($inststatuslist,$validationchk,$validation,%custominfo);
+            if (ref($details) eq 'HASH') {
+                if ($details->{'clonecrs'}) {
+                    $custominfo{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'};
+                }
+            }
             if (@inststatuses > 0) {
                 $inststatuslist = join(',',@inststatuses);
             }
@@ -3740,6 +3763,15 @@ sub process_request {
             foreach my $role (@roles) {
                 $longroles{$role}=&Apache::lonnet::plaintext($role,$type);
             }
+            $r->print('<div id="processing" style="display:block;">'."\n".
+                      &mt('Your request is being processed; this page will update when processing is complete.').
+                      '</div>');
+            $r->rflush();
+            if (ref($details) eq 'HASH') {
+                if ($details->{'clonecrs'}) {
+                    $customitems{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'};
+                }
+            }
             my ($result,$postprocess) = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
                                           'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
                                           \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,
@@ -4782,7 +4814,11 @@ sub process_textbook_request {
             undef($clonedom);
         }
     }
-    $r->print(&header('Course Creation'));
+    my $js = &processing_javascript();
+    my $loaditems = { 
+                      onload => 'javascript:hideProcessing();',
+                    };
+    $r->print(&header('Course Creation',$js,$loaditems));
 
     if (ref($can_request) eq 'HASH') {
         unless ((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) {
@@ -4821,7 +4857,8 @@ sub process_textbook_request {
         $details->{dateshift} = $env{'form.dateshift'};
     }
     my $lonhost = $r->dir_config('lonHostID');
-    my ($result,$output) = &process_request($lonhost,$dom,$cnum,$crstype,$now,$details,'',
+    $r->rflush();
+    my ($result,$output) = &process_request($r,$lonhost,$dom,$cnum,$crstype,$now,$details,'',
                                             $req_notifylist,[],$domconfig);
     $r->print($output);
     if (&Apache::loncoursequeueadmin::author_prompt()) {
@@ -4989,6 +5026,33 @@ ENDSCRIPT
 
 }
 
+sub textbook_request_disabled {
+    my ($r,$dom,$action,$can_request) = @_;
+    if (ref($can_request) eq 'HASH') {
+        if ($action eq 'process') {
+            unless ((scalar(keys(%{$can_request})) == 1)) {
+                &Apache::lonhtmlcommon::add_breadcrumb(
+                   { href => '/adm/requestcourse',
+                     text => 'Pick action',
+                   });
+            }
+        }
+    }
+    $r->print(&header('Course Request'));
+    &Apache::lonhtmlcommon::add_breadcrumb({text=>'Course Request'});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests').
+              '<div>'.
+              '<p class="LC_info">'.&mt('You do not have privileges to request creation of textbook courses.').'</p>');
+    if (ref($can_request) eq 'HASH') {
+        if (scalar(keys(%{$can_request})) > 1) {
+            $r->print('<a href="/adm/requestcourse">'.&mt('Go back').'</a>');
+         }
+    }
+    $r->print('</div>'.
+              &Apache::loncommon::end_page());
+    return;
+}
+
 sub startContentScreen {
     my ($r,$mode)=@_;
     $r->print("\n".'<ul class="LC_TabContentBigger" id="textbookreq">'."\n");