--- loncom/interface/londocs.pm	2013/12/27 15:11:25	1.484.2.45
+++ loncom/interface/londocs.pm	2017/08/31 20:28:55	1.484.2.74
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.45 2013/12/27 15:11:25 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.74 2017/08/31 20:28:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,6 +46,7 @@ use Apache::lonsimplepage();
 use HTML::Entities;
 use HTML::TokeParser;
 use GDBM_File;
+use File::MMagic;
 use Apache::lonlocal;
 use Cwd;
 use LONCAPA qw(:DEFAULT :match);
@@ -138,7 +139,43 @@ sub clean {
     return $title;
 }
 
-
+sub default_folderpath {
+    my ($coursenum,$coursedom,$navmapref) = @_;
+    return unless ($coursenum && $coursedom && ref($navmapref));
+# Check if entire course is hidden and/or encrypted
+    my ($hiddenmap,$encryptmap,$folderpath,$hiddentop);
+    my $toplevel = "uploaded/$coursedom/$coursenum/default.sequence";
+    unless (ref($$navmapref)) {
+        $$navmapref = Apache::lonnavmaps::navmap->new();
+    }
+    if (ref($$navmapref)) {
+        if (lc($$navmapref->get_mapparam(undef,$toplevel,"0.hiddenresource")) eq 'yes') {
+            my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
+            my @resources = $$navmapref->retrieveResources($toplevel,$filterFunc,1,1);
+            unless (@resources) {
+                $hiddenmap = 1;
+                unless ($env{'request.role.adv'}) {
+                    $hiddentop = 1;
+                    if ($env{'form.folder'}) {
+                        undef($env{'form.folder'});
+                    }
+                }
+            }
+        }
+        if (lc($$navmapref->get_mapparam(undef,$toplevel,"0.encrypturl")) eq 'yes') {
+            $encryptmap = 1;
+        }
+    }
+    unless ($hiddentop) {
+        $folderpath='default&'.&escape(&mt('Main Content')).
+                    '::'.$hiddenmap.':'.$encryptmap.'::';
+    }
+    if (wantarray) {
+        return ($folderpath,$hiddentop);
+    } else {
+        return $folderpath;
+    }
+}
 
 sub dumpcourse {
     my ($r) = @_;
@@ -301,14 +338,14 @@ ENDJS
                 if ($contents{content}) {
                     $content .= '
 <div class="LC_Box">
-<h4 class="LC_hcell">Content</h4>'.
+<h4 class="LC_hcell">'.&mt('Content').'</h4>'.
 $contents{content}.'
 </div>';
                 }
                 if ($contents{webreferences}) {
                     $content .= '
 <div class="LC_Box">
-<h4 class="LC_hcell">Web References</h4>'.
+<h4 class="LC_hcell">'.&mt('Web References').'</h4>'.
 $contents{webreferences}.'
 </div>';
                 }
@@ -651,7 +688,7 @@ sub group_import {
                 } else {
                     $fname =~ s/\W/_/g;
                 }
-                if (length($fname > 15)) {
+                if (length($fname) > 15) {
                     $fname = substr($fname,0,14);
                 }
                 my $initialtext = &mt('Replace with your own content.');
@@ -790,12 +827,14 @@ sub log_docs {
 }
 
 sub docs_change_log {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath)=@_;
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit)=@_;
     my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
+    my $navmap;   
     my $js = '<script type="text/javascript">'."\n".
              '// <![CDATA['."\n".
              &Apache::loncommon::display_filter_js('docslog')."\n".
-             &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag)."\n".
+             &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag,
+                         $coursedom,$coursenum,$canedit,\$navmap)."\n".
              &history_tab_js()."\n".
              &Apache::lonratedt::editscript('simple')."\n".
              '// ]]>'."\n".
@@ -811,8 +850,9 @@ sub docs_change_log {
     }
     my $folderpath=$env{'form.folderpath'};
     if ($folderpath eq '') {
-        $folderpath = 'default&'.&escape(&mt('Main Content').':::::');
+        $folderpath = &default_folderpath($coursenum,$coursedom,\$navmap);
     }
+    undef($navmap);
     $pathitem = '<input type="hidden" name="folderpath" value="'.
                 &HTML::Entities::encode($folderpath,'<>&"').'" />';
     my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
@@ -976,7 +1016,7 @@ sub docs_change_log {
 
 sub update_paste_buffer {
     my ($coursenum,$coursedom,$folder) = @_;
-    my (@possibles,%removals,%cuts);
+    my (@possibles,%removals,%cuts,$output);
     if ($env{'form.multiremove'}) {
         $env{'form.multiremove'} =~ s/,$//;
         map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'});
@@ -1044,10 +1084,12 @@ sub update_paste_buffer {
         next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));
         my ($suffix,$errortxt,$locknotfreed) =
             &new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste');
-        push(@newpaste,$suffix);
-        if ($locknotfreed) {
-            return $locknotfreed;
-            last;
+        if ($suffix ne '') {
+            push(@newpaste,$suffix);
+        } else {
+            if ($locknotfreed) {
+                return $locknotfreed;
+            }
         }
         if (&is_supplemental_title($title)) {
             &Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});
@@ -1081,12 +1123,17 @@ sub update_paste_buffer {
                 }
             }
         }
+        if ($locknotfreed) {
+            $output = $locknotfreed;
+            last;
+        }
     }
     if (@newpaste) {
         $addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste));
     }
     &Apache::lonnet::appenv(\%addtoenv);
     delete($env{'form.markcopy'});
+    return $output;
 }
 
 sub recurse_uploaded_maps {
@@ -1124,6 +1171,7 @@ sub print_paste_buffer {
 
     my @currpaste = split(/,/,$env{'docs.markedcopies'});
     my ($pasteitems,@pasteable);
+    my $clipboardcount = 0;
 
 # Construct identifiers for current contents of user's paste buffer
     foreach my $suffix (@currpaste) {
@@ -1132,6 +1180,7 @@ sub print_paste_buffer {
         my $url = $env{'docs.markedcopy_url_'.$suffix};
         if (($cid =~ /^$match_domain\_$match_courseid$/) &&
             ($url ne '')) {
+            $clipboardcount ++;
             my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,
                 $canpaste,$nopaste,$othercrs,$areachange);
             my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];
@@ -1187,10 +1236,14 @@ sub print_paste_buffer {
                     $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
                     $icon .= '/navmap.folder.closed.gif';
                 }
+                my $title = $env{'docs.markedcopy_title_'.$suffix};
+                if ($title eq '') {
+                    ($title) = ($url =~ m{/([^/]+)$});
+                }
                 $buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'.
                           ': '.
                           &Apache::loncommon::parse_supplemental_title(
-                             &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}));
+                             &LONCAPA::map::qtescape($title));
             }
             $pasteitems .= '<div class="LC_left_float">';
             my ($options,$onclick);
@@ -1225,11 +1278,23 @@ sub print_paste_buffer {
         $pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>';
         $form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">';
         if (@pasteable) {
-            $buttons = '<input type="submit" name="pastemarked" value="'.&mt('Paste selected').'" />'.('&nbsp;'x2);
+            my $value = &mt('Paste to current folder');
+            if ($container eq 'page') {
+                $value = &mt('Paste to current page');
+            }
+            $buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.('&nbsp;'x2);
+        }
+        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Clear selected').'" />'.('&nbsp;'x2);
+        if ($clipboardcount > 1) {
+            $buttons .=
+                '<span style="text-decoration:line-through">'.('&nbsp;'x20).'</span>'.('&nbsp;'x2).
+                '<input type="button" name="checkallclip" value="'.&mt('Check all').'" style="height:20px;" onclick="checkClipboard();" />'.
+                ('&nbsp;'x2).
+                '<input type="button" name="uncheckallclip" value="'.&mt('Uncheck all').'" style="height:20px;" onclick="uncheckClipboard();" />'.
+                ('&nbsp;'x2);
         }
-        $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Clear selected').'" />'.
-                    '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
-        $form_end = '</form>';
+        $form_end = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'.
+                    '</form>';
     } else {
         $pasteitems = &mt('Clipboard is empty');
     }
@@ -1327,29 +1392,34 @@ sub supp_pasteable {
 }
 
 sub paste_popup_js {
-    my %lt = &Apache::lonlocal::texthash(
+    my %html_js_lt = &Apache::lonlocal::texthash(
                                           show => 'Show Options',
                                           hide => 'Hide Options',
+                                        );
+    my %js_lt = &Apache::lonlocal::texthash(
                                           none => 'No items selected from clipboard.',
                                         );
+    &html_escape(\%html_js_lt);
+    &js_escape(\%html_js_lt);
+    &js_escape(\%js_lt);
     return <<"END";
 
 function showPasteOptions(suffix) {
     document.getElementById('pasteoptions_'+suffix).style.display='block';
-    document.getElementById('pasteoptionstext_'+suffix).innerHTML = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$lt{'hide'}</a>';
+    document.getElementById('pasteoptionstext_'+suffix).innerHTML = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$html_js_lt{'hide'}</a>';
     return;
 }
 
 function hidePasteOptions(suffix) {
     document.getElementById('pasteoptions_'+suffix).style.display='none';
-    document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>';
+    document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
     return;
 }
 
 function showOptions(caller,suffix) {
     if (document.getElementById('pasteoptionstext_'+suffix)) {
         if (caller.checked) {
-            document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>';
+            document.getElementById('pasteoptionstext_'+suffix).innerHTML ='&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
         } else {
             document.getElementById('pasteoptionstext_'+suffix).innerHTML ='';
         }
@@ -1378,11 +1448,29 @@ function validateClipboard() {
     if (numchk > 0) { 
         return true;
     } else {
-        alert("$lt{'none'}");
+        alert("$js_lt{'none'}");
         return false;
     }
 }
 
+function checkClipboard() {
+    if (document.pasteform.pasting.length > 1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            document.pasteform.pasting[i].checked = true;
+        }
+    }
+    return;
+}
+
+function uncheckClipboard() {
+    if (document.pasteform.pasting.length >1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            document.pasteform.pasting[i].checked = false;
+        }
+    }
+    return;
+}
+
 END
 
 }
@@ -1871,8 +1959,8 @@ sub get_newmap_url {
 sub dbcopy {
     my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
     my ($url,$result,$errtext);
-    $url = $dbref->{'src'};
     if (ref($dbref) eq 'HASH') {
+        $url = $dbref->{'src'};
         if ($url =~ m{/(smppg|bulletinboard)$}) {
             my $prefix = $1;
             if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
@@ -2569,26 +2657,45 @@ sub update_parameter {
         }
         return $haschanges;
     } else {
-        return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
+        my $haschanges = 0;
+        return $haschanges if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
 
         my $which = $env{'form.changeparms'};
         my $idx = $env{'form.setparms'};
+        my $oldvalue = 0;
+        my $newvalue = 0;
+        my $current = (&LONCAPA::map::getparameter($idx,'parameter_'.$which))[0];
+        if ($which eq 'randompick') {
+            if ($current =~ /^(\d+)$/) {
+                $oldvalue = $1;
+            }
+        } elsif ($current =~ /^yes$/i) {
+            $oldvalue = 1;
+        }
         if ($env{'form.'.$which.'_'.$idx}) {
-	    my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
-	                                         : 'yes';
-	    &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
-				          $parameter_type{$which});
-	    &remember_parms($idx,$which,'set',$value);
-        } else {
-	    &LONCAPA::map::delparameter($idx,'parameter_'.$which);
-
-	    &remember_parms($idx,$which,'del');
+            $newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
+                                                 : 1;
         }
-        return 1;
+        if ($oldvalue ne $newvalue) {
+            $haschanges = 1;
+            if ($newvalue) {
+                my $storeval = 'yes';
+                if ($which eq 'randompick') {
+                    $storeval = $newvalue;
+                }
+                &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval,
+                                              $parameter_type{$which});
+                &remember_parms($idx,$which,'set',$storeval);
+            } else {
+                &LONCAPA::map::delparameter($idx,'parameter_'.$which);
+                &remember_parms($idx,$which,'del');
+            }
+        }
+        return $haschanges;
     }
+    return;
 }
 
-
 sub handle_edit_cmd {
     my ($coursenum,$coursedom) =@_;
     if ($env{'form.cmd'} eq '') {
@@ -2638,7 +2745,8 @@ sub handle_edit_cmd {
 
 sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
-        $supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
+        $supplementalflag,$orderhash,$iconpath,$pathitem,$canedit,$navmapref,
+        $hiddentop)=@_;
     my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);
     if ($allowed) {
         (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
@@ -2661,9 +2769,21 @@ sub editor {
         $randompick = -1;
     }
 
-    my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
-				    $folder.'.'.$container);
-    return $errtext if ($fatal);
+    my ($errtext,$fatal);
+    if (($folder eq '') && (!$supplementalflag)) {
+        if (@LONCAPA::map::order) {
+            undef(@LONCAPA::map::order);
+            undef(@LONCAPA::map::resources);
+            undef(@LONCAPA::map::resparms);
+            undef(@LONCAPA::map::zombies);
+        }
+        $folder = 'default';
+        $container = 'sequence';
+    } else {
+        ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                     $folder.'.'.$container);
+        return $errtext if ($fatal);
+    }
 
     if ($#LONCAPA::map::order<1) {
 	my $idx=&LONCAPA::map::getresidx();
@@ -2675,12 +2795,12 @@ sub editor {
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
-    if (($allowed) && ($env{'form.folder'} eq $folder)) {
+    if (($allowed && $canedit) && ($env{'form.folder'} eq $folder)) {
 # set parameters and change order
 	&snapshotbefore();
 
 	if (&update_parameter()) {
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,1);
 	    return $errtext if ($fatal);
 	}
 
@@ -2742,9 +2862,9 @@ sub editor {
 	$r->print($upload_output);
 
 # Rename, cut, copy or remove a single resource
-	if (&handle_edit_cmd()) {
+	if (&handle_edit_cmd($coursenum,$coursedom)) {
             my $contentchg;
-            if ($env{'form.cmd'} =~ m{^(del|cut)_}) {
+            if ($env{'form.cmd'} =~ m{^(remove|cut)_}) {
                 $contentchg = 1;
             }
 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
@@ -2776,7 +2896,7 @@ sub editor {
                     my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
                     $name=&LONCAPA::map::qtescape($name);
                     $url=&LONCAPA::map::qtescape($url);
-                    next unless ($name && $url);
+                    next unless $url;
                     my %denied =
                         &action_restrictions($coursenum,$coursedom,$url,
                                              $env{'form.folderpath'},\%curr_groups);
@@ -2941,19 +3061,21 @@ sub editor {
         if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
             push(@allmapidx,$res);
         }
+
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
                               $coursenum,$coursedom,$crstype,
                               $pathitem,$supplementalflag,$container,
-                              \%filters,\%curr_groups);
+                              \%filters,\%curr_groups,$canedit,
+                              $isencrypted,$navmapref);
         $idx++;
         $shown++;
     }
     &Apache::loncommon::end_data_table_count();
 
     my $need_save;
-    if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) {
+    if ($allowed || ($supplementalflag && $folder eq 'supplemental')) {
         my $toolslink;
-        if ($allowed || &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+        if ($allowed) {
             $toolslink = '<table><tr><td>'
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
                                                            'Navigation_Screen',undef,'RAT')
@@ -3000,12 +3122,12 @@ sub editor {
                                 &Apache::loncommon::continue_data_table_row().
                                 '<td colspan="2">&nbsp;</td>'.
                                 '<td>'.
-                                &multiple_check_form('actions',\%lists).
+                                &multiple_check_form('actions',\%lists,$canedit).
                                 '</td>'.
                                 '<td>&nbsp;</td>'.
                                 '<td>&nbsp;</td>'.
                                 '<td colspan="4">'.
-                                &multiple_check_form('settings',\%lists).
+                                &multiple_check_form('settings',\%lists,$canedit).
                                 '</td>'.
                                 &Apache::loncommon::end_data_table_row();
                              $need_save = 1;
@@ -3026,9 +3148,15 @@ sub editor {
             if (!$allowed) {
                 $to_show .= $toolslink;
             }
+            my $noresmsg;
+            if ($allowed && $hiddentop && !$supplementalflag) {
+                $noresmsg = &mt('Main Content Hidden');
+            } else {
+                $noresmsg = &mt('Currently empty');
+            }
             $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
                        .'<div class="LC_info" id="contentlist">'
-                       .&mt('Currently empty')
+                       .$noresmsg
                        .'</div>'
                        .&Apache::loncommon::end_scrollbox();
         }
@@ -3052,8 +3180,10 @@ sub editor {
     if ($allowed) {
         my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
         $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,
-                                       $jumpto,$readfile,$need_save,"$folder.$container"));
-        &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
+                                       $jumpto,$readfile,$need_save,"$folder.$container",$canedit));
+        if ($canedit) {
+            &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
+        }
     } else {
         $r->print($to_show);
     }
@@ -3061,8 +3191,12 @@ sub editor {
 }
 
 sub multiple_check_form {
-    my ($caller,$listsref) = @_;
+    my ($caller,$listsref,$canedit) = @_;
     return unless (ref($listsref) eq 'HASH');
+    my $disabled;
+    unless ($canedit) {
+        $disabled = 'disabled="disabled"';
+    }
     my $output =
     '<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'.
     '<span class="LC_nobreak" style="font-size:x-small;font-weight:bold;">'.
@@ -3075,15 +3209,15 @@ sub multiple_check_form {
             '<table><tr>'.
             '<td class="LC_docs_entry_parameter">'.
             '<span class="LC_nobreak"><label>'.
-            '<input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')" />'.&mt('Hidden').
+            '<input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')"'.$disabled.' />'.&mt('Hidden').
             '</label></span></td>'.
             '<td class="LC_docs_entry_parameter">'.
-            '<span class="LC_nobreak"><label><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');" />'.&mt('Randomly Pick').'</label><span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" />'.
+            '<span class="LC_nobreak"><label><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');"'.$disabled.' />'.&mt('Randomly Pick').'</label><span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" />'.
             '</span></td>'.
             '</tr>'."\n".
             '<tr>'.
             '<td class="LC_docs_entry_parameter">'.
-            '<span class="LC_nobreak"><label><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')" />'.&mt('URL hidden').'</label></span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><label><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')" />'.&mt('Random Order').
+            '<span class="LC_nobreak"><label><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')"'.$disabled.' />'.&mt('URL hidden').'</label></span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><label><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')"'.$disabled.' />'.&mt('Random Order').
             '</label></span>'.
             '</td></tr></table>'."\n";
     } else {
@@ -3091,15 +3225,15 @@ sub multiple_check_form {
             '<table><tr>'.
             '<td class="LC_docs_entry_parameter">'.
             '<span class="LC_nobreak LC_docs_remove">'.
-            '<label><input type="checkbox" name="removeall" id="removeall" onclick="propagateState(this.form,'."'remove'".')" />'.&mt('Remove').
+            '<label><input type="checkbox" name="removeall" id="removeall" onclick="propagateState(this.form,'."'remove'".')"'.$disabled.' />'.&mt('Remove').
             '</label></span></td>'.
             '<td class="LC_docs_entry_parameter">'.
             '<span class="LC_nobreak LC_docs_cut">'.
-            '<label><input type="checkbox" name="cut" id="cutall" onclick="propagateState(this.form,'."'cut'".');" />'.&mt('Cut').
+            '<label><input type="checkbox" name="cut" id="cutall" onclick="propagateState(this.form,'."'cut'".');"'.$disabled.' />'.&mt('Cut').
             '</label></span></td>'."\n".
             '<td class="LC_docs_entry_parameter">'.
             '<span class="LC_nobreak LC_docs_copy">'.
-            '<label><input type="checkbox" name="copyall" id="copyall" onclick="propagateState(this.form,'."'copy'".')" />'.&mt('Copy').
+            '<label><input type="checkbox" name="copyall" id="copyall" onclick="propagateState(this.form,'."'copy'".')"'.$disabled.' />'.&mt('Copy').
             '</label></span></td>'.
             '</tr></table>'."\n";
     }
@@ -3141,7 +3275,7 @@ sub process_file_upload {
     my $quotatype = 'unofficial';
     if ($crstype eq 'Community') {
         $quotatype = 'community';
-    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.instcode'}) {
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
         $quotatype = 'official';
     } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
         $quotatype = 'textbook';
@@ -3149,7 +3283,8 @@ sub process_file_upload {
     if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) {
         $filesize = int($filesize/1000); #expressed in kb
         $$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course',
-                                                                      $env{'form.uploaddoc.filename'},$filesize,'upload');
+                                                                      $env{'form.uploaddoc.filename'},$filesize,
+                                                                      'upload',$quotatype);
         return if ($$upload_output);
     }
     my ($parseaction,$showupload,$nextphase,$mimetype);
@@ -3247,7 +3382,8 @@ sub process_file_upload {
                     $$upload_output .= &mt('No embedded items identified').'<br />';
                 }
                 $$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>';
-            } elsif (&Apache::loncommon::is_archive_file($mimetype)) {
+            } elsif ((&Apache::loncommon::is_archive_file($mimetype)) &&
+                     ($env{'form.uploaddoc.filename'} =~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i)) {
                 $nextphase = 'decompress_uploaded';
                 my $position = scalar(@LONCAPA::map::order)-1;
                 my $noextract = &return_to_editor();
@@ -3308,8 +3444,9 @@ sub is_supplemental_title {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
-        $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups)=@_;
-    my ($foldertitle,$renametitle);
+        $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups,
+        $canedit,$isencrypted,$navmapref)=@_;
+    my ($foldertitle,$renametitle,$oldtitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
     } else {
@@ -3318,11 +3455,20 @@ sub entryline {
 	$foldertitle=$title;
     }
 
+    my ($disabled,$readonly,$js_lt);
+    unless ($canedit) {
+        $disabled = 'disabled="disabled"';
+        $readonly = 1;
+    }
+
     my $orderidx=$LONCAPA::map::order[$index];
 
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
+    $renametitle=~s/"/%22/g;
     $renametitle=~s/ /%20/g;
+    $oldtitle = $renametitle;
+    $renametitle=~s/\&#39\;/\\\'/g;
     my $line=&Apache::loncommon::start_data_table_row();
     my ($form_start,$form_end,$form_common,$form_param);
 # Edit commands
@@ -3378,7 +3524,7 @@ END
 	     ne '')) {
 	    $selectbox=
 		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
-		'<select name="newpos" onchange="this.form.submit()">';
+		'<select name="newpos" onchange="this.form.submit()"'.$disabled.'>';
 	    for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
 		if ($i==$incindex) {
 		    $selectbox.='<option value="" selected="selected">('.$i.')</option>';
@@ -3400,13 +3546,15 @@ END
                 'pr' => 'Preview',
                 'sv' => 'Save',
                 'ul' => 'URL',
-                'ti' => 'Title', 
+                'ti' => 'Title',
+                'er' => 'Editing rights unavailable for your current role.',  
                 );
 	my %denied = &action_restrictions($coursenum,$coursedom,$url,
                                           $env{'form.folderpath'},
                                           $currgroups);
         my ($copylink,$cutlink,$removelink);
 	my $skip_confirm = 0;
+        my $confirm_removal = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
 			    |/syllabus$
@@ -3417,6 +3565,10 @@ END
              || $isexternal) {
 	    $skip_confirm = 1;
 	}
+        if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+            ($url!~/$LONCAPA::assess_page_seq_re/)) {
+            $confirm_removal = 1;
+        }
 
 	if ($denied{'copy'}) {
             $copylink=(<<ENDCOPY)
@@ -3428,7 +3580,7 @@ ENDCOPY
 	    $copylink=(<<ENDCOPY);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
+<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
 $form_end
 ENDCOPY
             if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) {
@@ -3446,7 +3598,7 @@ ENDCUT
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
 <input type="hidden" name="skip_$orderidx" id="skip_cut_$orderidx" value="$skip_confirm" />
-<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
+<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
 $form_end
 ENDCUT
             if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) {
@@ -3459,12 +3611,13 @@ ENDCUT
 ENDREM
         } else {
             my $formname = 'edit_remove_'.$orderidx;
-            my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm);";
+            my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder',$confirm_removal);";
             $removelink=(<<ENDREM);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
 <input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />
-<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
+<input type="hidden" name="confirm_rem_$orderidx" id="confirm_removal_$orderidx" value="$confirm_removal" />
+<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
 $form_end
 ENDREM
             if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) {
@@ -3472,17 +3625,25 @@ ENDREM
             }
         }
         $renamelink=(<<ENDREN);
-<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>
+<a href='javascript:changename("$esc_path","$index","$oldtitle");' class="LC_docs_rename">$lt{'rn'}</a>
 ENDREN
+        my ($uplink,$downlink);
+        if ($canedit) {
+            $uplink = "/adm/coursedocs?cmd=up_$index&amp;folderpath=$esc_path&amp;symb=$symb";
+            $downlink = "/adm/coursedocs?cmd=down_$index&amp;folderpath=$esc_path&amp;symb=$symb";
+        } else {
+            $uplink = "javascript:alert('".&js_escape($lt{'er'})."');";
+            $downlink = $uplink;
+        }
 	$line.=(<<END);
 <td>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=up_$index&amp;folderpath=$esc_path&amp;symb=$symb'>
+  <a href="$uplink">
     <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=down_$index&amp;folderpath=$esc_path&amp;symb=$symb'>
+  <a href="$downlink">
     <img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" />
   </a>
 </div>
@@ -3508,6 +3669,7 @@ END
     my $isfolder;
     my $ispage;
     my $containerarg;
+    my $folderurl;
     if ($uploaded) {
         if (($extension eq 'sequence') || ($extension eq 'page')) {
             $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/;
@@ -3519,6 +3681,7 @@ END
                 $icon=$iconpath.'page.gif';
                 $ispage=1;
             }
+            $folderurl = &Apache::lonnet::declutter($url);
             if ($allowed) {
                 $url='/adm/coursedocs?';
             } else {
@@ -3529,7 +3692,7 @@ END
 	}
     }
 
-    my ($editlink,$extresform);
+    my ($editlink,$extresform,$anchor,$hiddenres,$nomodal);
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     $url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
@@ -3547,17 +3710,95 @@ END
 	        } elsif ($url!~/\.(sequence|page)$/) {
 		    $url='/adm/coursedocs/showdoc'.$url;
 	        }
-	    } elsif ($url=~m|^/ext/|) {
-	        $url='/adm/wrapper'.$url;
+            } elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) {
+                my $wrapped = $1;
+                my $exturl = $2;
+                if ($wrapped eq '') {
+                    $url='/adm/wrapper'.$url;
+                }
+                if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
+                    $nomodal = 1;
+                }
+            } elsif ($url eq "/public/$coursedom/$coursenum/syllabus") {
+                if (($ENV{'SERVER_PORT'} == 443) &&
+                    ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+                    $nomodal = 1;
+                }
 	    }
             if (&Apache::lonnet::symbverify($symb,$url)) {
-	        $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+                my $shownsymb = $symb;
+                if ($isexternal) {
+                    if ($url =~ /^([^#]+)#([^#]+)$/) {
+                        $url = $1;
+                        $anchor = $2;
+                        if ($symb =~ m{^([^#]+)\Q#$anchor\E$}) {
+                            $shownsymb = $1.&escape('#').$anchor;
+                        }
+                    }
+                }
+                unless ($env{'request.role.adv'}) {
+                    if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
+                        $url = '';
+                    }
+                    if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) {
+                        $url = '';
+                        $hiddenres = 1;
+                    }
+                }
+                if ($url ne '') {
+                    $url.=(($url=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&');
+                }
+            } elsif (!$env{'request.role.adv'}) {
+                my $checkencrypt;
+                if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) ||
+                      $isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) {
+                    $checkencrypt = 1;
+                } elsif (ref($navmapref)) {
+                    unless (ref($$navmapref)) {
+                        $$navmapref = Apache::lonnavmaps::navmap->new();
+                    }
+                    if (ref($$navmapref)) {
+                        if (lc($$navmapref->get_mapparam($symb,undef,"0.encrypturl")) eq 'yes') {
+                            $checkencrypt = 1;
+                        }
+                    }
+                }
+                if ($checkencrypt) {
+                    my $shownsymb = &Apache::lonenc::encrypted($symb);
+                    my $shownurl = &Apache::lonenc::encrypted($url);
+                    if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) {
+                        $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&');
+                        if ($env{'request.enc'} ne '') {
+                            delete($env{'request.enc'});
+                        }
+                    } else {
+                        $url='';
+                    }
+                } else {
+                    $url='';
+                }
             } else {
                 $url='';
             }
 	}
+    } elsif ($supplementalflag) {
+        if ($isexternal) {
+            if ($url =~ /^([^#]+)#([^#]+)$/) {
+                $url = $1;
+                $anchor = $2;
+                if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) {
+                    $nomodal = 1;
+                }
+            }
+        } elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
+            if (($ENV{'SERVER_PORT'} == 443) &&
+                ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+                $nomodal = 1;
+            }
+        }
     }
-    my ($rand_pick_text,$rand_order_text);
+    my ($rand_pick_text,$rand_order_text,$hiddenfolder);
+    my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
     if ($isfolder || $ispage || $extension eq 'sequence' || $extension eq 'page') {
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
@@ -3566,21 +3807,48 @@ END
             $folderpath.=$containerarg.'&'.$foldername;
             $url.='folderpath='.&escape($folderpath);
         } else {
-# Append randompick number, hidden, and encrypted with ":" to foldername,
-# so it gets transferred between levels
-	    $folderpath.=$containerarg.'&'.$foldername.
-                                              ':'.(&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randompick'))[0]
-                                               .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_hiddenresource'))[0]=~/^yes$/i)
-                                               .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_encrypturl'))[0]=~/^yes$/i)
-                                               .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randomorder'))[0]=~/^yes$/i)
-                                               .':'.$ispage;
-	    $url.='folderpath='.&escape($folderpath);
             my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
                                                         'parameter_randompick'))[0];
+            my $randorder = ((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_randomorder'))[0]=~/^yes$/i);
+            my $hiddenmap = ((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_hiddenresource'))[0]=~/^yes$/i);
+            my $encryptmap = ((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_encrypturl'))[0]=~/^yes$/i);
+            unless ($hiddenmap) {
+                if (ref($navmapref)) {
+                    unless (ref($$navmapref)) {
+                        $$navmapref = Apache::lonnavmaps::navmap->new();
+                    }
+                    if (ref($$navmapref)) {
+                        if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') {
+                            my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1);
+                            unless (@resources) {
+                                $hiddenmap = 1;
+                                unless ($env{'request.role.adv'}) {
+                                    $url = '';
+                                    $hiddenfolder = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            unless ($encryptmap) {
+                if ((ref($navmapref)) && (ref($$navmapref))) {
+                    if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') {
+                        $encryptmap = 1;
+                    }
+                }
+            }
+
+# Append randompick number, hidden, and encrypted with ":" to foldername,
+# so it gets transferred between levels
+            $folderpath.=$containerarg.'&'.$foldername.
+                         ':'.$rpicknum.':'.$hiddenmap.':'.$encryptmap.':'.$randorder.':'.$ispage;
+            unless ($url eq '') {
+                $url.='folderpath='.&escape($folderpath);
+            }
             my $rpckchk;
             if ($rpicknum) {
                 $rpckchk = ' checked="checked"';
@@ -3593,14 +3861,14 @@ END
 '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
 $form_param."\n".
 $form_common."\n".
-'<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">';
+'<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.$disabled.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">';
             if ($rpicknum ne '') {
                 $rand_pick_text .= ':&nbsp;<a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';
             }
             $rand_pick_text .= '</span></span>'.
                                $form_end;
             my $ro_set;
-            if ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i) {
+            if ($randorder) {
                 $ro_set = 'checked="checked"';
                 if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) {
                     push(@{$filtersref->{'randomorder'}},$orderidx);
@@ -3611,7 +3879,7 @@ $form_common."\n".
 '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
 $form_param."\n".
 $form_common."\n".
-'<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.' /> '.&mt('Random Order').' </label></span>'.
+'<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.$disabled.' /> '.&mt('Random Order').' </label></span>'.
 $form_end;
         }
     } elsif ($supplementalflag && !$allowed) {
@@ -3623,6 +3891,9 @@ $form_end;
         if ($isexternal && $orderidx) {
             $url .= '&amp;idx='.$orderidx;
         }
+        if ($anchor ne '') {
+            $url .= '&amp;anchor='.&HTML::Entities::encode($anchor,'"<>&');
+        }
     }
     my ($tdalign,$tdwidth);
     if ($allowed) {
@@ -3630,18 +3901,23 @@ $form_end;
             &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
         if ($isexternal) {
             ($editlink,$extresform) = 
-                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
+                &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
+                                                     undef,undef,undef,$disabled);
         } elsif (!$isfolder && !$ispage) {
             my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
                 &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
             if (($cfile ne '') && ($symb ne '' || $supplementalflag)) {
+                my $suppanchor;
+                if ($supplementalflag) {
+                    $suppanchor = $anchor;
+                }
                 my $jscall = 
                     &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
                                                             $switchserver,
                                                             $forceedit,
                                                             undef,$symb,
                                                             &escape($env{'form.folderpath'}),
-                                                            $renametitle,'','',1);
+                                                            $renametitle,'','',1,$suppanchor);
                 if ($jscall) {
                     $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
@@ -3658,11 +3934,26 @@ $form_end;
         $reinit = &mt('(re-initialize course to access)');
     }
     $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink;
+    my $link;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes',
-                                             '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+       if ($anchor ne '') {
+           if ($supplementalflag) {
+               $anchor = '&amp;anchor='.&HTML::Entities::encode($anchor,'"<>&');
+           } else {
+               $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
+           }
+       }
+       $link = &js_escape($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes'.
+                                               (($anchor ne '')?$anchor:''));
+       if ($nomodal) {
+           $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
+                  '<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>';
+       } else {
+           $line.=&Apache::loncommon::modal_link($link,
+                                                 '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+       }
     } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
     }
@@ -3670,8 +3961,14 @@ $form_end;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes',
-                                             $title,600,500);
+       if ($nomodal) {
+           $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
+                  $title.'</a>';
+       } else {
+           $line.=&Apache::loncommon::modal_link($link,$title,600,500);
+       }
+    } elsif (($hiddenfolder) || ($hiddenres)) {
+       $line.=$title.' <span class="LC_warning LC_docs_reinit_warn">('.&mt('Hidden').')</span>';
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
@@ -3702,13 +3999,13 @@ $form_end;
     <form action="/adm/coursedocs" method="post" name="$formhidden">
     $form_param
     $form_common
-    <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext /> $lt{'hd'}</label>
+    <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label>
     $form_end
     <br />
     <form action="/adm/coursedocs" method="post" name="$formurlhidden">
     $form_param
     $form_common
-    <label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'encrypturl','settings');" $enctext /> $lt{'ec'}</label>
+    <label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'encrypturl','settings');" $enctext $disabled /> $lt{'ec'}</label>
     $form_end
   </td>
   <td class="LC_docs_entry_parameter">$rand_pick_text<br />
@@ -3787,6 +4084,7 @@ sub new_timebased_suffix {
     if ($type eq 'paste') {
         $prefix = $type;
         $namespace = 'courseeditor';
+        $idtype = 'addcode';
     } elsif ($type eq 'map') {
         $prefix = 'docs';
         if ($area eq 'supplemental') {
@@ -3798,9 +4096,8 @@ sub new_timebased_suffix {
         $prefix = $type;
         $namespace = 'templated';
     }
-    $idtype = 'concat';
     my ($suffix,$freedlock,$error) =
-        &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num);
+        &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num,$idtype);
     if (!$suffix) {
         if ($type eq 'paste') {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.');
@@ -3820,9 +4117,19 @@ sub new_timebased_suffix {
             '<div class="LC_error">'.
             &mt('There was a problem removing a lockfile.').' ';
         if ($type eq 'paste') {
-            &mt('This will prevent use of the paste buffer until th next log-in.');
+            if ($freedlock eq 'nolock') {
+                $locknotfreed =
+                    '<div class="LC_error">'.
+                    &mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '.
+
+                    &mt('As a result addition of items to the clipboard will be unavailable until your next log-in.');
+            } else {
+                $locknotfreed .=
+                    &mt('This will prevent addition of items to the clipboard until your next log-in.');
+            }
         } elsif ($type eq 'map') {
-            &mt('This will prevent creation of additional folders or composite pages in this course.');
+            $locknotfreed .=
+                &mt('This will prevent creation of additional folders or composite pages in this course.');
         } elsif ($type eq 'smppg') {
             $locknotfreed .=
                 &mt('This will prevent creation of additional simple pages in this course.');
@@ -4033,7 +4340,7 @@ sub devalidateversioncache {
 }
 
 sub checkversions {
-    my ($r) = @_;
+    my ($r,$canedit) = @_;
     my $crstype = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page("Check $crstype Resource Versions"));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Resource Versions"));
@@ -4054,51 +4361,53 @@ sub checkversions {
 
     $hashtied=0;
     &tiehash();
-    my %newsetversions=();
-    if ($env{'form.setmostrecent'}) {
-	$haschanged=1;
-	foreach my $key (keys(%hash)) {
-	    if ($key=~/^ids\_(\/res\/.+)$/) {
-		$newsetversions{$1}='mostrecent';
-                &devalidateversioncache($1);
+    if ($canedit) {
+        my %newsetversions=();
+        if ($env{'form.setmostrecent'}) {
+	    $haschanged=1;
+	    foreach my $key (keys(%hash)) {
+	        if ($key=~/^ids\_(\/res\/.+)$/) {
+		    $newsetversions{$1}='mostrecent';
+                    &devalidateversioncache($1);
+	        }
 	    }
-	}
-    } elsif ($env{'form.setcurrent'}) {
-	$haschanged=1;
-	foreach my $key (keys(%hash)) {
-	    if ($key=~/^ids\_(\/res\/.+)$/) {
-		my $getvers=&Apache::lonnet::getversion($1);
-		if ($getvers>0) {
-		    $newsetversions{$1}=$getvers;
-		    &devalidateversioncache($1);
-		}
+        } elsif ($env{'form.setcurrent'}) {
+	    $haschanged=1;
+	    foreach my $key (keys(%hash)) {
+	        if ($key=~/^ids\_(\/res\/.+)$/) {
+		    my $getvers=&Apache::lonnet::getversion($1);
+		    if ($getvers>0) {
+		        $newsetversions{$1}=$getvers;
+		        &devalidateversioncache($1);
+		    }
+	        }
 	    }
-	}
-    } elsif ($env{'form.setversions'}) {
-	$haschanged=1;
-	foreach my $key (keys(%env)) {
-	    if ($key=~/^form\.set_version_(.+)$/) {
-		my $src=$1;
-		if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
-		    $newsetversions{$src}=$env{$key};
-		    &devalidateversioncache($src);
-		}
+        } elsif ($env{'form.setversions'}) {
+	    $haschanged=1;
+	    foreach my $key (keys(%env)) {
+	        if ($key=~/^form\.set_version_(.+)$/) {
+		    my $src=$1;
+		    if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
+		        $newsetversions{$src}=$env{$key};
+		        &devalidateversioncache($src);
+		    }
+	        }
 	    }
-	}
-    }
-    if ($haschanged) {
-        if (&Apache::lonnet::put('resourceversions',\%newsetversions,
-			  $env{'course.'.$env{'request.course.id'}.'.domain'},
-			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
-	    $r->print(&Apache::loncommon::confirmwrapper(
-                &Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved'))));
-	} else {
-	    $r->print(&Apache::loncommon::confirmwrapper(
-                &Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1)));
-	}
-	&mark_hash_old();
+        }
+        if ($haschanged) {
+            if (&Apache::lonnet::put('resourceversions',\%newsetversions,
+			      $env{'course.'.$env{'request.course.id'}.'.domain'},
+			      $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
+	        $r->print(&Apache::loncommon::confirmwrapper(
+                    &Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved'))));
+	    } else {
+	        $r->print(&Apache::loncommon::confirmwrapper(
+                    &Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1)));
+	    }
+	    &mark_hash_old();
+        }
+        &changewarning($r,'');
     }
-    &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
 	$header=&mt('All content in '.$crstype);
@@ -4165,6 +4474,11 @@ sub checkversions {
 	       'save' => 'Save changes',
                'vers' => 'Version choice(s) for specific resources', 
 	       'act' => 'Actions');
+    my ($disabled,$readonly);
+    unless ($canedit) {
+        $disabled = 'disabled="disabled"';
+        $readonly = 1;
+    }
     $r->print(<<ENDHEADERS);
 <h4 class="LC_info">$header</h4>
 <form action="/adm/coursedocs" method="post">
@@ -4185,8 +4499,8 @@ sub checkversions {
 <div class="LC_left_float">
 <fieldset>
 <legend>$lt{'act'}</legend>
-$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" /><br />
-$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" />
+$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" $disabled /><br />
+$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" $disabled />
 </fieldset>
 </div>
 <br clear="all" />
@@ -4215,7 +4529,7 @@ ENDHEADERS
         return;
     }
     $r->print(
-        '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'.
+        '<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'.
         &Apache::loncommon::start_data_table().
         &Apache::loncommon::start_data_table_header_row().
         '<th>'.&mt('Resources').'</th>'.
@@ -4260,7 +4574,7 @@ ENDHEADERS
                       {'select_form_order' => ['',1..$currentversion,'mostrecent'],
                        '' => '',
                        'mostrecent' => &mt('most recent'),
-                       map {$_,$_} (1..$currentversion)}));
+                       map {$_,$_} (1..$currentversion)},'',$readonly));
             my $lastold=1;
             for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
                 my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -4294,7 +4608,7 @@ ENDHEADERS
     }
     $r->print(
         &Apache::loncommon::end_data_table().
-        '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'.
+        '<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'.
         '</form>'
     );
 
@@ -4460,19 +4774,24 @@ sub handler {
     $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
  
-    my $allowed;
+    my ($allowed,$canedit,$canview,$disabled);
 # URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
     unless ($r->uri eq '/adm/supplemental') {
         # does this user have privileges to modify content.  
-        $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+            $allowed = 1;
+            $canedit = 1;
+            $canview = 1;
+        } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) {
+            $allowed = 1;
+            $canview = 1;
+        }
     }
-
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chooseserver',
-                                            'inhibitmenu']);
-  if ($allowed && $env{'form.chooseserver'}) {
-      &choose_dump_server($r);
-      return OK;
-  } elsif ($allowed && $env{'form.verify'}) {
+    unless ($canedit) {
+        $disabled = ' disabled="disabled"';
+    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
+  if ($allowed && $env{'form.verify'}) {
       &init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
       &verifycontent($r);
   } elsif ($allowed && $env{'form.listsymbs'}) {
@@ -4484,11 +4803,11 @@ sub handler {
       if ($folder eq '') {
           $folder='default';
       }
-      &docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath);
+      &docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit);
   } elsif ($allowed && $env{'form.versions'}) {
       &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions');
-      &checkversions($r);
-  } elsif ($allowed && $env{'form.dumpcourse'}) {
+      &checkversions($r,$canedit);
+  } elsif ($canedit && $env{'form.dumpcourse'}) {
       &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
@@ -4533,13 +4852,15 @@ sub handler {
     my $container;
     my $containertag;
     my $pathitem;
+    my $hiddentop;
+    my $navmap;
+    my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) };
 
 # Do we directly jump somewhere?
-
    if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) {
        if ($env{'form.symb'} ne '') {
            $env{'form.folderpath'}=
-               &Apache::loncommon::symb_to_docspath($env{'form.symb'});
+               &Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap);
            &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} =>
                $env{'form.command'}.'_'.$env{'form.symb'}});
        } elsif ($env{'form.supppath'} ne '') {
@@ -4548,12 +4869,10 @@ sub handler {
                $env{'form.command'}.'_'.$env{'form.supppath'}});
        }
    } elsif ($env{'form.command'} eq 'editdocs') {
-       $env{'form.folderpath'} = 'default&'.
-                                 &escape(&mt('Main Content').':::::');
+       $env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap);
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
    } elsif ($env{'form.command'} eq 'editsupp') {
-       $env{'form.folderpath'} = 'supplemental&'.
-                                  &escape('Supplemental Content');
+       $env{'form.folderpath'} = &supplemental_base();
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'});
    } elsif ($env{'form.command'} eq 'contents') {
        &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'});
@@ -4572,7 +4891,14 @@ sub handler {
     if ((!$env{'form.folderpath'}) && $allowed) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
                                           {'folderpath' => 'scalar'});
-        unless (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) {
+
+        if (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) {
+            if ($supplementalflag) {
+                undef($env{'form.folderpath'}) if ($1 eq 'default');
+            } else {
+                undef($env{'form.folderpath'}) if ($1 eq 'supplemental');
+            }
+        } else {
             undef($env{'form.folderpath'});
         }
     }
@@ -4589,19 +4915,48 @@ sub handler {
                                   .'&'.
                                   $env{'form.folderpath'};
     }
+# If allowed and user's role is not advanced check folderpath is not hidden
+    if (($allowed) && (!$env{'request.role.adv'}) &&
+        ($env{'form.folderpath'} ne '') && (!$supplementalflag)) {
+        my $folderurl;
+        my @pathitems = split(/\&/,$env{'form.folderpath'});
+        my $folder = $pathitems[-2];
+        if ($folder eq '') {
+            undef($env{'form.folderpath'});
+        } else {
+            $folderurl = "uploaded/$coursedom/$coursenum/$folder";
+            if ((split(/\:/,$pathitems[-1]))[4]) {
+                $folderurl .= '.page';
+            } else {
+                $folderurl .= '.sequence';
+            }
+            unless (ref($navmap)) {
+                $navmap = Apache::lonnavmaps::navmap->new();
+            }
+            if (ref($navmap)) {
+                if (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') {
+                    my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1);
+                    unless (@resources) {
+                        undef($env{'form.folderpath'});
+                    }
+                }
+            }
+        }
+    }
+
+
 # If after all of this, we still don't have any paths, make them
     unless ($env{'form.folderpath'}) {
        if ($supplementalflag) {
           $env{'form.folderpath'}=&supplemental_base();
-       } else {
-          $env{'form.folderpath'}='default&'.&escape(&mt('Main Content').
-                                  ':::::');
+       } elsif ($allowed) {
+          ($env{'form.folderpath'},$hiddentop) = &default_folderpath($coursenum,$coursedom,\$navmap);
        }
     }
 
 # Store this
     unless ($toolsflag) {
-        if ($allowed) {
+        if (($allowed) && ($env{'form.folderpath'} ne '')) {
             &Apache::loncommon::store_course_settings($stored_folderpath,
                                                       {'folderpath' => 'scalar'});
         }
@@ -4619,8 +4974,12 @@ sub handler {
         } else {
             if ($env{'form.folder'} eq '' ||
                 $env{'form.folder'} eq 'supplemental') {
-                $folderpath='default&'.
-                            &escape(&mt('Main Content').':::::');
+                if ($env{'form.folder'} eq 'supplemental') {
+                    $folderpath=&supplemental_base();
+                } elsif (!$hiddentop) {
+                    $folderpath='default&'.
+                                 &escape(&mt('Main Content').':::::');
+                }
             }
         }
         $containertag = '<input type="hidden" name="folderpath" value="" />';
@@ -4631,7 +4990,7 @@ sub handler {
         if ($showdoc) { # got called in sequence from course
 	    $allowed=0; 
         } else {
-            if ($allowed) {
+            if ($canedit) {
                 &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
                 $script=&Apache::lonratedt::editscript('simple');
             }
@@ -4670,7 +5029,8 @@ sub handler {
                 }
             }
             my $tabidstr = join("','",@tabids);
-	    $script .= &editing_js($udom,$uname,$supplementalflag).
+	    $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,
+                                   $canedit,\$navmap).
                        &history_tab_js().
                        &inject_data_js().
                        &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
@@ -4699,34 +5059,52 @@ sub handler {
         $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
                                                 {'force_register' => $showdoc,}));
     } elsif ($toolsflag) {
+        my ($breadtext,$breadtitle);
+        $breadtext = "$crstype Editor";
+        if ($canedit) {
+            $breadtitle = 'Editing '.$crstype.' Contents';
+        } else {
+            $breadtext .= ' (View-only mode)';
+            $breadtitle = 'Viewing '.$crstype.' Contents';
+        }
         &Apache::lonhtmlcommon::add_breadcrumb({
-            href=>"/adm/coursedocs",text=>"$crstype Contents"});
+            href=>"/adm/coursedocs",text=>$breadtext});
         $r->print(&Apache::loncommon::start_page("$crstype Contents", $script)
                  .&Apache::loncommon::help_open_menu('','',273,'RAT')
                  .&Apache::lonhtmlcommon::breadcrumbs(
-                     'Editing Course Contents')
+                     $breadtitle)
                  );
     } elsif ($r->uri eq '/adm/supplemental') {
         my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
         $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef,
                                                 {'bread_crumbs' => $brcrum,}));
     } else {
+        my ($breadtext,$breadtitle,$helpitem);
+        $breadtext = "$crstype Editor";
+        if ($canedit) {
+            $breadtitle = 'Editing '.$crstype.' Contents';
+            $helpitem = 'Docs_Adding_Course_Doc';
+        } else {
+            $breadtext .= ' (View-only mode)';
+            $breadtitle = 'Viewing '.$crstype.' Contents';
+            $helpitem = 'Docs_Viewing_Course_Doc';
+        }
         &Apache::lonhtmlcommon::add_breadcrumb({
-            href=>"/adm/coursedocs",text=>"$crstype Contents"});
+            href=>"/adm/coursedocs",text=>$breadtext});
         $r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
                                                  {'add_entries'    => $addentries}
                                                 )
                  .&Apache::loncommon::help_open_menu('','',273,'RAT')
                  .&Apache::lonhtmlcommon::breadcrumbs(
-                     'Editing '.$crstype.' Contents',
-                     'Docs_Adding_Course_Doc')
+                     $breadtitle,
+                     $helpitem)
         );
     }
 
   my %allfiles = ();
   my %codebase = ();
   my ($upload_result,$upload_output,$uploadphase);
-  if ($allowed) {
+  if ($canedit) {
       if (($env{'form.uploaddoc.filename'}) &&
 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
           my $context = $1; 
@@ -4734,6 +5112,7 @@ sub handler {
 	  undef($hadchanges);
           $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
                                               \%allfiles,\%codebase,$context,$crstype);
+          undef($navmap);
 	  if ($hadchanges) {
 	      &mark_hash_old();
 	  }
@@ -4778,7 +5157,7 @@ sub handler {
 
   if ($allowed && $toolsflag) {
       $r->print(&startContentScreen('tools'));
-      $r->print(&generate_admin_menu($crstype));
+      $r->print(&generate_admin_menu($crstype,$canedit));
       $r->print(&endContentScreen());
   } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
@@ -4814,11 +5193,48 @@ sub handler {
                 'title' => 'Title',
                 'comment' => 'Comment',
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
-					  );
+                'bb5'      => 'Blackboard 5',
+                'bb6'      => 'Blackboard 6',
+                'angel5'   => 'ANGEL 5.5',
+                'webctce4' => 'WebCT 4 Campus Edition',
+                'er' => 'Editing rights unavailable for your current role.',
+        );
 # -----------------------------------------------------------------------------
+    # Calculate free quota space for a user or course.
+    my $quotatype = 'unofficial';
+    if ($crstype eq 'Community') {
+        $quotatype = 'community';
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
+        $quotatype = 'official';
+    } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
+        $quotatype = 'textbook';
+    }
+    my $disk_quota = &Apache::loncommon::get_user_quota($coursenum,$coursedom,
+                     'course',$quotatype); # expressed in MB
+    my $current_disk_usage = 0;
+    foreach my $subdir ('docs','supplemental') {
+        $current_disk_usage += &Apache::lonnet::diskusage($coursedom,$coursenum,
+                               "userfiles/$subdir",1); # expressed in kB
+    }
+    my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
+    my $usage = $current_disk_usage/1024; # in MB
+    my $quota = $disk_quota;
+    my $percent;
+    if ($disk_quota == 0) {
+        $percent = 100.0;
+    } else {
+        $percent = 100*($usage/$disk_quota);
+    }
+    $usage = sprintf("%.2f",$usage);
+    $quota = sprintf("%.2f",$quota);
+    $percent = sprintf("%.0f",$percent);
+    my $quotainfo = '<p>'.&mt('Currently using [_1] of the [_2] available.',
+                              $percent.'%',$quota.' MB').'</p>';
+
 	my $fileupload=(<<FIUP);
+        $quotainfo
 	$lt{'file'}:<br />
-	<input type="file" name="uploaddoc" size="40" />
+	<input type="file" name="uploaddoc" size="40" $disabled />
 FIUP
 
 	my $checkbox=(<<CHBO);
@@ -4826,7 +5242,7 @@ FIUP
 	<input type="checkbox" name="parserflag" />
 	</label> -->
 	<label>
-	<input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'}
+	<input type="checkbox" name="parserflag" checked="checked" $disabled /> $lt{'parse'}
 	</label>
 CHBO
         my $imsfolder = $env{'form.folder'};
@@ -4843,17 +5259,17 @@ CHBO
         <br />
         <p>
         $lt{'cms'}:&nbsp; 
-        <select name="source">
+        <select name="source" $disabled>
         <option value="-1" selected="selected">$lt{'se'}</option>
-        <option value="bb5">Blackboard 5</option>
-        <option value="bb6">Blackboard 6</option>
-        <option value="angel5">ANGEL 5.5</option>
-        <option value="webctce4">WebCT 4 Campus Edition</option>
+        <option value="bb5">$lt{'bb5'}</option>
+        <option value="bb6">$lt{'bb6'}</option>
+        <option value="angel5">$lt{'angel5'}</option>
+        <option value="webctce4">$lt{'webctce4'}</option>
         </select>
         <input type="hidden" name="folder" value="$imsfolder" />
         </p>
         <input type="hidden" name="phase" value="one" />
-        <input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" />
+        <input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" $disabled />
         </fieldset>
         </form>
 IMSFORM
@@ -4868,7 +5284,7 @@ IMSFORM
 	$fileupload
 	<br />
 	$lt{'title'}:<br />
-	<input type="text" size="60" name="comment" />
+	<input type="text" size="60" name="comment" $disabled />
 	$pathitem
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
@@ -4876,11 +5292,17 @@ IMSFORM
 	$checkbox
 	</span>
         <br clear="all" />
-        <input type="submit" value="$lt{'upld'}" />
+        <input type="submit" value="$lt{'upld'}" $disabled />
         </fieldset>
         </form>
 FUFORM
 
+        my $mapimportjs;
+        if ($canedit) {
+            $mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');";
+        } else {
+            $mapimportjs = "javascript:alert('".&js_escape($lt{'er'})."');";
+        }
 	my $importpubform=(<<SEDFFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleMap('map');">
         $lt{'impm'}</a>$help{'Load_Map'}
@@ -4891,31 +5313,42 @@ FUFORM
         $lt{'copm'}<br />
         <span class="LC_nobreak">
         <input type="text" name="importmap" size="40" value="" 
-        onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />
-        &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a></span><br />
-        <input type="submit" name="loadmap" value="$lt{'load'}" />
+        onfocus="this.blur();$mapimportjs" $disabled />
+        &nbsp;<a href="$mapimportjs">$lt{'selm'}</a></span><br />
+        <input type="submit" name="loadmap" value="$lt{'load'}" $disabled />
         </fieldset>
         </form>
 
 SEDFFORM
+
+        my $fromstoredjs;
+        if ($canedit) {
+            $fromstoredjs = 'open_StoredLinks_Import()';
+        } else {
+            $fromstoredjs = "alert('".&js_escape($lt{'er'})."')";
+        }
+
 	my @importpubforma = (
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>' },
         { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }
 	);
 	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
         my $extresourcesform =
             &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Resource'});
+                                                 $help{'Adding_External_Resource'},
+                                                 undef,undef,$disabled);
     if ($allowed) {
         my $folder = $env{'form.folder'};
         if ($folder eq '') {
             $folder='default';
         }
-	my $output = &update_paste_buffer($coursenum,$coursedom,$folder);
-        if ($output) {
-            $r->print($output);
+        if ($canedit) {
+	    my $output = &update_paste_buffer($coursenum,$coursedom,$folder);
+            if ($output) {
+                $r->print($output);
+            }
         }
 	$r->print(<<HIDDENFORM);
 	<form name="renameform" method="post" action="/adm/coursedocs">
@@ -4952,7 +5385,7 @@ HIDDENFORM
 
     if ($allowed) {
        my $folder=$env{'form.folder'};
-       if ($folder eq '' || $supplementalflag) {
+       if ((($folder eq '') && (!$hiddentop)) || ($supplementalflag)) {
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
 	   $env{'form.folderpath'}='default&'.&escape(&mt('Main Content'));
@@ -4980,7 +5413,7 @@ HIDDENFORM
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
-	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newnav);">$lt{'navc'}</a>
 	$help{'Navigate_Content'}
 	</form>
 NNFORM
@@ -5041,7 +5474,7 @@ NBFORM
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newaboutme);">$lt{'mypi'}</a>
 	$help{'My Personal Information Page'}
 	</form>
 NAMFORM
@@ -5061,7 +5494,7 @@ NASOFORM
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
-	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newroster);">$lt{'rost'}</a>
 	$help{'Course_Roster'}
 	</form>
 NROSTFORM
@@ -5124,7 +5557,7 @@ NFFORM
 	$pathitem
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
-	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newsyl);">$lt{'syll'}</a>
 	$help{'Syllabus'}
 
 	</form>
@@ -5136,14 +5569,14 @@ NSYLFORM
 	$pathitem
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
-	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.newgroupfiles);">$lt{'grpo'}</a>
 	$help{'Group Portfolio'}
 	</form>
 NGFFORM
 	@specialdocumentsforma=(
 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'"  onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
-	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.newsyl);" />'=>$newsylform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="javascript:makenew(document.newnav);" />'=>$newnavform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},
         );
@@ -5175,8 +5608,8 @@ NGFFORM
        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="javascript:makenew(document.newroster);" />'=>$newrosterform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="javascript:makenew(document.newgroupfiles);" />'=>$newgroupfileform},
         );
         $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
@@ -5194,12 +5627,16 @@ unless ($container eq 'page') {
  $hadchanges=0;
        unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                              $supplementalflag,\%orderhash,$iconpath,$pathitem);
+                              $supplementalflag,\%orderhash,$iconpath,$pathitem,
+                              $canedit,\$navmap,$hiddentop);
+          undef($navmap);
           if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }
           if ($hadchanges) {
-             &mark_hash_old();
+             unless (&is_hash_old()) {
+                 &mark_hash_old();
+             }
           }
 
           &changewarning($r,'');
@@ -5259,7 +5696,8 @@ SNFFORM
 	
         my $supextform =
             &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
-                                                 $help{'Adding_External_Resource'});
+                                                 $help{'Adding_External_Resource'},
+                                                 undef,undef,$disabled);
 
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
@@ -5267,7 +5705,7 @@ SNFFORM
         $pathitem
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.supnewsyl);">$lt{'syll'}</a>
 	$help{'Syllabus'}
 	</form>
 SNSFORM
@@ -5278,7 +5716,7 @@ SNSFORM
         $pathitem
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
+	<a class="LC_menubuttons_link" href="javascript:makenew(document.supnewaboutme);">$lt{'mypi'}</a>
 	$help{'My Personal Information Page'}
 	</form>
 SNAMFORM
@@ -5305,9 +5743,9 @@ SWEBFORM
 
 
 my @specialdocs = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.supnewsyl);" />'
             =>$supnewsylform},
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makenew(document.supnewaboutme);" />'
             =>$supnewaboutmeform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform},
 
@@ -5327,7 +5765,8 @@ my %suporderhash = (
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-                               $supplementalflag,\%suporderhash,$iconpath,$pathitem);
+                               $supplementalflag,\%suporderhash,$iconpath,$pathitem,
+                               $canedit);
            if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
            } else {
@@ -5421,7 +5860,7 @@ sub decompression_info {
     my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $container='sequence';
     my ($pathitem,$hiddenelem);
-    my @hiddens = ('newidx','comment','position','folderpath');
+    my @hiddens = ('newidx','comment','position','folderpath','archiveurl');
     if ($env{'form.folderpath'} =~ /\:1$/) {
         $container='page';
     }
@@ -5429,7 +5868,7 @@ sub decompression_info {
     foreach my $item (@hiddens) {
         if ($env{'form.'.$item}) {
             $hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.
-                           $env{'form.'.$item}.'" />'."\n";
+                           &HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n";
         }
     }
     return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,
@@ -5486,25 +5925,34 @@ sub remove_archive {
         } else {
             $delwarning = &mt('An error occurred retrieving the contents of the current folder.');
         }
-        $delwarning .= &mt('As a result the archive file has not been removed.');
+        $delwarning .= ' '.&mt('As a result the archive file has not been removed.');
     } else {
         my $currcmd = $env{'form.cmd'};
         my $position = $env{'form.position'};
-        if ($position > 0) { 
-            $env{'form.cmd'} = 'remove_'.$position;
-            my ($title,$url,@rrest) = 
-                split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]);
-            if (&handle_edit_cmd($docuname,$docudom)) {
-                ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
-                if ($fatal) {
-                    if ($container eq 'page') {
-                        $delwarning = &mt('An error occurred updating the contents of the current page.');
+        my $archiveidx = $position;
+        if ($position > 0) {
+            if (($env{'form.autoextract_camtasia'}) && (scalar(@LONCAPA::map::order) == 2)) {
+                $archiveidx = $position-1;
+            }
+            $env{'form.cmd'} = 'remove_'.$archiveidx;
+            my ($title,$url,@rrest) =
+                split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$archiveidx]]);
+            if ($url eq $env{'form.archiveurl'}) {
+                if (&handle_edit_cmd($docuname,$docudom)) {
+                    ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
+                    if ($fatal) {
+                        if ($container eq 'page') {
+                            $delwarning = &mt('An error occurred updating the contents of the current page.');
+                        } else {
+                            $delwarning = &mt('An error occurred updating the contents of the current folder.');
+                        }
                     } else {
-                        $delwarning = &mt('An error occurred updating the contents of the current folder.');
+                        $delresult = &mt('Archive file removed.');
                     }
-                } else {
-                    $delresult = &mt('Archive file removed.');
                 }
+            } else {
+                $delwarning .=  &mt('Archive file had unexpected item number in folder.').
+                                ' '.&mt('As a result the archive file has not been removed.');
             }
         }
         $env{'form.cmd'} = $currcmd;
@@ -5523,7 +5971,7 @@ sub remove_archive {
 }
 
 sub generate_admin_menu {
-    my ($crstype) = @_;
+    my ($crstype,$canedit) = @_;
     my $lc_crstype = lc($crstype);
     my ($home,$other,%outhash)=&authorhosts();
     my %lt= ( # do not translate here
@@ -5581,7 +6029,9 @@ sub generate_admin_menu {
                     linktitle  => "List the unique identifier used for each resource instance in your $lc_crstype"
                 },
                 ]
-        },
+        });
+    if ($canedit) {
+        push(@menu,
         {   categorytitle=>'Export',
             items =>[
                 {   linktext   => $lt{'imse'},
@@ -5600,6 +6050,7 @@ sub generate_admin_menu {
                 },
                 ]
         });
+    }
     return '<form action="/adm/coursedocs" method="post" name="courseverify">'."\n".
            '<input type="hidden" id="dummy" />'."\n".
            &Apache::lonhtmlcommon::generate_menu(@menu)."\n".
@@ -5608,15 +6059,16 @@ sub generate_admin_menu {
 
 sub generate_edit_table {
     my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto,$readfile,
-        $need_save,$copyfolder) = @_;
+        $need_save,$copyfolder,$canedit) = @_;
     return unless(ref($orderhash_ref) eq 'HASH');
     my %orderhash = %{$orderhash_ref};
-    my $form;
-    my $activetab;
-    my $active;
+    my ($form, $activetab, $active, $disabled);
     if (($env{'form.active'} ne '') && ($env{'form.active'} ne '00')) {
         $activetab = $env{'form.active'};
     }
+    unless ($canedit) {
+        $disabled = ' disabled="disabled"';
+    }
     my $backicon = $iconpath.'clickhere.gif';
     my $backtext = &mt('Exit Editor');
     $form = '<div class="LC_Box" style="margin:0;">'.
@@ -5680,7 +6132,7 @@ sub generate_edit_table {
 <input type="hidden" name="multicopy" value="" />
 <input type="hidden" name="multichange" value="" />
 <input type="hidden" name="copyfolder" value="$copyfolder" />
-<input type="submit" name="savemultiples" value="$button" />
+<input type="submit" name="savemultiples" value="$button" $disabled />
 </form>
 </div>
 END
@@ -5706,8 +6158,8 @@ END
 }
 
 sub editing_js {
-    my ($udom,$uname,$supplementalflag) = @_;
-    my %lt = &Apache::lonlocal::texthash(
+    my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$canedit,$navmapref) = @_;
+    my %js_lt = &Apache::lonlocal::texthash(
                                           p_mnf => 'Name of New Folder',
                                           t_mnf => 'New Folder',
                                           p_mnp => 'Name of New Page',
@@ -5724,16 +6176,18 @@ sub editing_js {
                                           p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
                                           p_chn => 'New Title',
                                           p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
-                                          p_rmr2a => 'Remove[_99]',
-                                          p_rmr2b => '?[_99]',
-                                          p_rmr3a => 'Remove those [_2]',
-                                          p_rmr3b => 'items?[_2]',
+                                          p_rmr2a => 'Remove',
+                                          p_rmr2b => '?',
+                                          p_rmr3a => 'Remove those',
+                                          p_rmr3b => 'items?',
+                                          p_rmr4  => 'WARNING: Removing a resource uploaded to a course cannot be undone via "Undo Delete".',
+                                          p_rmr5  => 'Push "Cancel" and then use "Cut" instead if you might need to undo this change.',
                                           p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
                                           p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
-                                          p_ctr2a => 'Cut[_98]',
-                                          p_ctr2b => '?[_98]',
-                                          p_ctr3a => 'Cut those[_2]',
-                                          p_ctr3b => 'items?[_2]',
+                                          p_ctr2a => 'Cut',
+                                          p_ctr2b => '?',
+                                          p_ctr3a => 'Cut those',
+                                          p_ctr3b => 'items?',
                                           rpck    => 'Enter number to pick (e.g., 3)',
                                           imsfile => 'You must choose an IMS package for import',
                                           imscms  => 'You must select which Course Management System was the source of the IMS package',
@@ -5744,19 +6198,20 @@ sub editing_js {
                                           noor    => 'No actions selected or changes to settings specified.',
                                           noch    => 'No changes to settings specified.',
                                           noac    => 'No actions selected.',
+                                          edri    => 'Editing rights unavailable for your current role.',
                                         );
 
+    &js_escape(\%js_lt);
     my $crstype = &Apache::loncommon::course_type();
     my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
     my $main_container_page;
     if (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) {
         $main_container_page = 1;
     }
-    my $toplevelmain = 
-        &escape(&mt('Main Content').':::::');
+    my $backtourl;
+    my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref));
     my $toplevelsupp = &supplemental_base();
 
-    my $backtourl;
     if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) {
         my $caller = $1;
         if ($caller =~ /^supplemental/) {
@@ -5765,8 +6220,22 @@ sub editing_js {
             my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller);
             $res = &Apache::lonnet::clutter($res);
             if (&Apache::lonnet::is_on_map($res)) {
-                $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='.
+                my ($url,$anchor);
+                if ($res =~ /^([^#]+)#([^#]+)$/) {
+                    $url = $1;
+                    $anchor = $2;
+                    if (($caller =~ m{^([^#]+)\Q#$anchor\E$})) {
+                        $caller = $1.&escape('#').$anchor;
+                    }
+                } else {
+                    $url = $res;
+                }
+                $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='.
                              &HTML::Entities::encode($caller,'<>&"');
+                if ($anchor ne '') {
+                    $backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');
+                }
+                $backtourl = &Apache::loncommon::escape_single($backtourl); 
             } else {
                 $backtourl = '/adm/navmaps';
             }
@@ -5787,9 +6256,11 @@ sub editing_js {
         $fieldsets = "'suppext','suppdoc'";
     }
 
-    return <<ENDNEWSCRIPT;
+    my $jsmakefunctions;
+    if ($canedit) {
+        $jsmakefunctions = <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
-    var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
+    var foldername=prompt('$js_lt{"p_mnf"}','$js_lt{"t_mnf"}');
     if (foldername) {
        targetform.importdetail.value=escape(foldername)+"="+folderseq;
         targetform.submit();
@@ -5797,7 +6268,7 @@ function makenewfolder(targetform,folder
 }
 
 function makenewpage(targetform,folderseq) {
-    var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
+    var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}');
     if (pagename) {
         targetform.importdetail.value=escape(pagename)+"="+folderseq;
         targetform.submit();
@@ -5805,7 +6276,7 @@ function makenewpage(targetform,folderse
 }
 
 function makeexamupload() {
-   var title=prompt('$lt{"p_mxu"}');
+   var title=prompt('$js_lt{"p_mxu"}');
    if (title) {
     this.document.forms.newexamupload.importdetail.value=
 	escape(title)+'=/res/lib/templates/examupload.problem';
@@ -5814,7 +6285,7 @@ function makeexamupload() {
 }
 
 function makesmppage() {
-   var title=prompt('$lt{"p_msp"}');
+   var title=prompt('$js_lt{"p_msp"}');
    if (title) {
     this.document.forms.newsmppg.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/new/smppg';
@@ -5823,7 +6294,7 @@ function makesmppage() {
 }
 
 function makewebpage(type) {
-   var title=prompt('$lt{"p_mwp"}');
+   var title=prompt('$js_lt{"p_mwp"}');
    var formname;
    if (type == 'supp') {
        formname = this.document.forms.supwebpage;
@@ -5838,7 +6309,7 @@ function makewebpage(type) {
 }
 
 function makesmpproblem() {
-   var title=prompt('$lt{"p_msb"}');
+   var title=prompt('$js_lt{"p_msb"}');
    if (title) {
     this.document.forms.newsmpproblem.importdetail.value=
 	escape(title)+'=/res/lib/templates/simpleproblem.problem';
@@ -5847,7 +6318,7 @@ function makesmpproblem() {
 }
 
 function makedropbox() {
-   var title=prompt('$lt{"p_mdb"}');
+   var title=prompt('$js_lt{"p_mdb"}');
    if (title) {
     this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';
@@ -5856,7 +6327,7 @@ function makedropbox() {
 }
 
 function makebulboard() {
-   var title=prompt('$lt{"p_mbb"}');
+   var title=prompt('$js_lt{"p_mbb"}');
    if (title) {
     this.document.forms.newbul.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/new/bulletinboard';
@@ -5865,24 +6336,109 @@ function makebulboard() {
 }
 
 function makeabout() {
-   var user=prompt("$lt{'p_mab'}");
+   var user=prompt("$js_lt{'p_mab'}");
    if (user) {
        var comp=new Array();
        comp=user.split(':');
        if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
 	   if ((comp[0]) && (comp[1])) {
 	       this.document.forms.newaboutsomeone.importdetail.value=
-		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
-       this.document.forms.newaboutsomeone.submit();
-   } else {
-       alert("$lt{'p_mab_alrt1'}");
-   }
-} else {
-   alert("$lt{'p_mab_alrt2'}");
+		   '$js_lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+               this.document.forms.newaboutsomeone.submit();
+           } else {
+               alert("$js_lt{'p_mab_alrt1'}");
+           }
+       } else {
+           alert("$js_lt{'p_mab_alrt2'}");
+       }
+    }
+}
+
+function makenew(targetform) {
+    targetform.submit();
+}
+
+function changename(folderpath,index,oldtitle) {
+    var title=prompt('$js_lt{"p_chn"}',oldtitle);
+    if (title) {
+        this.document.forms.renameform.markcopy.value='';
+        this.document.forms.renameform.title.value=title;
+        this.document.forms.renameform.cmd.value='rename_'+index;
+        this.document.forms.renameform.folderpath.value=folderpath;
+        this.document.forms.renameform.submit();
+    }
+}
+
+ENDNEWSCRIPT
+    } else {
+        $jsmakefunctions = <<ENDNEWSCRIPT;
+
+function makenewfolder() {
+    alert("$js_lt{'edri'}");
+}
+
+function makenewpage() {
+    alert("$js_lt{'edri'}");
+}
+
+function makeexamupload() {
+    alert("$js_lt{'edri'}");
+}
+
+function makesmppage() {
+    alert("$js_lt{'edri'}");
+}
+
+function makewebpage(type) {
+    alert("$js_lt{'edri'}");
+}
+
+function makesmpproblem() {
+    alert("$js_lt{'edri'}");
+}
+
+function makedropbox() {
+    alert("$js_lt{'edri'}");
+}
+
+function makebulboard() {
+    alert("$js_lt{'edri'}");
+}
+
+function makeabout() {
+    alert("$js_lt{'edri'}");
 }
+
+function changename() {
+    alert("$js_lt{'edri'}");
 }
+
+function makenew() {
+    alert("$js_lt{'edri'}");
+}
+
+function groupimport() {
+    alert("$js_lt{'edri'}");
+}
+
+function groupsearch() {
+    alert("$js_lt{'edri'}");
+}
+
+function groupopen(url,recover) {
+   var options="scrollbars=1,resizable=1,menubar=0";
+   idxflag=1;
+   idx=open("/adm/groupsort?inhibitmenu=yes&mode=simple&recover="+recover+"&readfile="+url,"idxout",options);
+   idx.focus();
 }
 
+ENDNEWSCRIPT
+
+    }
+    return <<ENDSCRIPT;
+
+$jsmakefunctions
+
 function toggleUpload(caller) {
     var blocks = Array($fieldsets);
     for (var i=0; i<blocks.length; i++) {
@@ -5916,28 +6472,17 @@ function toggleMap(caller) {
 
 function makeims(imsform) {
     if ((imsform.uploaddoc.value == '')  || (!imsform.uploaddoc.value)) {
-        alert("$lt{'imsfile'}");
+        alert("$js_lt{'imsfile'}");
         return;
     }
     if (imsform.source.selectedIndex == 0) {
-        alert("$lt{'imscms'}");
+        alert("$js_lt{'imscms'}");
         return;
     }
     newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");
     imsform.submit();
 }
 
-function changename(folderpath,index,oldtitle) {
-var title=prompt('$lt{"p_chn"}',oldtitle);
-if (title) {
-this.document.forms.renameform.markcopy.value='';
-this.document.forms.renameform.title.value=title;
-this.document.forms.renameform.cmd.value='rename_'+index;
-this.document.forms.renameform.folderpath.value=folderpath;
-this.document.forms.renameform.submit();
-}
-}
-
 function updatePick(targetform,index,caller) {
     var pickitem;
     var picknumitem;
@@ -5952,7 +6497,7 @@ function updatePick(targetform,index,cal
         picknumtext = document.getElementById('randompicknum_'+index);
     }
     if (pickitem.checked) {
-        var picknum=prompt('$lt{"rpck"}',picknumitem.value);
+        var picknum=prompt('$js_lt{"rpck"}',picknumitem.value);
         if (picknum == '' || picknum == null) {
             if (caller == 'check') {
                 pickitem.checked=false;
@@ -6102,7 +6647,12 @@ function propagateState(form,param) {
     return;
 }
 
-function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder) {
+function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder,confirm_removal) {
+    var canedit = '$canedit';
+    if (canedit == '') {
+        alert("$js_lt{'edri'}");
+        return;
+    }
     var dosettings;
     var doaction;
     var control = document.togglemultsettings;
@@ -6140,14 +6690,28 @@ function checkForSubmit(targetform,param
             targetform.markcopy.value=idx+':'+param;
             targetform.copyfolder.value=folder+'.'+container;
             if (param == 'remove') {
-                if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+                var doremove = 0;
+                if (skip_confirm) {
+                    if (confirm_removal) {
+                        if (confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'"$js_lt{"p_rmr2b"}')) {
+                            doremove = 1;
+                        }
+                    } else {
+                        doremove = 1;
+                    }
+                } else {
+                    if (confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) {
+                        doremove = 1;
+                    }
+                }
+                if (doremove) {
                     targetform.markcopy.value='';
                     targetform.copyfolder.value='';
                     targetform.submit();
                 }
             }
             if (param == 'cut') {
-                if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
+                if (skip_confirm || confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr2a"} "'+oldtitle+'" $js_lt{"p_ctr2b"}')) {
                     targetform.submit();
                     return;
                 }
@@ -6326,7 +6890,7 @@ function togglePick(caller,value) {
         }
         document.getElementById('multi'+caller).style.display=disp;
         if (value == 1) {
-            document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>'; 
+            document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>'; 
         } else {
             document.getElementById('more'+caller).innerHTML = '';
         }
@@ -6352,10 +6916,10 @@ function togglePick(caller,value) {
 
 function toggleCheckUncheck(caller,more) {
     if (more == 1) {
-        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$lt{'less'}</a>';
+        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$js_lt{'less'}</a>';
         document.getElementById('allfields'+caller).style.display='block';
     } else {
-        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>';
+        document.getElementById('more'+caller).innerHTML = '&nbsp;&nbsp;<a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>';
         document.getElementById('allfields'+caller).style.display='none';
     }
     resize_scrollbox('contentscroll','1','1');
@@ -6397,6 +6961,7 @@ function checkSubmits() {
     var doactions = multiActions();
     var cutwarnings = 0;
     var remwarnings = 0;
+    var removalinfo = 0;
     if (doactions == 1) {
         var remidxlist = document.cumulativeactions.allremoveidx.value;
         if ((remidxlist != '') && (remidxlist != null)) {
@@ -6411,6 +6976,11 @@ function checkSubmits() {
                                 remwarnings ++;
                             }
                         }
+                        if (document.getElementById('confirm_removal_'+remidxs[i])) {
+                            if (document.getElementById('confirm_removal_'+remidxs[i]).value == 1) {
+                                removalinfo ++;
+                            }
+                        }
                     }
                 }
             }
@@ -6509,14 +7079,19 @@ function checkSubmits() {
     }
     if (doactions == 1) {
         if (numchanges > 0) {
-            if ((cutwarnings > 0) || (remwarnings > 0)) {
+            if ((cutwarnings > 0) || (remwarnings > 0) || (removalinfo > 0)) {
                 if (remwarnings > 0) {
-                    if (!confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr3a"} '+remwarnings+' $lt{"p_rmr3b"}')) {
+                    if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) {
+                        return false;
+                    }
+                }
+                if (removalinfo > 0) {
+                    if (!confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr3a"} '+removalinfo+' $js_lt{"p_rmr3b"}')) {
                         return false;
                     }
                 }
                 if (cutwarnings > 0) {
-                    if (!confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr3a"} '+cutwarnings+' $lt{"p_ctr3b"}')) {
+                    if (!confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr3a"} '+cutwarnings+' $js_lt{"p_ctr3b"}')) {
                         return false;
                     }
                 }
@@ -6532,12 +7107,12 @@ function checkSubmits() {
         }
     }
     if ((dosettings == 1) && (doactions == 1)) {
-        alert("$lt{'noor'}");
+        alert("$js_lt{'noor'}");
     } else {
         if (dosettings == 1) {
-            alert("$lt{'noch'}");
+            alert("$js_lt{'noch'}");
         } else {
-            alert("$lt{'noac'}");
+            alert("$js_lt{'noac'}");
         }
     }
     return false;
@@ -6623,7 +7198,7 @@ function setBoxes(value) {
     return;
 }
 
-ENDNEWSCRIPT
+ENDSCRIPT
 }
 
 sub history_tab_js {
@@ -6652,13 +7227,19 @@ ENDINJECT
 
 sub dump_switchserver_js {
     my @hosts = @_;
-    my %lt = &Apache::lonlocal::texthash(
-        dump => 'Copying Content to Authoring Space requires switching server.',
+    my %js_lt = &Apache::lonlocal::texthash(
+        dump => 'Copying content to Authoring Space requires switching server.',
+        swit => 'Switch server?',
+    );
+    my %html_js_lt = &Apache::lonlocal::texthash(
         swit => 'Switch server?',
         duco => 'Copying Content to Authoring Space',
         yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
         chos => 'Choose server',
     );
+    &js_escape(\%js_lt);
+    &html_escape(\%html_js_lt);
+    &js_escape(\%html_js_lt);
     my $role = $env{'request.role'};
     my $js = <<"ENDSWJS";
 <script type="text/javascript">
@@ -6699,7 +7280,7 @@ ENDSWJS
 
 function dump_needs_switchserver(url) {
     if (url!='' && url!= null) {
-        if (confirm("$lt{'dump'}\\n$lt{'swit'}")) {
+        if (confirm("$js_lt{'dump'}\\n$js_lt{'swit'}")) {
             go(url);
         }
     }
@@ -6710,13 +7291,13 @@ function choose_switchserver_window() {
     newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes')
     newWindow.document.open();
     newWindow.document.writeln('$startpage');
-    newWindow.document.write('<h3>$lt{'duco'}<\\/h3>\\n'+
-       '<p>$lt{'yone'}<\\/p>\\n'+
-       '<div class="LC_left_float"><fieldset><legend>$lt{'chos'}<\\/legend>\\n'+
+    newWindow.document.write('<h3>$html_js_lt{'duco'}<\\/h3>\\n'+
+       '<p>$html_js_lt{'yone'}<\\/p>\\n'+
+       '<div class="LC_left_float"><fieldset><legend>$html_js_lt{'chos'}<\\/legend>\\n'+
        '<form name="setserver" method="post" action="" \\/>\\n'+
        '$hostpicker\\n'+
        '<br \\/><br \\/>\\n'+
-       '<input type="button" name="makeswitch" value="$lt{'swit'}" '+
+       '<input type="button" name="makeswitch" value="$html_js_lt{'swit'}" '+
        'onclick="write_switchserver();" \\/>\\n'+
        '<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n');
     newWindow.document.writeln('$endpage');