--- loncom/interface/lonrequestcourse.pm 2013/08/23 00:47:57 1.63.6.1
+++ loncom/interface/lonrequestcourse.pm 2012/08/15 14:37:13 1.65
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.63.6.1 2013/08/23 00:47:57 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.65 2012/08/15 14:37:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -147,6 +147,12 @@ sub handler {
}
}
+ if (($action eq 'new') && (&Apache::loncoursequeueadmin::author_prompt())) {
+ if (ref($states{$action}) eq 'ARRAY') {
+ push(@{$states{$action}},'reqauthor');
+ }
+ }
+
foreach my $key (keys(%states)) {
if (ref($states{$key}) eq 'ARRAY') {
unshift (@{$states{$key}},'crstype');
@@ -162,6 +168,7 @@ sub handler {
personnel => 'Personnel',
review => 'Review',
process => 'Result',
+ reqauthor => 'Authoring Space Result',
pick_request => 'Display Summary',
details => 'Request Details',
cancel => 'Cancel Request',
@@ -439,7 +446,7 @@ sub get_breadcrumbs {
$crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
last;
} else {
- if (($$state eq 'process') || ($$state eq 'removal')) {
+ if (($$state eq 'process') || ($$state eq 'removal') || ($$state eq 'reqauthor')) {
&Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/requestcourse',
text => "$trail->{$states->{$action}[$i]}",
@@ -712,8 +719,7 @@ END
official => 'You are not permitted to request creation of an official course in this domain.',
unofficial => 'You are not permitted to request creation of an unofficial course in this domain.',
community => 'You are not permitted to request creation of a community this domain.',
- all => 'You must choose a specific course type when making a new course request.',
- allt => '"All types" is not allowed.',
+ all => 'You must choose a specific course type when making a new course request.\\n\"All types\" is not allowed.',
);
$js .= < ');
if ($storeresult eq 'ok') {
- $r->print(''.
- &mt('Modify this request').''.(' 'x4));
+ $r->print(' '.
+ &mt('Modify this request').''.(' 'x4).
+ ''.&mt('Make another request').' '.
+ &mt('Although assessment items can be created directly inside a course, such items only use part of the assessment capabilities of LON-CAPA.').
+ ' '.&mt('Request authoring space access now?').
+ ' '.
+ ''.
+ (' 'x2).
+ ''.
+ ' '.&mt('Make another request').''.&mt('Access to authoring space').'
'.
+ '
'.
+ &mt('By contrast, items created in authoring space, then imported into a course, can use all of the features of the assessment engine.').'
');
+ } elsif ($storeresult eq 'created') {
+ $r->print('
'.$links[0].'
'); } } my @excluded = &get_excluded_elements($dom,$states,$action,$state); @@ -1481,15 +1545,18 @@ sub print_request_form { $count ++; } $env{'form.persontotal'} = $count; - } } if ($state eq 'enrollment') { push(@excluded,('sectotal','crosslisttotal')); } - $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).''); - &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next, - $navtxt{'next'},$state); + if (($state eq 'process') || ($state eq 'reqauthor')) { + $r->print(''); + } else { + $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).''); + &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next, + $navtxt{'next'},$state); + } return; } @@ -3334,8 +3401,9 @@ sub print_request_outcome { }; my (@inststatuses,$storeresult,$creationresult); my $val = - &Apache::loncoursequeueadmin::get_processtype($env{'user.name'},$env{'user.domain'}, - $env{'user.adv'},$dom,$crstype,\@inststatuses,\%domconfig); + &Apache::loncoursequeueadmin::get_processtype('course',$env{'user.name'}, + $env{'user.domain'},$env{'user.adv'}, + $dom,$crstype,\@inststatuses,\%domconfig); if ($val eq '') { if ($crstype eq 'official') { $output = &mt('You are not permitted to request creation of official courses.');