--- loncom/interface/londocs.pm	2009/12/21 15:56:52	1.411.2.4
+++ loncom/interface/londocs.pm	2010/12/05 16:40:11	1.411.2.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.411.2.4 2009/12/21 15:56:52 raeburn Exp $
+# $Id: londocs.pm,v 1.411.2.7 2010/12/05 16:40:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2620,7 +2620,7 @@ sub handler {
     my $crstype = &Apache::loncommon::course_type();
 
     my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-    if ($coursedom eq 'gcitest') {
+    if ($coursedom =~ /^\w+citest$/) {
         my $coursenum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
         if ($allowed) {
@@ -3544,21 +3544,41 @@ sub generate_edit_table {
 
 sub concept_test_builder {
     my ($r,$cdom,$cnum) = @_;
-    &Apache::londocsgci::setdefaults();
+    &Apache::londocsgci::setdefaults($cdom);
+    if ($env{'form.context'} eq 'requestcrs') {
+        if ($env{'form.phase'} eq 'storemap') {
+            &Apache::londocsgci::evaluate();
+            my $error = &Apache::londocsgci::store('requestcrs',$cdom,$cnum);
+            my $output = '<p>';
+            if ($error) {
+                $output .= '<span class="LC_error">'.
+                           &mt('An error occurred saving your concept test: [_1].',$error).
+                           '</span>';
+            } else {
+                &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                $output .= &mt('Your concept test has been saved.');
+            }
+            $output .= '</p>';
+            if (&Apache::lonrequestcourse::generate_page($r,'new','chooseitems')) {
+                my $formname = 'requestcrs';
+                $r->print('<br /><form name="'.$formname.'" method="post" action="/adm/requestcourse">');
+                my $title = &mt('Concept Test Created'); 
+                &Apache::lonrequestcourse::roster_upload_form($r,$output,$formname,$title);
+            }
+            $r->print(&Apache::loncommon::end_page());
+            return;
+        }
+    }
     my $js = '
 <script type="text/javascript">
 // <![CDATA[
 '.
-&Apache::londocsgci::builder_javascript().
+&Apache::londocsgci::builder_javascript($cdom).
 '
 // ]]>
 </script>
 ';
-    my $starthash = {
-           add_entries => {'onload' => "javascript:setInitialVisibility();"},
-                     };
-
-    $r->print(&Apache::loncommon::start_page('Assemble Test',$js,$starthash));
+    $r->print(&Apache::loncommon::start_page('Assemble Test',$js));
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/coursedocs',
@@ -3584,7 +3604,7 @@ sub concept_test_builder {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   ('Build Concept Test','Concept_Test_Assembly'));
     }
-    &Apache::londocsgci::load();
+    &Apache::londocsgci::load($cdom);
     &Apache::londocsgci::listresources($r,'edit',$cdom,$cnum);
     $r->print(&Apache::loncommon::end_page());
     return;