--- loncom/interface/lonrequestcourse.pm	2009/09/11 12:53:10	1.35
+++ loncom/interface/lonrequestcourse.pm	2010/01/02 18:11:46	1.41.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.35 2009/09/11 12:53:10 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.41.2.3 2010/01/02 18:11:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,10 +52,6 @@ described at http://www.lon-capa.org.
 
 =item onload_action()
 
-=item check_can_request() 
-
-=item course_types()
-
 =item print_main_menu()
 
 =item request_administration()
@@ -134,7 +130,7 @@ sub handler {
     }
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['action','showdom','cnum','state']);
+        ['action','showdom','cnum','state','crstype']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $dom = &get_course_dom();
     my $action = $env{'form.action'};
@@ -147,6 +143,10 @@ sub handler {
     $states{'log'} = ['filter','display'];
     $states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
 
+    if ($dom eq 'gcitest') {
+        $states{'new'} = ['courseinfo','review','process'];
+    }
+
     if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
         unless ($env{'form.state'} eq 'crstype') {
             unshift(@{$states{'new'}},'codepick');
@@ -161,7 +161,7 @@ sub handler {
 
     my @invalidcrosslist;
     my %trail = (
-                 crstype       => 'Course Request Action',
+                 crstype       => 'Request Action',
                  codepick      => 'Category',
                  courseinfo    => 'Description',
                  enrollment    => 'Access Dates',
@@ -173,12 +173,16 @@ sub handler {
                  cancel        => 'Cancel Request',
                  removal       => 'Outcome',
                 );
+    if ($dom eq 'gcitest') {
+        $trail{'crstype'} = 'Building a Test';
+        $trail{'courseinfo'} = 'Test Information';
+    }
 
     if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
         $trail{'enrollment'} = 'Enrollment';
     }
 
-    my ($page,$crumb,$newinstcode,$codechk,$checkedcode) = 
+    my ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description) = 
         &get_breadcrumbs($dom,$action,\$state,\%states,\%trail);
     if ($action eq 'display') {
         if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
@@ -196,16 +200,30 @@ sub handler {
                     if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) {
                         $result = &retrieve_settings($dom,$cnum,$udom,$uname);
                     } else {
-                        $warning = &mt('Invalid username or domain for course requestor');
+                        if ($env{'form.crstype'} eq 'community') {
+                            $warning = &mt('Invalid username or domain for community requestor');
+                        } else {
+                            $warning = &mt('Invalid username or domain for course requestor');
+                        }
                     }
                 } else {
-                    $warning = &mt('No information was found for this course request.');
+                    if ($env{'form.crstype'} eq 'community') {
+                        $warning = &mt('No information was found for this community request.');
+                    } else {
+                        $warning = &mt('No information was found for this course request.');
+                    }
                 }
             } else {
                 $warning = &mt('No course request ID provided.');
             }
         } else {
-            $warning = &mt('You do not have rights to view course request information.');
+            if ($env{'form.crstype'} eq 'any') {
+               $warning = &mt('You do not have rights to view course or community request information.');
+            } elsif ($env{'form.crstype'} eq 'community') {
+                $warning = &mt('You do not have rights to view community request information.');
+            } else {
+                $warning = &mt('You do not have rights to view course request information.');
+            }
         }
     } elsif ((defined($state)) && (defined($action))) {
         if (($action eq 'view') && ($state eq 'details')) {
@@ -239,7 +257,7 @@ sub handler {
                                         $crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item}; 
                                     }
                                     if ($crosslistcode ne '') { 
-                                         $codechk{$i} = 
+                                         ($codechk{$i}, my $rest) = 
                                             &Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode);
                                     }
                                     unless ($codechk{$i} eq 'valid') {
@@ -276,27 +294,29 @@ sub handler {
 
     my $loaditems = &onload_action($action,$state);
 
-    my %can_request;
-    my $canreq = &check_can_request($dom,\%can_request);
+    my (%can_request,%request_domains);
+    my $canreq = 
+        &Apache::lonnet::check_can_request($dom,\%can_request,\%request_domains);
     if ($action eq 'new') {
         if ($canreq) {
             if ($state eq 'crstype') {
                 &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,
-                                 $crumb);
+                                 $crumb,\%request_domains);
             } else {
                 &request_administration($r,$action,$state,$page,\%states,$dom,
                                         $jscript,$loaditems,$crumb,$newinstcode,
-                                        $codechk,$checkedcode,\@invalidcrosslist);
+                                        $codechk,$checkedcode,$description,
+                                        \@invalidcrosslist);
             }
         } else {
-            $r->print(&header('Course Requests').$crumb.
+            $r->print(&header('Course/Community Requests').$crumb.
                       '<div class="LC_warning">'.
-                      &mt('You do not have privileges to request creation of courses.').
+                      &mt('You do not have privileges to request creation of courses or communities.').
                       '</div>'.&Apache::loncommon::end_page());
         }
     } elsif ($action eq 'view') {
         if ($state eq 'crstype') {
-            &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb);
+            &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb,\%request_domains);
         } else {
             &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
                                     $loaditems,$crumb);
@@ -304,18 +324,18 @@ sub handler {
     } elsif ($action eq 'display') {
         if ($warning ne '') {
             my $args = { only_body => 1 };
-            $r->print(&header('Course Requests','','',$args).$crumb.
-                      '<h3>'.&mt('Course Request Details').'</h3>'.
+            $r->print(&header('Course/Community Requests','','',$args).$crumb.
+                      '<h3>'.&mt('Course/Community Request Details').'</h3>'.
                       '<div class="LC_warning">'.$warning.'</div>'.
                       &close_popup_form());
         } else {
             &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
-                                    $loaditems,$crumb,'','','','',$uname,$udom);
+                                    $loaditems,$crumb,'','','','','',$uname,$udom);
         }
     } elsif ($action eq 'log') {
         &print_request_logs($jscript,$loaditems,$crumb);
     } else {
-        &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
+        &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\%request_domains);
     }
     return OK;
 }
@@ -346,8 +366,16 @@ END
 
 sub get_breadcrumbs {
     my ($dom,$action,$state,$states,$trail) = @_;
-    my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles);
+    my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
     my $page = 0;
+    my $firstcrumb = 'Pick Action';
+    my $crumbtitle = 'Course/Community Requests';
+    my $crumbhelp = 'Course_Requests';
+    if ($dom eq 'gcitest') {
+        $firstcrumb = 'Building a Test';
+        $crumbtitle = 'Create Concept Test';
+        $crumbhelp = 'Concept_Test_Creation';
+    }
     if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
         if (defined($action)) {
             my $done = 0;
@@ -371,7 +399,7 @@ sub get_breadcrumbs {
                                     $$state = 'codepick';
                                     $page --;
                                 } else {
-                                    $codechk = 
+                                    ($codechk,$description) = 
                                         &Apache::lonnet::auto_validate_instcode('',
                                             $dom,$newinstcode);
                                     if ($codechk ne 'valid') {
@@ -389,7 +417,7 @@ sub get_breadcrumbs {
                 if ($$state eq $states->{$action}[$i]) {
                     &Apache::lonhtmlcommon::add_breadcrumb(
                        {text=>"$trail->{$$state}"});
-                    $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+                    $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
                     last;
                 } else {
                     if (($$state eq 'process') || ($$state eq 'removal')) {
@@ -408,15 +436,15 @@ sub get_breadcrumbs {
            }
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb(
-                    {text=>'Pick Action'});
-            $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+                    {text=>$firstcrumb});
+            $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
         }
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb(
-                {text=>'Pick Action'});
-        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+                {text=>$firstcrumb});
+        $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
     }
-    return ($page,$crumb,$newinstcode,$codechk,$checkedcode);
+    return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description);
 }
 
 sub header {
@@ -487,12 +515,22 @@ sub form_elements {
          },
     );
     my %servers = &Apache::lonnet::get_servers($dom,'library');
+    if ($dom eq 'gcitest') {
+        %{$elements{'new'}{'courseinfo'}} = (
+                                              cdescr      => 'text',
+                                              concepttest => 'radio', 
+                                            );
+    }
     my $numlib = keys(%servers);
     if ($numlib > 1) {
         $elements{'new'}{'courseinfo'}{'chome'} = 'selectbox';
     } else {
         $elements{'new'}{'courseinfo'}{'chome'} = 'hidden';
     }
+    if ($dom eq 'gcitest') {
+        my %mergedhash = (%{$elements{'new'}{'courseinfo'}},%{$elements{'new'}{'enrollment'}});
+        %{$elements{'new'}{'courseinfo'}} = %mergedhash;
+    }
     my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
     &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                              \%cat_order,\@code_order);
@@ -589,59 +627,19 @@ sub onload_action {
         } else {
             $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)';
         }
-    }
-    return \%loaditems;
-}
-
-sub check_can_request {
-    my ($dom,$can_request) = @_;
-    my $canreq = 0;
-    my ($types,$typename) = &course_types();
-    my @options = ('approval','validate','autolimit');
-    my $optregex = join('|',@options);
-    if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) {
-        foreach my $type (@{$types}) {
-            if (&Apache::lonnet::usertools_access($env{'user.name'},
-                                                  $env{'user.domain'},
-                                                  $type,undef,'requestcourses')) {
-                $canreq ++;
-                if ($dom eq $env{'user.domain'}) {
-                    $can_request->{$type} = 1;
-                }
-            }
-            if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
-                my @curr = split(',',$env{'environment.reqcrsotherdom.'.$type});
-                if (@curr > 0) {
-                    $canreq ++;
-                    unless ($dom eq $env{'user.domain'}) {
-                        if (grep(/^\Q$dom\E:($optregex)(=?\d*)$/,@curr)) {
-                            $can_request->{$type} = 1;
-                        }
-                    }
-                }
-            }
+        if (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
+            $loaditems{'onload'} = 'javascript:setInitialVisibility()';
         }
     }
-    return $canreq;
-}
-
-sub course_types {
-    my @types = ('official','unofficial','community');
-    my %typename = (
-                         official   => 'Official course',
-                         unofficial => 'Unofficial course',
-                         community  => 'Community',
-                   );
-    return (\@types,\%typename);
+    return \%loaditems;
 }
 
-
 sub print_main_menu {
-    my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb) = @_;
-    my ($types,$typename) = &course_types();
+    my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb,$request_domains) = @_;
+    my ($types,$typename) = &Apache::loncommon::course_types();
     my $onchange;
     unless ($env{'form.interface'} eq 'textual') {
-        $onchange = 1;
+        $onchange = 'this.form.submit()';
     }
 
     my $nextstate_setter = "\n";
@@ -657,7 +655,9 @@ sub print_main_menu {
         }
     }
 
-    my $js = <<"END";
+    my $js;
+    unless ($dom eq 'gcitest') {
+        $js = <<"END";
 
 function nextPage(formname) {
     var crschoice = document.mainmenu_coursetype.crstype.value;
@@ -681,19 +681,20 @@ function check_can_request(crschoice,act
     var unofficial = '';
     var community = '';    
 END
-
-    foreach my $item (keys(%{$can_request})) {
-            $js .= " 
-        $item = 1;
+        if (ref($can_request) eq 'HASH') {
+            foreach my $item (keys(%{$can_request})) {
+                    $js .= " 
+            $item = 1;
 ";
-    }
-    my %lt = &Apache::lonlocal::texthash(
-        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.\\nAll types is not allowed.',
-    ); 
-    $js .= <<END;
+            }
+        }
+        my %lt = &Apache::lonlocal::texthash(
+            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.\\nAll types is not allowed.',
+        ); 
+        $js .= <<END;
     if (crschoice == 'official') {
         if (official != 1) {
             alert("$lt{'official'}");
@@ -701,9 +702,9 @@ END
         }
     } else {
         if (crschoice == 'unofficial') {
-            if (unofficial != 1) {
-                alert("$lt{'unofficial'}");
-                return false;
+           if (unofficial != 1) {
+               alert("$lt{'unofficial'}");
+               return false;
             }
         } else {
             if (crschoice == 'community') {
@@ -715,28 +716,100 @@ END
                 if (actionchoice == 'new') {
                     alert("$lt{'all'}");
                     return false;
-                }               
+                }
             }
         }
     }
     return true;
 }
-
 END
+    }
+    my ($pagetitle,$pageinfo,$domaintitle);
+    if (ref($can_request) eq 'HASH') {
+        if (($can_request->{'official'}) || ($can_request->{'unofficial'})) {
+            if ($can_request->{'community'}) {
+                $pagetitle = 'Course/Community Requests';
+                $pageinfo = &mt('Request creation of a new course or community, or review your pending requests.');
+                $domaintitle = &mt('Course/Community Domain');
+            } else {
+                $pagetitle = 'Course Requests';
+                $pageinfo = &mt('Request creation of a new course, or review your pending course requests.');
+                $domaintitle = &mt('Course Domain');
+            }
+        } elsif ($can_request->{'community'}) {
+            $pagetitle = 'Community Requests';
+            $pageinfo = &mt('Request creation of a new course, or review your pending requests.');
+            $domaintitle = &mt('Community Domain');
+        } else {
+            $pagetitle = 'Course/Community Requests';
+            $pageinfo = &mt('You do not have rights to request creation of courses in this domain; please choose a different domain.');
+            $domaintitle = &mt('Course/Community Domain');
+        }
+    }
 
-    $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
-             '<p>'.&mt('Request creation of a new course, or review your pending course requests.').'</p>'.
+    if ($dom eq 'gcitest') {
+        my $formname = 'requestcrs';
+        my $nexttext = &mt('Continue');
+        $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
+            '<p>'.&mt('Deployment of a Concept Test requires completion of the following three steps:').'<ol>'.
+            '<li>'.&mt('Creation of a course "container" and setting of access dates').'</li>'.
+            '<li>'.&mt('Assembly of a valid test from Concept Inventory questions').'</li>'.
+            '<li>'.&mt('Enrollment of students').'</li>'.
+            '</ol></p><p>'.&mt('When assembling a test you may either:').
+            '<br />'.&mt('(a) have a valid test built automatically by the WebCenter, or').'<br />'.&mt('(b) select the questions to include by combining questions chosen from eleven bins with four mandatory questions.').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' full e-mail addresses should be used as their usernames to ensure uniqueness.").'</p><div>'.
+            '<form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
+            '<input type="hidden" name="state" value="courseinfo" />'."\n".
+            '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
+            '<input type="hidden" name="crstype" value="unofficial" />'."\n".
+            '<input type="hidden" name="action" value="new" />'."\n".
+            '<input type="button" name="next" value="'.$nexttext.
+            '" onclick="this.form.submit();" />'."\n".
+            '</form></div>'.
+             &Apache::loncommon::end_page());
+        return;
+    }
+
+    if (!$onchange) {
+        $r->print('&nbsp;<input type="submit" name="godom" value="'.
+                   &mt('Change').'" />');
+    }
+    unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) {
+        $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n".
+                  &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
+                  &Apache::loncommon::end_page());
+        return;
+    }
+
+    my @incdoms;
+    if (ref($request_domains) eq 'HASH') {
+        foreach my $item (keys(%{$request_domains})) {
+            if (ref($request_domains->{$item}) eq 'ARRAY') {
+                foreach my $possdom (@{$request_domains->{$item}}) {
+                    unless(grep(/^\Q$possdom\E$/,@incdoms)) {
+                        push(@incdoms,$possdom);
+                    } 
+                } 
+            }
+        }
+    }
+    $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
+             '<p>'.$pageinfo.'</p>'.
              '<div>'.
               &Apache::lonhtmlcommon::start_pick_box().
-              &Apache::lonhtmlcommon::row_title(&mt('Course Domain')).
+              &Apache::lonhtmlcommon::row_title($domaintitle).
               '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
-              &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange));
+              &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange,\@incdoms));
     if (!$onchange) {
         $r->print('&nbsp;<input type="submit" name="godom" value="'.
                    &mt('Change').'" />');
     }
+    unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) {
+        $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n".
+                  &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
+                  &Apache::loncommon::end_page());
+        return;
+    }
     $r->print('</form>'.&Apache::lonhtmlcommon::row_closure());
-
     my $formname = 'requestcrs';
     my $nexttext = &mt('Next');
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
@@ -747,24 +820,35 @@ END
  <option value="log">'.&mt('View request history').'</option>
 </select></form>'.
               &Apache::lonhtmlcommon::row_closure(1).
-              &Apache::lonhtmlcommon::row_title(&mt('Course Type')).'
+              &Apache::lonhtmlcommon::row_title(&mt('Type')).'
 <form name="mainmenu_coursetype" method="post" action="">
-<select size="1" name="crstype">
- <option value="any">'.&mt('All types').'</option>');
-    if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
-        foreach my $type (@{$types}) {
-            my $selected = '';
-            if ($type eq 'official') {
-                $selected = ' selected="selected"';
+<select size="1" name="crstype">');
+    if (ref($can_request) eq 'HASH') {
+        if (keys(%{$can_request}) > 1) {
+            $r->print(' <option value="any">'.&mt('All types').'</option>');
+        }
+        if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
+            foreach my $type (@{$types}) {
+                next unless($can_request->{$type});
+                my $selected = '';
+                if ($env{'form.crstype'} eq '') {
+                    if ($type eq 'official') {
+                        $selected = ' selected="selected"';
+                    }
+                } else {
+                    if ($type eq $env{'form.crstype'}) {
+                        $selected = ' selected="selected"';
+                    }
+                }
+                $r->print('<option value="'.$type.'"'.$selected.'>'.&mt($typename->{$type}).
+                          '</option>'."\n");
             }
-            $r->print('<option value="'.$type.'"'.$selected.'>'.&mt($typename->{$type}).
-                      '</option>'."\n");
         }
     }
     $r->print('</select></form>'."\n".
               &Apache::lonhtmlcommon::row_closure(1)."\n".
               &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
-              '<div><form name="'.$formname.'" method="post" action="">'."\n".
+              '<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
               '<input type="hidden" name="state" value="crstype" />'."\n".
               '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
               '<input type="hidden" name="crstype" value="" />'."\n".
@@ -778,7 +862,8 @@ END
 
 sub request_administration {
     my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,
-        $newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_;
+        $newinstcode,$codechk,$checkedcode,$description,$invalidcrosslist,
+        $uname,$udom) = @_;
     my $js;
     if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
         $js =  <<END;
@@ -811,10 +896,18 @@ END
             }
         } elsif ($state eq 'personnel') {
             $js .= "\n".&section_check_javascript()."\n".&personnel_lcsec_js();
+        } elsif (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
+            $js .= "\n".&Apache::londocsgci::builder_javascript()."\n";
+        }
+        my $title;
+        if ($env{'form.crstype'} eq 'community') {
+            $title = 'Request a community';
+        } else {
+            $title = 'Request a course';
         }
-        $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
+        $r->print(&header($title,$js.$jscript,$loaditems,$jsextra).$crumb);
         &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
-                            $codechk,$checkedcode,$invalidcrosslist);
+                            $codechk,$checkedcode,$description,$invalidcrosslist);
     } elsif ($action eq 'view') {
         my $jsextra;
         my $formname = 'requestcrs';
@@ -829,11 +922,26 @@ END
         } elsif ($state eq 'cancel') {
             $jsextra = &viewcancel_javascript($formname);
         }
-        $r->print(&header('Manage course requests',$js.$jscript.$jsextra,$loaditems).
-                  $crumb);
+        my $title;
+        if ($env{'form.crstype'} eq 'community') {
+            $title = 'Manage community requests';
+        } else {
+            $title = 'Manage course requests';
+        }
+        $r->print(&header($title,$js.$jscript.$jsextra,$loaditems).$crumb);
         my $form = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />';
         if ($state eq 'pick_request') {
-            $r->print('<h3>'.&mt('Pending course requests').'</h3><div>'."\n".$form."\n".
+            my $title;
+            if ($env{'form.crstype'} eq 'community') {
+                $title = &mt('Pending community requests');
+            } elsif ($env{'form.crstype'} eq 'official') {
+                $title = &mt('Pending requests for official courses');
+            } elsif ($env{'form.crstype'} eq 'unofficial') {
+                $title = &mt('Pending requests for unofficial courses');
+            } else {
+                $title = &mt('Pending course/community requests'); 
+            }
+            $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
                       &print_request_status($dom).'</form></div>');
         } elsif ($state eq 'details') {
             my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
@@ -845,7 +953,13 @@ END
                 &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                          \%cat_order,\@code_order);
             }
-            $r->print('<h3>'.&mt('Course Request Details').'</h3><div>'."\n".$form."\n".
+            my $title;
+            if ($env{'form.crstype'} eq 'community') {
+                $title = &mt('Community Request Details');
+            } else {
+                $title = &mt('Course Request Details');
+            }
+            $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
                       &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
                                     \@code_order)."\n".
                       '<input name="origcnum" value="'.$origcnum.'" type="hidden" />'."\n");
@@ -862,8 +976,14 @@ END
                                 $navtxt{'next'},$state,$other,$navtxt{'other'});
             $r->print('</form>');
         } elsif ($state eq 'cancel') {
+            my $title;
+            if ($env{'form.crstype'} eq 'community') {
+                $title = &mt('Cancel community request');
+            } else {
+                $title = &mt('Cancel course request');
+            }
             my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'});
-            $r->print('<h3>'.&mt('Cancel course request').'</h3><div>'."\n".$form."\n".
+            $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
                       $output);
             my @excluded = &get_excluded_elements($dom,$states,'view','cancel');
             $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</div>');
@@ -912,7 +1032,11 @@ END
                       '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
                       '<input type="hidden" name="orignum" value="'.$cnum.'" />'."\n");
             if ($result eq 'ok') {
-                $r->print(&mt('Your course request has been cancelled.'));
+                if ($env{'form.crstype'} eq 'community') {
+                    $r->print(&mt('Your community request has been cancelled.'));
+                } else {
+                    $r->print(&mt('Your course request has been cancelled.'));
+                }
             } else {
                 $r->print('<div class="LC_error">'.
                           &mt('The request cancellation process was not complete.').
@@ -927,8 +1051,16 @@ END
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                      \%cat_order,\@code_order);
         }
-        $r->print(&header('Course Request','','','',{ 'only_body' => 1}).
-                  $crumb."\n".'<h3>'.&mt('Course Request Details').'</h3>'.
+        my ($title,$header);
+        if ($env{'form.crstype'} eq 'community') {
+            $title = 'Community Request';
+            $header = &mt('Community Request');
+        } else {
+            $title = 'Course Request';
+            $header = &mt('Course Request');
+        }
+        $r->print(&header($title,'','','',{ 'only_body' => 1}).
+                  $crumb."\n".'<h3>'.$header.'</h3>'.
                   &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
                                 \@code_order,$uname,$udom)."\n".'</div>'.
                   &close_popup_form());
@@ -1126,7 +1258,7 @@ sub get_instcode {
 
 sub print_request_form {
     my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode,
-        $invalidcrosslist) = @_;
+        $description,$invalidcrosslist) = @_;
     my $formname = 'requestcrs';
     my ($next,$prev,$message,$output,$codepicker,$crstype);
     $prev = $states->{$action}[$page-1];
@@ -1191,7 +1323,7 @@ sub print_request_form {
         if ($instcode eq '') {
             $prev = $states->{$action}[$page-2];
         }
-        $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
+        $r->print(&courseinfo_form($dom,$formname,$crstype,$next,$description));
     } elsif ($state eq 'enrollment') {
         if ($crstype eq 'official') {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
@@ -1284,16 +1416,24 @@ sub print_request_form {
         }
         &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                  \%cat_order,\@code_order);
-        $r->print('<h3>'.&mt('Review course request details before submission').'</h3>'.
-                  &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg).
+        if ($crstype eq 'community') {
+            $r->print('<h3>'.&mt('Review community request details before submission').'</h3>');
+        } else {
+            $r->print('<h3>'.&mt('Review course request details before submission').'</h3>');
+        }
+        $r->print(&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg).
                   '<input type="hidden" name="cnum" value="'.$cnum.'" />');
-        $navtxt{'next'} = &mt('Submit course request');
+        if ($crstype eq 'community') {
+            $navtxt{'next'} = &mt('Submit community request');
+        } else {
+            $navtxt{'next'} = &mt('Submit course request');
+        }
     }  elsif ($state eq 'process') {
         if ($crstype eq 'official') {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                      \%cat_order,\@code_order);
         }
-        my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
+        my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles,
                                                            \@code_order);
         $r->print($result);
         if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
@@ -1302,7 +1442,9 @@ sub print_request_form {
                 $r->print('<a href="/adm/requestcourse?action=view&state=details&showdom='.$dom.'&cnum='. $env{'form.cnum'}.'">'.
                           &mt('Modify this request').'</a>'.('&nbsp;'x4));
             }
-            $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
+            unless ($env{'form.concepttest'}) {
+                $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
+            }
             return;
         }
     }
@@ -1452,7 +1594,7 @@ sub print_enrollment_menu {
             }
             if ($crosslist_form) { 
                 $crosslist_form .= 
-                    &Apache::lonhtmlcommon::row_title(&mt('Add another?')).
+                    &Apache::lonhtmlcommon::row_title(&mt('Add another')).
                     '<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
                     '<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
                     ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
@@ -1485,7 +1627,6 @@ sub print_enrollment_menu {
     my $access_dates = 
         &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
                             %accesstitles);
-    $output .= &Apache::lonhtmlcommon::start_pick_box();
     if ($sections) {
         $output .=  $sections;
     }
@@ -1505,8 +1646,12 @@ sub print_enrollment_menu {
                    &Apache::lonhtmlcommon::row_closure(1).
                    $access_dates
     }
-    return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
-           &Apache::lonhtmlcommon::end_pick_box().'</div>';
+    if ($dom eq 'gcitest') {
+        return $output;
+    } else {
+        return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+               &Apache::lonhtmlcommon::end_pick_box().'</div>';
+    }
 }
 
 sub show_invalid_crosslists {
@@ -1624,12 +1769,12 @@ sub print_personnel_menu {
     }
     my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom');
 
-    my $roleoptions;
-    my @roles = &Apache::lonuserutils::roles_by_context('course');
     my $type = 'Course';
     if ($crstype eq 'community') {
         $type = 'Community';
     }
+    my $roleoptions;
+    my @roles = &Apache::lonuserutils::roles_by_context('course','',$type);
     foreach my $role (@roles) {
         my $plrole = &Apache::lonnet::plaintext($role,$type);
         $roleoptions .= '  <option value="'.$role.'">'.$plrole.'</option>'."\n";
@@ -1717,13 +1862,17 @@ sub print_personnel_menu {
             &Apache::loncommon::help_open_topic('Course_Request_Rolesection').'&nbsp;'.&mt('LON-CAPA Section(s)').'<br />'.$sectionselector.'</td>'."\n".
             '</tr></table>'.&Apache::lonhtmlcommon::row_closure();
     }
-    $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another?')).
+    $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another')).
                '<input name="persontotal" type="hidden" value="'.$persontotal.'" />'.
                '<input name="addperson" type="checkbox" value="'.$persontotal.'"'.
                ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
                "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1).
-               &Apache::lonhtmlcommon::end_pick_box().'</div>'.
-               '<p>'.&mt('You may also add users later, once the course has been created, by using the "Manage course users" link, accessible from the "Main Menu".').'</p>';
+               &Apache::lonhtmlcommon::end_pick_box().'</div>';
+    if ($crstype eq 'community') {
+        $output .= '<p>'.&mt('You may also add users later, once the community has been created, by using the "Manage community users" link, accessible from the "Main Menu".').'</p>';
+    } else {
+        $output .= '<p>'.&mt('You may also add users later, once the course has been created, by using the "Manage course users" link, accessible from the "Main Menu".').'</p>';
+    }
     return $output;
 }
 
@@ -1749,7 +1898,7 @@ sub print_request_status {
     my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
                                            $env{'user.name'},'^status:'.$dom);
     my ($output,$formname,%queue_by_date);
-    my ($types,$typenames) = &course_types();
+    my ($types,$typenames) = &Apache::loncommon::course_types();
     foreach my $key (keys(%statusinfo)) {
         if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) { 
             (undef,my($cdom,$cnum)) = split(':',$key);
@@ -1795,10 +1944,18 @@ sub print_request_status {
               '<input type="hidden" name="showdom" value="" />'."\n".
               '<input type="hidden" name="cnum" value="" />'."\n";
     if (@sortedtimes > 0) {
+        my $desctitle;
+        if ($env{'form.crstype'} eq 'any') {
+            $desctitle = &mt('Course/Community Description')
+        } elsif ($env{'form.crstype'} eq 'community') {
+            $desctitle = &mt('Community Description')
+        } else {
+            $desctitle = &mt('Course Description');
+        }
         $output .= &Apache::loncommon::start_data_table().
                    &Apache::loncommon::start_data_table_header_row().
                    '<th>'.&mt('Action').'</th>'.
-                   '<th>'.&mt('Course Description').'</th>'.
+                   '<th>'.$desctitle.'</th>'.
                    '<th>'.&mt('Domain').'</th>';
         if ($env{'form.crstype'} eq 'any') {
             $output .= '<th>'.&mt('Type').'</th>';
@@ -1846,7 +2003,13 @@ sub print_request_status {
         }
         $output .= &Apache::loncommon::end_data_table();
     } else {
-        $output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+        if ($env{'form.crstype'} eq 'any') {
+$output .= '<div>'.&mt('You have no matching course or community requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+        } elsif ($env{'form.crstype'} eq 'community') {
+            $output .= '<div>'.&mt('You have no matching community requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+        } else {
+            $output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+        }
     }
     $output .= '
 <br /><input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />';
@@ -1871,7 +2034,7 @@ sub print_cancel_request {
             }
             $output = &mt('No further action will be taken');
         } elsif (ref($history{'details'}) eq 'HASH') {
-            my ($types,$typename) = &course_types();
+            my ($types,$typename) = &Apache::loncommon::course_types();
             my $showtype = $crstype;
             if (defined($typename->{$crstype})) {
                 $showtype = $typename->{$crstype}; 
@@ -1887,8 +2050,12 @@ sub print_cancel_request {
                       '<td>'.$showtype.'</td>'.
                       &Apache::loncommon::end_data_table_row().
                       &Apache::loncommon::end_data_table().
-                      '<br /><div class="LC_warning">'.
-                      &mt('Cancelling the request will remove it from the queue of pending course requests').'</div>';
+                      '<br /><div class="LC_warning">';
+            if ($crstype eq 'community') {
+                $output .= &mt('Cancelling the request will remove it from the queue of pending community requests').'</div>';
+            } else {
+                $output .= &mt('Cancelling the request will remove it from the queue of pending course requests').'</div>';
+            }
             $result = 'ok';
         } else {
             $output = '<div class="LC_error">'.&mt('No record exists for the course ID').'</div>';
@@ -1957,7 +2124,7 @@ sub print_request_logs {
 sub print_review {
     my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom,
         $disallowed,$disallowmsg) = @_;
-    my ($types,$typename) = &course_types();
+    my ($types,$typename) = &Apache::loncommon::course_types();
     my ($owner,$ownername,$owneremail);
     if ($uname eq '' || $udom eq '') {
         $uname = $env{'user.name'};
@@ -2076,40 +2243,52 @@ sub print_review {
     }
 
     my %ctxt = &clone_text();
-    $inst_headers .= '<th>'.&mt('Clone From').'</th>';
-    if (($env{'form.clonecrs'} =~ /^$match_name$/) && 
-        ($env{'form.clonedom'} =~ /^$match_domain$/)) {
-        my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
-                           $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
-        if ($canclone) {
-            my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+    if ($dom eq 'gcitest') {
+        $inst_headers .= '<th>'.&mt('Test Questions').'</th>';
+        my $concepttest;
+        if ($env{'form.concepttest'} eq 'defchosen') {
+            $concepttest = 'Auto-generated';
+        } elsif ($env{'form.concepttest'} eq 'editmyown') {
+            $concepttest = 'Manually selected';
+        }
+        $inst_values .= '<td>'.$concepttest.'</td>';
+    } else {
+        $inst_headers .= '<th>'.&mt('Clone From').'</th>';
+        if (($env{'form.clonecrs'} =~ /^$match_name$/) && 
+            ($env{'form.clonedom'} =~ /^$match_domain$/)) {
+            my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+                           $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
+                           $env{'form.crstype'});
+            if ($canclone) {
+                my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
                               $env{'form.clonecrs'},('description','internal.coursecode'));
-            if (keys(%courseenv) > 0) {
-                $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
-                $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
-                my $cloneinst = $courseenv{'internal.coursecode'};
-                if ($cloneinst ne '') {
-                    $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
-                } else {
-                    $inst_values .= &mt('from').' '.$env{'form.clonedom'};
-                }
-                $inst_values .= '</td><td>';
-                if ($env{'form.datemode'} eq 'preserve') {
-                    $inst_values .= $ctxt{'prd'}; 
-                } elsif ($env{'form.datemode'} eq 'shift') {
-                    $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
-                } else {
-                    $inst_values .= $ctxt{'ncd'};
-                }
-                $inst_values .= '</td>';
+                if (keys(%courseenv) > 0) {
+                    $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
+                    $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
+                    my $cloneinst = $courseenv{'internal.coursecode'};
+                    if ($cloneinst ne '') {
+                        $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
+                    } else {
+                        $inst_values .= &mt('from').' '.$env{'form.clonedom'};
+                    }
+                    $inst_values .= '</td><td>';
+                    if ($env{'form.datemode'} eq 'preserve') {
+                        $inst_values .= $ctxt{'prd'}; 
+                    } elsif ($env{'form.datemode'} eq 'shift') {
+                        $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
+                    } else {
+                        $inst_values .= $ctxt{'ncd'};
+                    }
+                    $inst_values .= '</td>';
+                 } else {
+                     $inst_values .= '<td>'.&mt('Unknown').'</td>';
+                 }
              } else {
-                 $inst_values .= '<td>'.&mt('Unknown').'</td>';
+                 $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
              }
-         } else {
-             $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
-         }
-    } else {
-        $inst_values .= '<td>'.&mt('None').'</td>';
+        } else {
+            $inst_values .= '<td>'.&mt('None').'</td>';
+        }
     }
     $enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
                        '<th>'.&mt('Access Ends').'</th>';
@@ -2122,15 +2301,18 @@ sub print_review {
     }
 
     my $container = 'Course';
+    my $ccrole = 'cc';
     if ($env{'form.crstype'} eq 'community') {
         $container = 'Community';
+        $ccrole = 'co';
     }
 
     $personnel_headers = '<th>'.&mt('Name').'</th><th>'.&mt('Username:Domain').
                          '</th><th>'.&mt('Role').'</th><th>'.&mt('LON-CAPA Sections').
                          '</th>';
+
     $personnel_values .= '<tr><td>'.$ownername.'</td><td>'.$owner.'</td>'.
-                         '<td>'.&Apache::lonnet::plaintext('cc',$container).'</td>'.
+                         '<td>'.&Apache::lonnet::plaintext($ccrole,$container).'</td>'.
                          '<td>'.&mt('None').'</td></tr>';
     for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
         if ($env{'form.person_'.$i.'_uname'} ne '') {
@@ -2166,7 +2348,7 @@ sub print_review {
             if ($showsec eq '') {
                 $showsec = &mt('None');
             }
-            if ($env{'form.person_'.$i.'_role'} eq 'cc') {
+            if ($env{'form.person_'.$i.'_role'} eq $ccrole) {
                 $showsec = &mt('None');
             }
             my $role = $env{'form.person_'.$i.'_role'}; 
@@ -2238,7 +2420,7 @@ sub dates_from_form {
 }
 
 sub courseinfo_form {
-    my ($dom,$formname,$crstype,$next) = @_;
+    my ($dom,$formname,$crstype,$next,$description) = @_;
     my %lt = &Apache::lonlocal::texthash(
                 official => 'You must provide a (brief) course description.',
                 community => 'You must provide a (brief) community description.'
@@ -2260,15 +2442,26 @@ function validateForm() {
 
 ENDJS
     my $title = &mt('Brief Course Description');
+    my $desctitle = &mt('Description');
+    if ($dom eq 'gcitest') {
+        $title = &mt('Concept Test Course Information');
+        $desctitle = &mt('Concept Test Title');
+    }
+    my $clonetitle = &mt('Clone content and settings from an existing course?');
     if ($crstype eq 'community') {
         $title = &mt('Brief Community Description');
+        $clonetitle = &mt('Clone content and settings from an existing community?');
     }
     my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
                   &Apache::lonhtmlcommon::row_headline().
                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').'&nbsp;'.$title.'</h3>'.
                   &Apache::lonhtmlcommon::row_closure(1).
-                  &Apache::lonhtmlcommon::row_title(&mt('Description')).
-                 '<input type="text" size="40" name="cdescr" />';
+                  &Apache::lonhtmlcommon::row_title($desctitle).
+                 '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
+    if ($dom eq 'gcitest') {
+        $output .= &Apache::lonhtmlcommon::row_closure(1).
+                   &concepttest_form();
+    }
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
                                                   'default','hide');
@@ -2277,15 +2470,34 @@ ENDJS
                    &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
     }
     $output .= $home_server_pick.
-               &Apache::lonhtmlcommon::row_closure().
+               &Apache::lonhtmlcommon::row_closure();
+    if ($dom eq 'gcitest') {
+        my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
+        my $invalidcrosslist = [];
+        $output .= &print_enrollment_menu($formname,$instcode,$dom,
+                       \@codetitles,\%cat_titles,\%cat_order,
+                       \@code_order,$invalidcrosslist);
+    } else {
+        $output .= 
                &Apache::lonhtmlcommon::row_headline().
-               '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.&mt('Clone content and settings from an existing course?').'</h3>'. 
+               '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.$clonetitle.'</h3>'. 
                &Apache::lonhtmlcommon::row_closure(1).
-               &clone_form($dom,$formname,$crstype).
-               &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+               &clone_form($dom,$formname,$crstype);
+    }
+    $output .= &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
     return $output;
 }
 
+sub concepttest_form {
+     return &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')).
+            '<input type="radio" name="concepttest" value="defchosen" /> '.
+            &mt('Automatically selected by WebCenter').
+            '</label><br /><label>'.
+            '<input type="radio" name="concepttest" value="editmyown" checked="checked" /> '.
+            &mt('Chosen by you from Concept Inventory').
+            '</label><br /><label>';
+}
+
 sub clone_form {
     my ($dom,$formname,$crstype) = @_;
     my $type = 'Course';
@@ -2423,7 +2635,7 @@ sub get_course_dom {
         }
     }
     if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
-        my ($types,$typename) = &course_types();
+        my ($types,$typename) = &Apache::loncommon::course_types();
         if (ref($types) eq 'ARRAY') {
             foreach my $type (@{$types}) {
                 if (&Apache::lonnet::usertools_access($env{'user.name'},
@@ -2507,7 +2719,7 @@ sub display_navbuttons {
 }
 
 sub print_request_outcome {
-    my ($dom,$codetitles,$code_order) = @_;
+    my ($r,$dom,$codetitles,$code_order) = @_;
     my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
         %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
     my $sectotal = $env{'form.sectotal'};
@@ -2526,6 +2738,10 @@ sub print_request_outcome {
     }
     $now = time;
     $crstype = $env{'form.crstype'};
+    my $ccrole = 'cc';
+    if ($crstype eq 'community') {
+        $ccrole = 'co';
+    }
     my @instsections;
     if ($crstype eq 'official') {
         if (&Apache::lonnet::auto_run('',$dom)) {
@@ -2587,7 +2803,7 @@ sub print_request_outcome {
                     } else {
                         @{$personnel{$uname.':'.$udom}{'roles'}} = ($role);
                     }
-                    if ($role eq 'cc') {
+                    if ($role eq $ccrole) {
                         @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
                     } else {
                         my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
@@ -2646,7 +2862,8 @@ sub print_request_outcome {
         if ($clonehome ne 'no_host') {  
             my $canclone =  
                 &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
-                        $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+                        $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
+                        $crstype);
             if ($canclone) {
                 $clonecrs = $env{'form.clonecrs'};
                 $clonedom = $env{'form.clonedom'};
@@ -2678,6 +2895,16 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
+    if ($dom eq 'gcitest') {
+        if ($env{'form.concepttest'} eq 'editmyown') {
+            $details->{'firstres'} = 'nav'; 
+        } else {
+            $details->{'firstres'} = 'blank';
+        }
+        $details->{'clonedom'} = 'gci';
+        $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
+        $details->{'datemode'} = 'delete';
+    }
     my (@inststatuses,$storeresult,$creationresult);
     my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
     if ($val eq '') {
@@ -2737,7 +2964,11 @@ sub print_request_outcome {
         $reqstatus = $disposition;
         my ($modified,$queued);
         if ($disposition eq 'rejected') {
-            $output = &mt('Your course request was rejected.');
+            if ($crstype eq 'community') {
+                $output = &mt('Your community request was rejected.');
+            } else {
+                $output = &mt('Your course request was rejected.');
+            }
             if ($message) {
                 $output .= '<div class="LC_warning">'.$message.'</div>';
             }
@@ -2745,11 +2976,11 @@ sub print_request_outcome {
         } elsif ($disposition eq 'process') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
             my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
-            my @roles = &Apache::lonuserutils::roles_by_context('course');
             my $type = 'Course';
             if ($crstype eq 'community') {
                 $type = 'Community';
             }
+            my @roles = &Apache::lonuserutils::roles_by_context('course','',$type);
             foreach my $role (@roles) {
                 $longroles{$role}=&Apache::lonnet::plaintext($role,$type);
             }
@@ -2761,14 +2992,56 @@ sub print_request_outcome {
                 $reqstatus = 'created';
                 my $role_result = &update_requestors_roles($dom,$cnum,$crstype,$details,
                                                            \%longroles);
-                $output = '<p>'.&mt('Your course request has been processed and the course has been created.').
-                          '<br />'.$role_result.'</p>';
+                if ($crstype eq 'community') {
+                    $output = '<p>'.&mt('Your community request has been processed and the community has been created.');
+                } else {
+                    $output = '<p>'.&mt('Your course request has been processed and the course has been created.');
+                }
+                if ($dom eq 'gcitest') {
+                    my $caller = 'requestcrs';
+                    &acquire_cc_role($dom,$cnum,'cc./'.$dom.'/'.$cnum);
+                    my %parmresult =
+                        &store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
+                    &Apache::londocsgci::setdefaults();
+                    if ($env{'form.concepttest'} eq 'defchosen') {
+                        $output .= '<br />';
+                        my $error = &Apache::londocsgci::store($caller,$dom,$cnum);
+                        if ($error) {
+                            $output .= '<span class="LC_error">'.
+                                       &mt('An error occurred saving an auto-generated concept test: [_1].',$error).
+                                       '</span>';
+                        } else {
+                            &Apache::lonuserstate::readmap($dom.'/'.$cnum);
+                            $output .= &mt('A concept test has also been generated.');
+                        }
+                        $output .= '</p>'.
+    '<p>'.&mt('If you have a text file available containing student e-mail addresses and initial passwords, you may upload it now.').'<br />'.
+    &mt('You may also enroll students at a later date by visiting the [_1]"Menu"[_2] page and choosing: [_1]"Manage Enrollment"[_2].','<i>','</i>').'</p>'.
+    '</form><form name="studentform" method="post" enctype="multipart/form-data" '.
+    ' action="/adm/createuser">'."\n";
+                        $r->print($output); 
+                        &Apache::lonuserutils::print_first_users_upload_form($r,'course');
+                        $r->print('</form>');
+                        $output = '';
+                    } else {
+                        $output .= '</form><br />'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'</p>';
+                        $r->print($output);
+                        &Apache::londocsgci::editor($r,'requestcrs',$dom,$cnum);
+                        $output = '';
+                    }
+                } else {
+                    $output .= '<br />'.$role_result.'</p>';
+                }
                 $creationresult = 'created';
             } else {
-                $output = '<span class="LC_error">'.
-                          &mt('An error occurred when processing your course request.').
-                          '<br />'.
-                          &mt('You may want to review the request details and submit the request again.').
+                $output = '<span class="LC_error">';
+                if ($crstype eq 'community') {
+                    $output .= &mt('An error occurred when processing your community request.');
+                } else {
+                    $output .= &mt('An error occurred when processing your course request.');
+                }
+                $output .= '<br />'.
+                           &mt('You may want to review the request details and submit the request again.').
                           '</span>';
                 $creationresult = 'error';
             }
@@ -2801,7 +3074,12 @@ sub print_request_outcome {
                 my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
                                                             $dom);
                 if ($putresult eq 'ok') {
-                    $output = &mt('Your course request has been recorded.').'<br />'.
+                    if ($crstype eq 'community') {
+                        $output .= &mt('Your community request has been recorded.');
+                    } else {
+                        $output .= &mt('Your course request has been recorded.') 
+                    }
+                    $output .= '<br />'.
                               &notification_information($disposition,$req_notifylist,
                                                         $cnum,$now);
                 } else {
@@ -2833,8 +3111,12 @@ sub print_request_outcome {
             &Apache::lonnet::logthis("Error saving course request status for  $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
         }
         if ($modified && $queued && $storeresult eq 'ok') {
-            $output .= '<p>'.&mt('Your course request has been updated').'</p>'.
-                       &notification_information($disposition,$req_notifylist,$cnum,$now);
+            if ($crstype eq 'community') {
+                $output .= '<p>'.&mt('Your community request has been updated').'</p>';
+            } else {
+                $output .= '<p>'.&mt('Your course request has been updated').'</p>';
+            }
+            $output .= &notification_information($disposition,$req_notifylist,$cnum,$now);
         }
         if ($validationerror ne '') {
             $output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
@@ -2854,23 +3136,34 @@ sub update_requestors_roles {
     my $owner = $env{'user.name'}.':'.$env{'user.domain'};
     if (ref($details) eq 'HASH') {
         if (ref($details->{'personnel'}) eq 'HASH') {
+            my $ccrole = 'cc';
+            if ($crstype eq 'community') {
+                $ccrole = 'co';
+            }
             unless (ref($details->{'personnel'}{$owner}) eq 'HASH') {
                 $details->{'personnel'}{$owner} = {
-                                                    'roles' => ['cc'],
-                                                    'cc'    => { 'usec' => [] },
+                                                    'roles' => [$ccrole],
+                                                    $ccrole => { 'usec' => [] },
                                                   };
             }
             my @roles;
             if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
                 @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
-                unless (grep(/^cc$/,@roles)) {
-                    push(@roles,'cc');
+                unless (grep(/^\Q$ccrole\E$/,@roles)) {
+                    push(@roles,$ccrole);
                 }
             } else {
-                @roles = ('cc');
+                @roles = ($ccrole);
             }
             foreach my $role (@roles) {
-                my $start = $now;
+                my $refresh=$env{'user.refresh.time'};
+                if ($refresh eq '') {
+                    $refresh = $env{'user.login.time'};
+                }
+                if ($refresh eq '') {
+                    $refresh = $now;
+                }
+                my $start = $refresh-1;
                 my $end = '0';
                 if ($role eq 'st') {
                     if ($details->{'accessstart'} ne '') {
@@ -2881,7 +3174,7 @@ sub update_requestors_roles {
                     }
                 }
                 my @usecs;
-                if ($role ne 'cc') {
+                if ($role ne $ccrole) {
                     if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
                         @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
                     }
@@ -2946,19 +3239,111 @@ sub update_requestors_roles {
     }
     if ($active) {
         if ($numactive == 1) {
-            $output = &mt('Use the following link to enter the course:'); 
+            if ($crstype eq 'Community') {
+                $output = &mt('Use the following link to enter the community:');
+            } else {
+                $output = &mt('Use the following link to enter the course:'); 
+            }
         } else {
-            $output = &mt('Use the following links to your new roles to enter the course:');
+            if ($crstype eq 'Community') {
+                $output = &mt('Use the following links to your new roles to enter the community:');
+            } else {
+                $output = &mt('Use the following links to your new roles to enter the course:');
+            }
         }
         $output .= ' <ul>'.$active.'</ul><br />';
     }
     if ($future) {
-        $output .= &mt('The following course [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'<a href="/adm/roles">','</a>',&Apache::lonlocal::locallocaltime($details->{'accessstart'})).
-                   ' <ul>'.$future.'</ul>';
+        if ($crstype eq 'Community') {
+            $output .= &mt('The following community [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'<a href="/adm/roles">','</a>',&Apache::lonlocal::locallocaltime($details->{'accessstart'}))
+        } else {
+            $output .= &mt('The following course [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'<a href="/adm/roles">','</a>',&Apache::lonlocal::locallocaltime($details->{'accessstart'}));
+        }
+        $output .= ' <ul>'.$future.'</ul>';
     }
     return $output;
 }
 
+sub acquire_cc_role {
+    my ($cdom,$cnum,$trolecode,$csec) = @_;
+    my %coursegroups = &Apache::lonnet::get_active_groups(
+                        $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
+    my $cgrps = join(':',keys(%coursegroups));
+    if ($env{'environment.recentroles'}) {
+        my %frozen_roles =
+            &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
+        &Apache::lonhtmlcommon::store_recent('roles',$trolecode,' ',
+                                            $frozen_roles{$trolecode});
+    }
+
+    &Apache::lonnet::appenv({"request.course.id"   => '',
+                             "request.course.fn"   => '',
+                             "request.course.uri"  => '',
+                             "request.course.sec"  => '',
+                             "request.role"        => 'cm',
+                             "request.role.adv"    => $env{'user.adv'},
+                             "request.role.domain" => $env{'user.domain'}});
+
+    &Apache::lonnet::log($env{'user.domain'},
+                         $env{'user.name'},
+                         $env{'user.home'},
+                         "Role ".$trolecode);
+
+    &Apache::lonnet::appenv(
+                            {'request.role'        => $trolecode,
+                             'request.role.domain' => $cdom,
+                             'request.course.sec'  => $csec,
+                             'request.course.groups' => $cgrps});
+    my ($furl,$ferr) = &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+    my $tadv;
+    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
+    return;
+}
+
+sub store_crsparms {
+    my ($cdom,$cnum,$now,$accessstart,$accessend) = @_;
+    my $topsymb = '___0___uploaded/'.$cdom.'/'.$cnum.'/default.sequence';
+    my %crsparms = (
+                      buttonshide => {
+                                       value => 'yes',
+                                       type  => 'string_yesno',
+                                     },
+                      opendate    => {
+                                       value => $accessstart,
+                                       type  => 'date_start',
+                                     },
+                      duedate     => {
+                                       value => $accessend,
+                                       type  => 'date_end',
+                                     },
+                      problemstatus => {
+                                           value => 'no_feedback_ever',
+                                           type  => 'string_problemstatus',
+                                       },
+                      maxtries      => {
+                                           value => '1',
+                                           type  => 'intpos',
+                                       },
+                      discussend    => {
+                                           value => $now,
+                                           type  => 'date_end',
+                                       },
+                      discusshide   => { 
+                                           value => 'yes',
+                                           type  => 'string_yesno',
+                                       }
+    );
+    my %parmresult;
+    foreach my $item (keys(%crsparms)) {
+        $parmresult{$item} =
+            &Apache::lonparmset::storeparm_by_symb($topsymb,
+                                   '0_'.$item,14,$crsparms{$item}{'value'},
+                                   $crsparms{$item}{'type'},undef,$cdom);
+    }
+    return %parmresult;
+}
+
 sub notification_information {
     my ($disposition,$req_notifylist,$cnum,$now) = @_;
     my %emails = &Apache::loncommon::getemails();
@@ -3087,31 +3472,34 @@ sub get_processtype {
 sub check_autolimit {
     my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
     my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
-                                        'userroles',['active','future'],['cc'],[$dom]);
-    my ($types,$typename) = &course_types();
+                       'userroles',['active','future'],['cc','co'],[$dom]);
+    my ($types,$typename) = &Apache::loncommon::course_types();
     my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname);
-    my %count;
-    if (ref($types) eq 'ARRAY') {
-        foreach my $type (@{$types}) {
-            $count{$type} = 0;
-        }
-    }
+    my $count = 0;
     foreach my $key (keys(%requests)) {
         my ($cdom,$cnum) = split('_',$key);
-        if (exists($crsroles{$cnum.':'.$cdom.':cc'})) {
-            if (ref($requests{$key}) eq 'HASH') {
-                my $type = $requests{$key}{'crstype'};
-                if ($type =~ /^official|unofficial|community$/) {
-                    $count{$type} ++;
-                }
+        if (ref($requests{$key}) eq 'HASH') {
+            next if ($requests{$key}{'crstype'} ne $crstype);
+            if (($crstype eq 'community') && 
+                (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
+                $count ++;
+            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial')) &&
+                     (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
+                $count ++;
             }
         }
     }
-    if ($count{$crstype} < $limit) {
+    if ($count < $limit) {
         return 'process';
     } else {
         if (ref($typename) eq 'HASH') {
-            $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').'<br />'.&mt("Your $typename->{$crstype} limit is [_1].",$limit);
+            if ($crstype eq 'community') {
+                $$message = &mt('Your request has not been processed because you have reached the limit for the number of communities.').
+                            '<br />'.&mt("Your limit is [_1].",$limit);
+            } else {
+                $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').
+                            '<br />'.&mt("Your $typename->{$crstype} limit is [_1].",$limit);
+            }
         }
         return 'rejected';
     }