--- loncom/interface/londocs.pm	2013/01/07 00:06:59	1.484.2.21
+++ loncom/interface/londocs.pm	2013/01/03 23:47:51	1.526
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.21 2013/01/07 00:06:59 raeburn Exp $
+# $Id: londocs.pm,v 1.526 2013/01/03 23:47:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -651,7 +651,7 @@ sub print_paste_buffer {
         $is_external = 1;
     }
 
-    my ($canpaste,$nopaste,$othercrs,$areachange);
+    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
     if ($folder =~ /^supplemental/) {
         $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
         unless ($canpaste) {
@@ -1543,7 +1543,7 @@ sub apply_fixups {
             if ($folder !~ /^supplemental/) {
                 $report = 1;
             }
-            (my $outtext,$errtext) =
+            my ($outtext,$errtext) =
                 &LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report);
             if ($errtext) {
                 return &mt('Paste failed: an error occurred saving the folder or page.');
@@ -3072,6 +3072,7 @@ sub startContentScreen {
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
+        $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
     } else {
         $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
@@ -3218,11 +3219,11 @@ sub handler {
        if ($env{'form.symb'} ne '') {
            $env{'form.folderpath'}=
                &Apache::loncommon::symb_to_docspath($env{'form.symb'});
-           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
+           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => 
                $env{'form.command'}.'_'.$env{'form.symb'}});
        } elsif ($env{'form.supppath'} ne '') {
            $env{'form.folderpath'}=$env{'form.supppath'};
-           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
+           &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => 
                $env{'form.command'}.'_'.$env{'form.supppath'}});
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
@@ -3240,6 +3241,7 @@ sub handler {
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/menu'});
    }
 
+
 # Where do we store these for when we come back?
     my $stored_folderpath='docs_folderpath';
     if ($supplementalflag) {
@@ -4337,8 +4339,8 @@ sub editing_js {
     my $toplevelsupp = &supplemental_base();
 
     my $backtourl;
-    if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) {
-        my $caller = $1;
+    if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) {   
+        my $caller = $1; 
         if ($caller =~ /^supplemental/) {
             $backtourl = '/adm/supplemental?folderpath='.&escape($caller);
         } else {