--- loncom/interface/londocs.pm	2010/02/02 01:30:46	1.325.2.7
+++ loncom/interface/londocs.pm	2009/09/24 22:15:27	1.325.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.325.2.7 2010/02/02 01:30:46 raeburn Exp $
+# $Id: londocs.pm,v 1.325.4.2 2009/09/24 22:15:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,6 +44,7 @@ use HTML::Entities;
 use GDBM_File;
 use Apache::lonlocal;
 use Cwd;
+use Apache::londocsgci();
 use LONCAPA qw(:DEFAULT :match);
 
 my $iconpath;
@@ -117,17 +118,17 @@ sub authorhosts {
 
 sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
     if ($home+$other==0) { return ''; }
     if ($home) {
 	return '<div>'.
 	    '<input type="submit" name="dumpcourse" value="'.
-	    &mt('Dump '.$crstype.' DOCS to Construction Space').'" />'.
+	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
 	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').
 	    '</div>';
     } else {
 	return '<div>'.
-     &mt('Dump '.$crstype.
+     &mt('Dump '.$type.
 	 ' DOCS to Construction Space: available on other servers').
 	 '</div>';
     }
@@ -143,10 +144,10 @@ sub clean {
 
 sub dumpcourse {
     my ($r) = @_;
-    my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' DOCS to Construction Space').
-	      '<form name="dumpdoc" action="" method="post">');
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' DOCS to Construction Space'));
+    my $type = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
+	      '<form name="dumpdoc" method="post">');
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) { return ''; }
     my $origcrsid=$env{'request.course.id'};
@@ -257,46 +258,36 @@ sub dumpcourse {
 	$r->print(&Apache::loncommon::end_data_table());
 	&untiehash();
 	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype DOCS").'" /></p></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $type DOCS").'" /></p></form>');
     }
 }
 
 
 
 sub exportbutton {
-    my $crstype = &Apache::loncommon::course_type();
-    return '<input type="submit" name="exportcourse"'
-          .' value="'.&mt('IMS Export').'"'
-          .' title="'.&mt('Export '.$crstype.' to IMS Package').'" />'.
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
+    my $type = &Apache::loncommon::course_type();
+    return '<div>'.
+            '<input type="submit" name="exportcourse" value="'.
+            &mt('Export '.$type.' to IMS').'" />'.
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
 }
 
 
 
 sub exportcourse {
     my $r=shift;
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
     my %discussiontime = &Apache::lonnet::dump('discussiontimes',
                                                $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
     my $numdisc = keys(%discussiontime);
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package').
-                  '<h2>'.&mt('IMS Export Failed').'</h2>'.
-                  '<div class="LC_error">');
-        if ($crstype eq 'Community') {
-            $r->print(&mt('Unable to retrieve information about community contents'));
-        } else {
-            $r->print(&mt('Unable to retrieve information about course contents'));
-        }
-        $r->print('</div><a href="/adm/coursedocs">');
-        if ($crstype eq 'Community') {
-            $r->print(&mt('Return to Community Editor'));
-        } else {
-            $r->print(&mt('Return to Course Editor'));
-        }
-        $r->print('</a>');
-        &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
+        $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package').
+                  '<h2>IMS Export Failed</h2>'.
+                  '<div class="LC_error">'.
+                  &mt('Unable to retrieve information about course contents').
+                  '</div><a href="/adm/coursedocs">'.&mt('Return to Course Editor').'</a>');
+        &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
         return;
     }
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
@@ -312,17 +303,7 @@ sub exportcourse {
         my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
         my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
         if (@exportitems == 0 && @discussions == 0) {
-            $outcome = 
-                '<p class="LC_warning">'
-               .&mt('As you did not select any content items or discussions'
-                   .' for export, an IMS package has not been created.')
-               .'</p>'
-               .'<p>'
-               .&mt('Please [_1]go back[_2] to select either content items'
-                   .' or discussions for export.'
-                       ,'<a href="javascript:history.go(-1)">'
-                       ,'</a>')
-               .'</p>';
+            $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created.  Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export';
         } else {
             my $now = time;
             my %symbs;
@@ -345,53 +326,35 @@ sub exportcourse {
                 open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                 close(OUTPUT);
                 chdir $cwd;
-                $outcome .= '<p>'
-                           .&mt('[_1]Your IMS package[_2] is ready for download.'
-                               ,'<a href="'.$imszipfile.'">','</a>')
-                           .'</p>';
+                $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
                 if ($copyresult) {
-                    $outcome .= '<p class="LC_error">'
-                               .&mt('The following errors occurred during export - [_1]'
-                                   ,$copyresult)
-                               .'</p>';
+                    $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult);
                 }
             } else {
-                $outcome = '<p class="LC_error">'
-                          .&mt('Unfortunately you will not be able to retrieve'
-                              .' an IMS archive of this posts at this time,'
-                              .' because there was a problem creating a'
-                              .' manifest file.')
-                          .'</p>'
-                          .'<p><a href="javascript:history.go(-1)">'
-                          .&mt('Go Back')
-                          .'</a></p>';
+                $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
             }
         }
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package'));
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
+        $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
+	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
         $r->print($outcome);
         $r->print(&Apache::loncommon::end_page());
     } else {
-        my $display='<form name="exportdoc" action="" method="post">'."\n".
-                    '<p>'.
-                    &mt('Choose which items you wish to export from your '.$crstype.'.').
-                    '</p>'.
-                    '<div class="LC_columnSection"><fieldset>'.
-                    '<legend>'.&mt('Content items').'</legend>'.
-                    '<input type="button" value="'.&mt('check all').'" '.
+        my $display;
+        $display = '<form name="exportdoc" method="post">'."\n";
+        $display .= &mt('Choose which items you wish to export from your '.$type.'.<br /><br />');
+        $display .= '<table border="0" cellspacing="0" cellpadding="3">'.
+                    '<tr><td><fieldset><legend>&nbsp;<b>Content items</b></legend>'.
+                    '<input type="button" value="check all" '.
                     'onclick="javascript:checkAll(document.exportdoc.archive)" />'.
-                    '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>';
-        if ($numdisc > 0) {
-            $display .= '<fieldset>'.
-                        '<legend>'.&mt('Discussion posts').'</legend>'.
-                        '<input type="button" value="'.&mt('check all').'"'.
-                        ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
-                        '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                        ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'.
-                        '</fieldset>';
-        }
-        $display .= '</div>';
+                    '&nbsp;&nbsp;<input type="button" value="uncheck all"'.
+                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset></td>'.
+                    '<td>&nbsp;</td><td>&nbsp;</td>'.
+                    '<td align="right"><fieldset><legend>&nbsp;<b>Discussion posts'.
+                    '</b></legend><input type="button" value="check all"'.
+                    ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
+                    '&nbsp;&nbsp;<input type="button" value="uncheck all"'.
+                    ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" /></fieldset></td>'.
+                    '</tr></table>';
         my $curRes;
         my $depth = 0;
         my $count = 0;
@@ -400,13 +363,13 @@ sub exportcourse {
         my %parent = ();
         my %children = ();
         my $lastcontainer = $startcount;
-        $display .= &Apache::loncommon::start_data_table()
-                   .&Apache::loncommon::start_data_table_header_row()
-                   .'<th>'.&mt('Export content item?').'</th>';
+        my @bgcolors = ('#F6F6F6','#FFFFFF');
+        $display .= '<table cellspacing="0"><tr>'.
+            '<td><b>Export content item?<br /></b></td><td>&nbsp;</td><td align="right">'."\n";
         if ($numdisc > 0) {
-            $display .= '<th>'.&mt('Export discussion posts?').'</th>';
+            $display.='<b>Export&nbsp;discussion posts?</b>'."\n";
         }
-        $display .= &Apache::loncommon::end_data_table_header_row();
+        $display.='&nbsp;</td></tr>';
         while ($curRes = $it->next()) {
             if (ref($curRes)) {
                 $count ++;
@@ -427,43 +390,38 @@ sub exportcourse {
                         $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                     }
                 }
-                my $currelem = $count+$boards+$startcount;
-                $display .= &Apache::loncommon::start_data_table_row()
-                           .'<td>'."\n"
-                           .'<input type="checkbox" name="archive" value="'.$count.'" ';
+                my $color = $count%2;
+                $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n".
+                    '<input type="checkbox" name="archive" value="'.$count.'" ';
                 if (($curRes->is_sequence()) || ($curRes->is_page())) {
-                    $lastcontainer = $currelem;
-                    $display .= 'onclick="javascript:propagateCheck('."'$currelem'".')"';
+                    my $checkitem = $count + $boards + $startcount;
+                    $display .= 'onClick="javascript:propagateCheck('."'$checkitem'".')"';
                 }
                 $display .= ' />'."\n";
                 for (my $i=0; $i<$depth; $i++) {
-                    $display .= ('<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />' x2)."\n";
+                    $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";
                 }
                 if ($curRes->is_sequence()) {
                     $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
+                    $lastcontainer = $count + $startcount + $boards;
                 } elsif ($curRes->is_page()) {
                     $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
+                    $lastcontainer = $count + $startcount + $boards;
                 }
+                my $currelem = $count+$boards+$startcount;
                 $children{$parent{$depth}} .= $currelem.':';
-                $display .= '&nbsp;'.$curRes->title().'</td>'."\n";
-
-                # Existing discussion posts?
-
+                $display .= '&nbsp;'.$curRes->title().'</td>';
                 if ($discussiontime{$ressymb} > 0) {
                     $boards ++;
-                    $display .= '<td align="right">'
-                               .'<input type="checkbox" name="discussion" value="'.$count.'" />'
-                               .'</td>'."\n";
+                    $currelem = $count+$boards+$startcount;
+                    $display .= '<td>&nbsp;</td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" />&nbsp;</td>'."\n";
                 } else {
-                    $display .= '<td>&nbsp;</td>'."\n";
+                    $display .= '<td colspan="2">&nbsp;</td>'."\n";
                 }
-                $display .= &Apache::loncommon::end_data_table_row();
             }
         }
-        $display .= &Apache::loncommon::end_data_table();
         my $scripttag = qq|
-<script type="text/javascript">
-// <![CDATA[
+<script>
 
 function checkAll(field) {
     if (field.length > 0) {
@@ -515,16 +473,15 @@ function containerCheck(item) {
      }   
 }
 
-// ]]>
 </script>
         |;
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',
- 						 $scripttag));
-	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($crstype).' to IMS content package'));
-	$r->print($display.
+	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
+						 $scripttag));
+	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
+	$r->print($display.'</table>'.
                   '<p><input type="hidden" name="finishexport" value="1" />'.
                   '<input type="submit" name="exportcourse" value="'.
-                  &mt('Export').'" /></p></form>');
+                  &mt('Export '.$type.' DOCS').'" /></p></form>');
     }
 }
 
@@ -551,7 +508,7 @@ sub create_ims_store {
     my $manifestfilename = $$tempexport.$manifest;
     if ($ims_manifest = Apache::File->new('>'.$manifestfilename)) {
         $$manifestok=1;
-        print $ims_manifest 
+        print $ims_manifest
 '<?xml version="1.0" encoding="UTF-8"?>'."\n".
 '<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1"'.
 ' xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"'.
@@ -1009,7 +966,7 @@ sub group_import {
 }
 
 sub breadcrumbs {
-    my ($allowed,$crstype)=@_;
+    my ($where,$allowed,$type)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders);
     if ($env{'form.pagepath'}) {
@@ -1044,9 +1001,9 @@ sub breadcrumbs {
 	    if ($4 ne '') { $is_random_order = 1; }
             if ($folder eq 'supplemental') {
                 if ($allowed) {
-                    $name = &mt('Supplemental '.$crstype.' Documents');
+                    $name = &mt('Supplemental '.$type.' Documents');
                 } else {
-                    $name = &mt($crstype.' Documents');
+                    $name = &mt($type.' Documents');
                 }
             }
 	    &Apache::lonhtmlcommon::add_breadcrumb(
@@ -1503,7 +1460,7 @@ sub handle_edit_cmd {
 }
 
 sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype)=@_;
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
 
     my $container= ($env{'form.pagepath'}) ? 'page'
 		                           : 'sequence';
@@ -1520,7 +1477,7 @@ sub editor {
     }
     
     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
-	&breadcrumbs($allowed,$crstype);
+	&breadcrumbs($folder,$allowed,$type);
     $r->print($breadcrumbtrail);
     
 # ------------------------------------------------------------ Process commands
@@ -1619,7 +1576,7 @@ sub editor {
 	unless ($name) {  $name=(split(/\//,$url))[-1]; }
 	unless ($name) { $idx++; next; }
 	$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
-			     $coursenum,$crstype));
+			     $coursenum));
 	$idx++;
 	$shown++;
     }
@@ -1697,7 +1654,7 @@ sub process_file_upload {
             return 'failed';
         } else {
             if ($parseaction eq 'parse') {
-                my $total_embedded = scalar(keys(%{$allfiles}));
+                my $total_embedded = keys(%{$allfiles});
                 if ($total_embedded > 0) {
                     my $num = 0;
 		    my $state = '
@@ -1758,7 +1715,6 @@ sub parse_supplemental_title {
 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
 	my $name =  &Apache::loncommon::plainname($uname,$udom);
 	$name = &HTML::Entities::encode($name,'"<>&\'');
-        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
 	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
 	    $name.': <br />'.$foldertitle;
     }
@@ -1771,7 +1727,7 @@ sub parse_supplemental_title {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
 
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
@@ -2011,7 +1967,7 @@ END
     	my $ro_set=
 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
 	$rand_order_text ='
-<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';   
+<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';   
     }
     if ($ispage) {
         my $pagename=&escape($pagetitle);
@@ -2037,18 +1993,12 @@ END
     } else {
 	undef($external);
     }
-    my $reinit;
-    if ($crstype eq 'Community') {
-        $reinit = &mt('(re-initialize community to access)');
-    } else {
-        $reinit = &mt('(re-initialize course to access)');
-    }  
     $line.='
   <td class="LC_docs_entry_icon">
     '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
   </td>
   <td class="LC_docs_entry_title">
-    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.$reinit.'</span>').$external."
+    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external."
   </td>";
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
@@ -2061,12 +2011,12 @@ END
 	$line.=(<<ENDPARMS);
   <td class="LC_docs_entry_parameter">
     $form_start
-    <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+    <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
     $form_end
   </td>
   <td class="LC_docs_entry_parameter">
     $form_start
-    <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+    <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
     $form_end
   </td>
   <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
@@ -2149,7 +2099,7 @@ sub checkonthis {
                  if (($errorcount) ||
                      ($warningcount)) {
 		     if ($errorcount) {
-                        $r->print('<img src="/adm/lonMisc/bomb.gif" alt="'.&mt('bomb').'" /><span class="LC_error">'.
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" alt="" /><span class="LC_error">'.
                           &mt('[quant,_1,error]',$errorcount).'</span>');
                      }
 		     if ($warningcount) {
@@ -2196,7 +2146,7 @@ List Symbs
 sub list_symbs {
     my ($r) = @_;
 
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page('Symb List'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -2205,7 +2155,7 @@ sub list_symbs {
                   '<div class="LC_error">'.
                   &mt('Unable to retrieve information about course contents').
                   '</div>');
-        &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
+        &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
     } else {
         $r->print("<pre>\n");
         foreach my $res ($navmap->retrieveResources()) {
@@ -2219,11 +2169,11 @@ sub list_symbs {
 
 sub verifycontent {
     my ($r) = @_;
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
-   $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
-   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
+   $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
+   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$type.' Documents'));
    $hashtied=0;
    undef %alreadyseen;
    %alreadyseen=();
@@ -2232,7 +2182,7 @@ sub verifycontent {
        if ($hash{$key}=~/\.(page|sequence)$/) {
 	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
 	       $r->print('<hr /><span class="LC_error">'.
-                         &mt('The following sequence or page is included more than once in your '.$crstype.': ').
+			 &mt('The following sequence or page is included more than once in your '.$type.': ').
 			 &unescape($hash{$key}).'</span><br />'.
 			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
 	   }
@@ -2255,9 +2205,9 @@ sub devalidateversioncache {
 
 sub checkversions {
     my ($r) = @_;
-    my $crstype = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
+    my $type = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page("Check $type Document Versions"));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $type Document Versions"));
     my $header='';
     my $startsel='';
     my $monthsel='';
@@ -2318,7 +2268,7 @@ sub checkversions {
     &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
-        $header=&mt('All Documents in '.$crstype);
+	$header=&mt('All Documents in '.$type);
 	$allsel=1;
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
@@ -2363,7 +2313,7 @@ sub checkversions {
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'});
     my %lt=&Apache::lonlocal::texthash
-              ('st' => 'Version changes since start of '.$crstype,
+	      ('st' => 'Version changes since start of '.$type,
 	       'lm' => 'Version changes since last Month',
 	       'lw' => 'Version changes since last Week',
 	       'sy' => 'Version changes since Yesterday',
@@ -2372,9 +2322,9 @@ sub checkversions {
 	       'fi' => 'File',
 	       'md' => 'Modification Date',
                'mr' => 'Most recently published Version',
-	       've' => 'Version used in '.$crstype,
-               'vu' => 'Set Version to be used in '.$crstype,
-'sv' => 'Set Versions to be used in '.$crstype.' according to Selections below',
+	       've' => 'Version used in '.$type,
+               'vu' => 'Set Version to be used in '.$type,
+'sv' => 'Set Versions to be used in '.$type.' according to Selections below',
 'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
 'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
 	       'di' => 'Differences');
@@ -2421,7 +2371,7 @@ ENDHEADERS
                       '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
                       '<font size="+1">'.$currentversion.'</font>'.
                       '</span></td>'.
-                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$crstype.': '.
+                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
                       '<font size="+1">');
 # Used in course
 	    my $usedversion=$hash{'version_'.$linkurl};
@@ -2438,7 +2388,7 @@ ENDHEADERS
 						      ('select_form_order' =>
 						       ['',1..$currentversion,'mostrecent'],
 						       '' => '',
-						       'mostrecent' => &mt('most recent'),
+						       'mostrecent' => 'most recent',
 						       map {$_,$_} (1..$currentversion))));
 	    $r->print('</span></td></tr><tr><td></td>');
 	    my $lastold=1;
@@ -2539,19 +2489,14 @@ sub changewarning {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
     $r->print("\n\n".
-'<script type="text/javascript">'."\n".
-'// <![CDATA['."\n".
-'function reinit(tf) { tf.submit();'.$postexec.' }'."\n".
-'// ]]>'."\n".
-'</script>'."\n".
+'<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
 '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.
-'" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'.
+'" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
 &mt($message,' <input type="hidden" name="'.
     $env{'request.role'}.'" value="1" /><input type="button" value="'.
-    &mt('re-initializing '.$course_type).'" onclick="reinit(this.form)" />').
-$help{'Caching'}.'</p></form>'."\n\n");
-
+    &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
+$help{'Caching'}.'</span></h3></form>'."\n\n");
 }
 
 
@@ -2559,7 +2504,7 @@ sub init_breadcrumbs {
     my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
-					    text=>&Apache::loncommon::course_type().' Editor',
+					    text=>"Edit ".&Apache::loncommon::course_type(),
 					    faq=>273,
 					    bug=>'Instructor Interface',
                                             help => 'Docs_Adding_Course_Doc'});
@@ -2577,7 +2522,16 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    my $crstype = &Apache::loncommon::course_type();
+    my $type = &Apache::loncommon::course_type();
+
+    my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    if ($coursedom eq 'gcitest') {
+        my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+        if ($allowed) {
+            &concept_test_builder($r);
+            return OK;
+        }
+    }
 
 # --------------------------------------------- Initialize help topics for this
     foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
@@ -2620,7 +2574,7 @@ sub handler {
       &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
-      &init_breadcrumbs('exportcourse','IMS Export');
+      &init_breadcrumbs('exportcourse','Export '.&Apache::loncommon::course_type().' to IMS');
       &exportcourse($r);
   } else {
 # is this a standard course?
@@ -2649,7 +2603,7 @@ sub handler {
     }
     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
         $env{'form.folderpath'} = 'supplemental&'.
-                                  &escape(&mt('Supplemental '.$crstype.' Documents')).'&'.
+                                  &escape(&mt('Supplemental '.$type.' Documents')).'&'.
                                   $env{'form.folderpath'};
     }
     &Apache::loncommon::store_course_settings('docs_folderpath',
@@ -2704,13 +2658,9 @@ sub handler {
 	$script .= &editing_js($udom,$uname);
     }
 # -------------------------------------------------------------------- Body tag
-    $script = '<script type="text/javascript">'."\n"
-              .'// <![CDATA['."\n"
-              .$script."\n"
-              .'// ]]>'."\n"
-              .'</script>'."\n";
-    my $brcrum = [{href=>"/adm/createuser",text=>"$crstype Documents"}];
-    $r->print(&Apache::loncommon::start_page("$crstype Documents", $script,
+    $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';
+    my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}];
+    $r->print(&Apache::loncommon::start_page("$type Documents", $script,
 				    {'force_register' => $showdoc,
                                      'bread_crumbs' => $brcrum}).
 	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
@@ -2805,8 +2755,8 @@ sub handler {
   unless ($showdoc ||  $upload_result eq 'phasetwo') {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
-                'uplm' => 'Upload a new main '.lc($crstype).' document',
-                'upls' => 'Upload a new supplemental '.lc($crstype).' document',
+                'uplm' => 'Upload a new main '.lc($type).' document',
+                'upls' => 'Upload a new supplemental '.lc($type).' document',
                 'impp' => 'Import a document',
                 'pubd' => 'Published documents',
 		'copm' => 'All documents out of a published map into this folder',
@@ -2832,24 +2782,13 @@ sub handler {
                 'grpo' => 'Group Portfolios',
                 'rost' => 'Course Roster',
 		'abou' => 'About User',
-                'imsf' => 'IMS Import',
-                'imsl' => 'Import IMS package',
+                'imsf' => 'Import IMS package',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
                 'parse' => 'If HTML file, upload embedded images/multimedia files'
 					  );
 # -----------------------------------------------------------------------------
-    my %tabtitles = (
-                       main => {
-                                 Course => &mt('Main Course Documents'),
-                                 Community => &mt('Main Community Documents'),
-                               },
-                       supplemental => {
-                                 Course => &mt('Supplemental Course Documents'),        
-                                 Community => &mt('Supplemental Community Documents'),
-                               },
-                    );
     if ($allowed) {
 	&update_paste_buffer($coursenum,$coursedom);
        my $dumpbut=&dumpbutton();
@@ -2865,7 +2804,8 @@ sub handler {
        if (!$folderpath) {
 	   if ($env{'form.folder'} eq '' ||
 	       $env{'form.folder'} eq 'supplemental') {
-	       $folderpath='default&'.&escape($tabtitles{'main'}{$crstype});
+	       $folderpath='default&'.
+		   &escape(&mt('Main '.$type.' Documents'));
 	   }
        }
        unless ($env{'form.pagepath'}) {
@@ -2908,7 +2848,7 @@ sub handler {
 <div style="clear: both; height: 0px;">&nbsp;</div>
 ENDCOURSEVERIFY
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-		     &mt('Editing the Table of Contents for your '.$crstype)));
+		     &mt('Editing the Table of Contents for your '.$type)));
     }
 # --------------------------------------------------------- Standard documents
     $r->print('<table class="LC_docs_documents">');
@@ -2920,24 +2860,19 @@ ENDCOURSEVERIFY
        my $folder=$env{'form.folder'};
        if ($folder eq '' || $folder eq 'supplemental') {
            $folder='default';
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$crstype.' Documents'));
+	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
            $uploadtag = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
        my $postexec='';
        if ($folder eq 'default') {
-           $r->print('<script type="text/javascript">'."\n"
-                    .'// <![CDATA['."\n"
-                    .'this.window.name="loncapaclient";'."\n"
-                    .'// ]]>'."\n"
-                    .'</script>'."\n"
-       );
+	   $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>');
        } else {
            #$postexec='self.close();';
        }
        $hadchanges=0;
        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
-			   $upload_output,$crstype);
+			   $upload_output,$type);
        if ($error) {
 	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
@@ -2989,27 +2924,27 @@ $uploadtag
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 $lt{'pubd'}<br />
 $uploadtag
-<input type="button" onclick="javascript:groupsearch()" value="$lt{'srch'}" />
+<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
 <br />
 <span class="LC_nobreak">
-<input type="button" onclick="javascript:groupimport();" value="$lt{'impo'}" />
+<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
 $help{'Importing_LON-CAPA_Resource'}
 </span>
 <br />
-<input type="button" onclick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
+<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
 <hr />
 <p>
 $lt{'copm'}<br />
 <input type="text" size="40" name="importmap" /><br />
 <span class="LC_nobreak"><input type="button" 
-onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
 value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
 $help{'Load_Map'}</span>
 </p>
 </form>
 <hr />
 <form action="/adm/groupsort" method="post" name="recover">
-<input type="button" name="recovermap" onclick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
+<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
 </form>
 ENDFORM
        unless ($env{'form.pagepath'}) {
@@ -3019,13 +2954,13 @@ ENDFORM
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
-<input name="newext" type="button" onclick="javascript:makenewext('newext');"
+<input name="newext" type="button" onClick="javascript:makenewext('newext');"
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </span>
 </form>
 <br /><form action="/adm/imsimportdocs" method="post" name="ims">
 <input type="hidden" name="folder" value="$folder" />
-<input name="imsimport" type="button" value="$lt{'imsf'}" title="$lt{imsl}" onclick="javascript:makeims();" />
+<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
 </form>
 ENDFORM
        }
@@ -3038,7 +2973,7 @@ ENDFORM
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newfolder" type="button"
-onclick="javascript:makenewfolder(this.form,'$folderseq');"
+onClick="javascript:makenewfolder(this.form,'$folderseq');"
 value="$lt{'newf'}" />$help{'Adding_Folders'}
 </span>
 </form>
@@ -3047,7 +2982,7 @@ value="$lt{'newf'}" />$help{'Adding_Fold
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newpage" type="button"
-onclick="javascript:makenewpage(this.form,'$pageseq');"
+onClick="javascript:makenewpage(this.form,'$pageseq');"
 value="$lt{'newp'}" />$help{'Adding_Pages'}
 </span>
 </form>
@@ -3074,7 +3009,7 @@ $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newsmppg" type="button" value="$lt{'sipa'}"
-onclick="javascript:makesmppage();" /> $help{'Simple Page'}
+onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
@@ -3082,7 +3017,7 @@ $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
-onclick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newdropbox">
@@ -3090,7 +3025,7 @@ $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">          
 <input name="newdropbox" type="button" value="$lt{'drbx'}"
-onclick="javascript:makedropbox();" />
+onClick="javascript:makedropbox();" />
 </span>         
 </form> 
 <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
@@ -3098,7 +3033,7 @@ $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
-onclick="javascript:makeexamupload();" />
+onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}
 </span>
 </form>
@@ -3107,7 +3042,7 @@ $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newbulletin" type="button" value="$lt{'bull'}"
-onclick="javascript:makebulboard();" />
+onClick="javascript:makebulboard();" />
 $help{'Bulletin Board'}
 </span>
 </form>
@@ -3125,7 +3060,7 @@ $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
-onclick="javascript:makeabout();" />
+onClick="javascript:makeabout();" />
 </span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
@@ -3155,7 +3090,7 @@ $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
-onclick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
@@ -3163,7 +3098,7 @@ $uploadtag
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
-onclick="javascript:makeexamupload();" />
+onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}
 </span>
 </form>
@@ -3185,9 +3120,9 @@ ENDBLOCK
        if ($folder =~ /^supplemental$/ &&
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = 'supplemental&'.
-                                    &escape($tabtitles{'supplemental'}{$crstype});
+                                    &escape(&mt('Supplemental '.$type.' Documents'));
        }
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {
 	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
@@ -3231,7 +3166,7 @@ $lt{'comment'}:<br />
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newfolder" type="button"
-onclick="javascript:makenewfolder(this.form,'$folderseq');"
+onClick="javascript:makenewfolder(this.form,'$folderseq');"
 value="$lt{'newf'}" /> $help{'Adding_Folders'}
 </span>
 </form>
@@ -3240,7 +3175,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol
 <input type="hidden" name="importdetail" value="" />
 <span class="LC_nobreak">
 <input name="newext" type="button" 
-onclick="javascript:makenewext('supnewext');"
+onClick="javascript:makenewext('supnewext');"
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </span>
 </form>
@@ -3289,8 +3224,21 @@ ENDSUPFORM
  }
  $r->print(&Apache::loncommon::end_page());
  return OK;
-} 
+}
 
+sub concept_test_builder {
+    my ($r) = @_;
+    $r->print(&Apache::loncommon::start_page('Assemble Test'));
+    &Apache::londocsgci::setdefaults();
+    if ($env{'form.phase'} eq 'storemap') {
+          &Apache::londocsgci::evaluate();
+          &Apache::londocsgci::store($r);
+    }
+    &Apache::londocsgci::load();
+    &Apache::londocsgci::listresources($r);
+    $r->print(&Apache::loncommon::end_page());
+    return;
+}
 
 sub editing_js {
     my ($udom,$uname) = @_;