--- loncom/interface/lonmenu.pm	2012/11/08 18:37:44	1.390
+++ loncom/interface/lonmenu.pm	2013/06/26 04:25:41	1.416
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.390 2012/11/08 18:37:44 raeburn Exp $
+# $Id: lonmenu.pm,v 1.416 2013/06/26 04:25:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,10 +106,11 @@ secondary_menu().
 
 =item primary_menu()
 
-This routine evaluates @primary_menu and returns XHTML for the menu
-that contains following links: About, Message, Roles, Help, Logout
+This routine evaluates @primary_menu and returns a two item array, 
+with the array elements containing XHTML for the left and right sides of 
+the menu that contains the following links: About, Message, Roles, Help, Logout 
 @primary_menu is filled within the BEGIN block of this module with 
-entries from mydesk.tab 
+entries from mydesk.tab
 
 =item secondary_menu()
 
@@ -203,15 +204,16 @@ sub prep_menuitem {
            . qq| href="$$menuitem[0]" target="_top">$link</a></li>|;
 }
 
-# primary_menu() evaluates @primary_menu and returns XHTML for the menu
-# that contains following links:
-# About, Message, Personal, Roles, Help, Logout
+# primary_menu() evaluates @primary_menu and returns a two item array,
+# with the array elements containing XHTML for the left and right sides of 
+# the menu that contains the following links:
+# Personal, About, Message, Roles, Help, Logout
 # @primary_menu is filled within the BEGIN block of this module with 
 # entries from mydesk.tab
 sub primary_menu {
-    my $menu;
+    my (%menu);
     # each element of @primary contains following array:
-    # (link url, icon path, alt text, link text, condition)
+    # (link url, icon path, alt text, link text, condition, position)
     my $public;
     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
         || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
@@ -236,6 +238,10 @@ sub primary_menu {
                 && !&Apache::loncommon::show_course(); ##
         
         my $title = $menuitem->[3];
+        my $position = $menuitem->[5];
+        if ($position eq '') {
+            $position = 'right';
+        }
         if (defined($primary_submenu{$title})) {
             my ($link,$target);
             if ($menuitem->[0] ne '') {
@@ -248,7 +254,6 @@ sub primary_menu {
             if (ref($primary_submenu{$title}) eq 'ARRAY') {
                 foreach my $item (@{$primary_submenu{$title}}) {
                     next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'}));
-                    next if (($item->[2] eq 'reqcrs') && (!&check_for_rcrs()));
                     next if ((($item->[2] eq 'portfolio') ||
                              ($item->[2] eq 'blog')) &&
                              (!&Apache::lonnet::usertools_access('','',$item->[2],
@@ -256,9 +261,9 @@ sub primary_menu {
                     push(@primsub,$item);
                 }
                 if (@primsub > 0) {
-                    $menu .= &create_submenu($link,$target,$title,\@primsub);
+                    $menu{$position} .= &create_submenu($link,$target,$title,\@primsub);
                 } elsif ($link) {
-                    $menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
+                    $menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
                 }
             }
         } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
@@ -269,19 +274,17 @@ sub primary_menu {
                                                                   'helpdeskmail',
                                                                   $defdom,$origmail);
                 if ($to ne '') {
-                    $menu .= &prep_menuitem($menuitem); 
+                    $menu{$position} .= &prep_menuitem($menuitem); 
                 }
             } else {
-                $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
+                $menu{$position} .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
             }
         } else {
-            $menu .= prep_menuitem($menuitem);
+            $menu{$position} .= prep_menuitem($menuitem);
         }
     }
-    $menu =~ s/\[domain\]/$env{'user.domain'}/g;
-    $menu =~ s/\[user\]/$env{'user.name'}/g;
-
-    return "<ol class=\"LC_primary_menu LC_right\">$menu</ol>";
+    return ("<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>",
+            "<ol class=\"LC_primary_menu LC_floatright LC_right\">$menu{'right'}</ol>");
 }
 
 #returns hashref {user=>'',dom=>''} containing:
@@ -326,16 +329,49 @@ sub secondary_menu {
     my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec); 
     my $author        = &getauthor();
 
+    my ($cdom,$cnum,$showsyllabus,$showfeeds);
+    if ($env{'request.course.id'}) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        if ($canedit) {
+            $showsyllabus = 1;
+            $showfeeds = 1;
+        } else {
+            unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {
+                if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) ||
+                    ($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) ||
+                    ($env{'course.'.$env{'request.course.id'}.'.updatedsyllabus'}) ||
+                    ($env{'request.course.syllabustime'})) {
+                    $showsyllabus = 1;
+                }
+            }
+            if ($env{'request.course.feeds'}) {
+                $showfeeds = 1;
+            }
+        }
+    }
+
+    my ($canmodifycoauthor); 
+    if ($env{'request.role'} eq "au./$env{'user.domain'}/") {
+        my $extent = "$env{'user.domain'}/$env{'user.name'}";
+        if ((&Apache::lonnet::allowed('cca',$extent)) ||
+            (&Apache::lonnet::allowed('caa',$extent))) {
+            $canmodifycoauthor = 1;
+        }
+    }
+
     my %groups = &Apache::lonnet::get_active_groups(
                      $env{'user.domain'}, $env{'user.name'},
                      $env{'course.' . $env{'request.course.id'} . '.domain'},
                      $env{'course.' . $env{'request.course.id'} . '.num'});
 
+    my ($roleswitcher_js,$roleswitcher_form);
+
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)  ne 'ARRAY';
         next if    $$menuitem[4]   ne 'always'
-                && $$menuitem[4]   ne 'author'
+                && ($$menuitem[4]   ne 'author' && $$menuitem[4] ne 'cca')
                 && !$env{'request.course.id'};
         next if    $$menuitem[4]   =~ /^mdc/
                 && !$canedit;
@@ -358,18 +394,35 @@ sub secondary_menu {
         next if    $$menuitem[4]   =~ /showgroups$/
                 && !$canviewgrps
                 && !%groups;
+        next if    $$menuitem[4]   eq 'showsyllabus'
+                && !$showsyllabus;
+        next if    $$menuitem[4]   eq 'showfeeds'
+                && !$showfeeds;
         next if    $$menuitem[4]    eq 'author'
                 && !$author;
+        next if    $$menuitem[4]    eq 'cca'
+                && !$canmodifycoauthor;
 
         if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
             # special treatment for role selector
-            my $roles_selector = &roles_selector(
+            ($roleswitcher_js,$roleswitcher_form,my $switcher) =
+                &roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
-                        $env{'course.' . $env{'request.course.id'} . '.num'}  );
-
-            $menu .= $roles_selector ? "<li>$roles_selector</li>"
-                                     : '';
+                        $env{'course.' . $env{'request.course.id'} . '.num'}
+                );
+            $menu .= $switcher;
         } else {
+            if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) {
+                my $url = $$menuitem[0];
+                $url =~ s{\[cdom\]/\[cnum\]}{$cdom/$cnum};
+                if (&Apache::lonnet::is_on_map($url)) {
+                    unless ($$menuitem[0] =~ /\?register=1/) {
+                        $$menuitem[0] .= '?register=1';
+                    }
+                } else {
+                    $$menuitem[0] =~ s{\?register=1}{};
+                }
+            }
             $menu .= &prep_menuitem(\@$menuitem);
         }
     }
@@ -393,9 +446,16 @@ sub secondary_menu {
     }
     $menu =~ s/\[uname\]/$$author{user}/g;
     $menu =~ s/\[udom\]/$$author{dom}/g;
+    if ($showsyllabus || $showfeeds) {
+        $menu =~ s/\[cnum\]/$cnum/g;
+        $menu =~ s/\[cdom\]/$cdom/g;
+    }
     if ($menu) {
         $menu = "<ul id=\"LC_secondary_menu\">$menu</ul>";
     }
+    if ($roleswitcher_form) {
+        $menu .= "\n$roleswitcher_js\n$roleswitcher_form";
+    }
     return $menu;
 }
 
@@ -406,9 +466,19 @@ sub create_submenu {
     if ($target ne '') {
         $disptarget = ' target="'.$target.'"';
     }
+    my $name;
+    if ($title eq 'Personal') {
+        if ($env{'user.name'} && $env{'user.domain'}) {
+            $name = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+        } else {
+            $name = &mt($title);
+        }
+    } else {
+        $name = &mt($title);
+    }
     my $menu = '<li class="LC_hoverable">'.
                '<a href="'.$link.'"'.$disptarget.'>'.
-               '<span class="LC_nobreak">'.&mt($title).
+               '<span class="LC_nobreak">'.$name.
                '<span class="LC_fontsize_small" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.
                '<ul>';
@@ -417,12 +487,18 @@ sub create_submenu {
     foreach my $item (@{$submenu}) {
         $count ++;
         if (ref($item) eq 'ARRAY') {
+            my $href = $item->[0];
+            if ($href =~ /(aboutme|rss\.html)$/) {
+                next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
+                $href =~ s/\[domain\]/$env{'user.domain'}/g;
+                $href =~ s/\[user\]/$env{'user.name'}/g;
+            }
             my $borderbot;
             if ($count == $numsub) {
                 $borderbot = 'border-bottom:1px solid black;';
             }
             $menu .= '<li style="margin:0;padding:0;'.
-                     $borderbot.'"><a href="'.$item->[0].'">'.
+                     $borderbot.'"><a href="'.$href.'">'.
                      &mt($item->[1]).'</a></li>';
         }
     }
@@ -441,43 +517,78 @@ sub innerregister {
 
     undef(@inlineremote);
 
-    my $resurl;
+    my ($mapurl,$resurl);
 
-    if ($env{'request.course.id'} && $env{'request.symb'} eq '') {
-        $resurl = $env{'request.noversionuri'};
-    }
- 
-    if ( $env{'request.symb'} && $env{'request.course.id'} ) {
-
-        (my $mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
-        my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};
+    if ($env{'request.course.id'}) {
+        if ($env{'request.symb'}) {
+            ($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
+            my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};
 
-        my $maptitle = &Apache::lonnet::gettitle($mapurl);
-        my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
+            my $maptitle = &Apache::lonnet::gettitle($mapurl);
+            my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
 
 #SD
 #course_type only Course and Community?
 #
-        my @crumbs;
-        unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps')
-                && ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
-            @crumbs = ({text  => Apache::loncommon::course_type() 
-                                . ' Contents', 
-                        href  => "Javascript:gopost('/adm/navmaps','')"});
-        }
-        if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
-            push(@crumbs, {text  => '...',
-                           no_mt => 1});
-        }
-
-        push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle 
-                                                   && $maptitle ne 'default.sequence' 
-                                                   && $maptitle ne $coursetitle);
-
-        push @crumbs, {text => $restitle, no_mt => 1} if $restitle; 
-
-        &Apache::lonhtmlcommon::clear_breadcrumbs();
-        &Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
+            my @crumbs;
+            unless (($forcereg) &&
+                    ($env{'request.noversionuri'} eq '/adm/navmaps') &&
+                    ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
+                @crumbs = ({text  => Apache::loncommon::course_type() 
+                                    . ' Contents', 
+                            href  => "Javascript:gopost('/adm/navmaps','')"});
+            }
+            if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
+                push(@crumbs, {text  => '...',
+                               no_mt => 1});
+            }
+
+            push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle 
+                                                       && $maptitle ne 'default.sequence' 
+                                                       && $maptitle ne $coursetitle);
+
+            push @crumbs, {text => $restitle, no_mt => 1} if $restitle; 
+            &Apache::lonhtmlcommon::clear_breadcrumbs();
+            &Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
+        } else {
+            $resurl = $env{'request.noversionuri'};
+            my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});
+            my $crstype = &Apache::loncommon::course_type();
+            my $title = &mt('View Resource');
+            if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default|\d+)/}) {
+                &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']);
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                if ($env{'form.title'}) {
+                    $title = $env{'form.title'};
+                }
+                my $trail;
+                if ($env{'form.folderpath'}) {
+                    &prepare_functions($resurl,$forcereg,$group,undef,undef,1);
+                    ($trail) =
+                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                } else {
+                    &Apache::lonhtmlcommon::add_breadcrumb(
+                    {text  => "Supplemental $crstype Content",
+                     href  => "javascript:gopost('/adm/supplemental','')"});
+                    $title = &mt('View Resource');
+                    ($trail) = 
+                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                }
+                return $trail;
+            } elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) {
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                &prepare_functions('/public'.$courseurl."/syllabus",
+                                   $forcereg,$group,undef,undef,1);
+                $title = &mt('Syllabus File');
+                my ($trail) =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                return $trail;
+            }
+            unless ($env{'request.state'} eq 'construct') {
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
+            }
+        }
     } elsif (! $const_space){
         #a situation when we're looking at a resource outside of context of a 
         #course or construction space (e.g. with cumulative rights)
@@ -492,19 +603,12 @@ sub innerregister {
                        || $forcereg );
     my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit,
         $forceview,$editbutton);
-    if ($env{'request.noversionuri'} =~ m{^/adm/($match_domain)/($match_username)/aboutme$}) {
-        ($cfile,$home,$switchserver,$forceedit,$forceview) =
-            &Apache::lonnet::can_edit_resource($env{'request.noversionuri'},$cnum,$cdom,
-                &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
-        if (($cfile) && ($home ne '') && ($home ne 'no_host')) {
-            $editbutton = &get_editbutton($cfile,$home,$switchserver,
-                                          $forceedit,$forceview,$forcereg);
-        }
-    } elsif ($env{'request.role'} !~/^(aa|ca|au)/) {
+    if (($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) ||
+        ($env{'request.role'} !~/^(aa|ca|au)/)) {
         $editbutton = &prepare_functions($resurl,$forcereg,$group);
     }
     if ($editbutton eq '') {
-        &clear(6,1);
+        $editbutton = &clear(6,1);
     }
 
 #
@@ -548,13 +652,19 @@ sub innerregister {
                     "gocmd('/adm/parmset','set')",
                     'Content Settings');
 	}
-# End grades/submissions check 
+# End grades/submissions check
 
 #
-# This applies to items inside a folder/page modifiable in the course. 
+# This applies to items inside a folder/page modifiable in the course.
 #
         if (($env{'request.symb'}=~/^uploaded/) && ($perms{'mdc'})) {
-            &switch('','',7,4,'docs-22x22.png','Folder/Page Content','parms[_2]',
+            my $text = 'Edit Folder';
+            if (($mapurl =~ /\.page$/) ||
+                ($env{'request.symb'}=~
+                     m{uploaded/$cdom/$cnum/default_\d+\.page$}))  {
+                $text = 'Edit Page';
+            }
+            &switch('','',7,4,'docs-22x22.png',$text,'parms[_2]',
                     "gocmd('/adm/coursedocs','direct')",
                     'Folder/Page Content');
         }
@@ -727,9 +837,24 @@ ENDMENUITEMS
 
 sub get_editbutton {
     my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_;
-    my $jscall = 
-        &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
-                                                $forceedit,$forcereg,$env{'request.symb'});
+    my $jscall;
+    if (($forceview) && ($env{'form.todocs'})) {
+        my ($folderpath,$command);
+        if ($env{'request.symb'}) {
+            $folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'});
+        } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
+            $folderpath = $env{'form.folderpath'};
+            $command = '&forcesupplement=1';
+        }
+        $folderpath = &escape(&HTML::Entities::encode(&escape($folderpath),'<>&"'));
+        $jscall = "go('/adm/coursedocs?folderpath=$folderpath$command')";
+    } else {
+        $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
+                                                $forceedit,$forcereg,$env{'request.symb'},
+                                                &escape($env{'form.folderpath'}),
+                                                &escape($env{'form.title'}),$env{'form.idx'},
+                                                &escape($env{'form.suppurl'},$env{'form.todocs'}));
+    }
     if ($jscall) {
         my $icon = 'pcstr.png';
         my $label = 'Edit';
@@ -745,7 +870,7 @@ sub get_editbutton {
 }
 
 sub prepare_functions {
-    my ($resurl,$forcereg,$group,$bread_crumbs,$advtools) = @_;
+    my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs) = @_;
     unless ($env{'request.registered'}) {
         undef(@inlineremote);
     }
@@ -763,19 +888,15 @@ sub prepare_functions {
 # Determine whether or not to display 'Edit' icon/button
 #
     if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
-#
-# This applies to a user's own about me page
-#
-        my ($sdom,$sname) = ($1,$2);
         my $file=&Apache::lonnet::declutter($env{'request.filename'});
-        if (($sdom eq $env{'user.domain'}) && ($sname eq $env{'user.name'})) {
-            ($cfile,$home,$switchserver,$forceedit,$forceview) =
-                &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
-                    &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
-            $editbutton = &get_editbutton($cfile,$env{'user.home'},$switchserver,
+        ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
+                &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
+        if (($cfile) && ($home ne '') && ($home ne 'no_host')) {
+            $editbutton = &get_editbutton($cfile,$home,$switchserver,
                                           $forceedit,$forceview,$forcereg);
         }
-    } elsif ((!$editbutton) && (!$env{'request.course.id'}) &&
+    } elsif ((!$env{'request.course.id'}) &&
              ($env{'user.author'}) && ($env{'request.filename'}) &&
              ($env{'request.role'} !~/^(aa|ca|au)/)) {
 #
@@ -786,7 +907,6 @@ sub prepare_functions {
         ($cfile,$home,$switchserver,$forceedit,$forceview) =
             &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
                 &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
-        # Turn the button on or off
         if (($cfile) && ($home ne '') && ($home ne 'no_host')) {
             $editbutton = &get_editbutton($cfile,$home,$switchserver,
                                           $forceedit,$forceview,$forcereg);
@@ -795,25 +915,37 @@ sub prepare_functions {
 #
 # This applies in course context
 #
-        if (($resurl eq "/public/$cdom/$cnum/syllabus") && ($perms{'mdc'})) {
-            if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) {
-                &switch('','',6,1,'pcstr.png','Edit',
-                        'resource[_2]',
-                        "go('/adm/courseprefs?phase=display&actions=courseinfo')",
-                        'Edit this resource');
-                $editbutton = 1;
+        if (($perms{'mdc'}) &&
+            (($resurl eq "/public/$cdom/$cnum/syllabus") ||
+            ($resurl =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}))) {
+            $cfile = $resurl;
+            $home = &Apache::lonnet::homeserver($cnum,$cdom);
+            if ($env{'form.forceedit'}) {
+                $forceview = 1;
             } else {
-                $cfile = $resurl;
-                $home = &Apache::lonnet::homeserver($cnum,$cdom);
-                if ($env{'form.forceedit'}) {
-                    $forceview = 1;
-                } else {
-                    $forceedit = 1;
-                }
+                $forceedit = 1;
+            }
+            $editbutton = &get_editbutton($cfile,$home,$switchserver,
+                                          $forceedit,$forceview,$forcereg);
+        } elsif (($resurl eq '/adm/extresedit') &&
+                 (($env{'form.symb'}) || ($env{'form.folderpath'}))) {
+            ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl,
+                                               $env{'form.symb'});
+            if ($cfile ne '') {
                 $editbutton = &get_editbutton($cfile,$home,$switchserver,
-                                              $forceedit,$forceview,$forcereg);
+                                              $forceedit,$forceview,$forcereg,
+                                              $env{'form.title'},$env{'form.suppurl'});
             }
-        } elsif ($resurl !~ m{^adm/($match_domain)/($match_username)/aboutme$}) {
+        } elsif (($resurl =~ m{^/?adm/viewclasslist$}) &&
+                 (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
+            ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl,
+                                               $env{'form.symb'});
+            $editbutton = &get_editbutton($cfile,$home,$switchserver,
+                                          $forceedit,$forceview,$forcereg);
+        } elsif (($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) &&
+                 ($resurl ne '/cgi-bin/printout.pl')) {
             if ($env{'request.filename'}) {
                 my $file=&Apache::lonnet::declutter($env{'request.filename'});
                 ($cfile,$home,$switchserver,$forceedit,$forceview) =
@@ -828,17 +960,19 @@ sub prepare_functions {
     }
 # End determination of 'Edit' icon/button display
 
-# This applies to about me page for users in a course
     if ($env{'request.course.id'}) {
-        if ($resurl =~ m{^adm/($match_domain)/($match_username)/aboutme$}) {
+# This applies to about me page for users in a course
+        if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
             my ($sdom,$sname) = ($1,$2);
             unless (&Apache::lonnet::is_course($sdom,$sname)) {
                 &switch('','',6,4,'mail-message-new-22x22.png','Message to user',
                         '',
-                        "go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')",
+                        "go('/adm/email?compose=individual&amp;recname=$sname&amp;recdom=$sdom')",
                             'Send message to specific user');
             }
-            if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum)) {
+            my $hideprivileged = 1;
+            if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef,
+                                           $hideprivileged)) {
                 foreach my $priv ('vsa','vgr','srm') {
                     $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
                     if (!$perms{$priv} && $env{'request.course.sec'} ne '') {
@@ -855,22 +989,40 @@ sub prepare_functions {
                 if ($perms{'vgr'}) {
                     &switch('','',6,6,'rsrv-22x22.png','Reservations',
                             '',
-                            "go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')",
+                            "go('/adm/slotrequest?command=showresv&amp;origin=aboutme&amp;uname=$sname&amp;udom=$sdom')",
                             'Slot reservation history');
                 }
                 if ($perms{'srm'}) {
                     &switch('','',6,7,'contact-new-22x22.png','Records',
                             '',
-                            "go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')",
+                            "go('/adm/email?recordftf=retrieve&amp;recname=$sname&amp;recdom=$sdom')",
                             'Add records');
                 }
             }
         }
+        if (($env{'form.folderpath'} =~ /^supplemental/) &&
+            (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
+            (($resurl =~ m{^/adm/wrapper/ext/}) ||
+             ($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) ||
+             ($resurl eq '/adm/supplemental') ||
+             ($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) ||
+             ($resurl =~ m{^/adm/$match_domain/$match_username/aboutme$}))) {
+            my @folders=split('&',$env{'form.folderpath'});
+            if ((@folders > 2) || ($resurl ne '/adm/supplemental')) {
+                my $esc_path=&escape(&HTML::Entities::encode(&escape($env{'form.folderpath'}),'<>&"'));
+                &switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]',
+                        "location.href='/adm/coursedocs?command=direct&amp;forcesupplement=1&amp;supppath=$esc_path'",
+                        'Folder/Page Content');
+            }
+        }
     }
 
 # End checking for items for about me page for users in a course
- 
-    if ($env{'request.registered'}) {
+    if ($docscrumbs) {
+        &Apache::lonhtmlcommon::clear_breadcrumb_tools();
+        &advtools_crumbs(@inlineremote);
+        return $editbutton;
+    } elsif ($env{'request.registered'}) {
         return $editbutton;
     } else {
         if (ref($bread_crumbs) eq 'ARRAY') {
@@ -898,7 +1050,11 @@ sub advtools_crumbs {
     } elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
         &Apache::lonhtmlcommon::add_breadcrumb_tool(
             'advtools', @funcs[61,71,72,73,74,92]);
+    } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {
+        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+            'advtools', $funcs[61]);
     }
+    return;
 }
 
 # ================================================================== Raw Config
@@ -1492,7 +1648,7 @@ sub roles_selector {
     my $now = time;
     my (%courseroles,%seccount,%courseprivs);
     my $is_cc;
-    my $role_selector;
+    my ($js,$form,$switcher,$switchtext);
     my $ccrole;
     if ($crstype eq 'Community') {
         $ccrole = 'co';
@@ -1580,42 +1736,66 @@ sub roles_selector {
             }
         }
     }
-    my $switchtext;
-    if ($crstype eq 'Community') {
-        $switchtext = &mt('Switch community role to...')
-    } else {
-        $switchtext = &mt('Switch course role to...')
-    }
+    $switchtext = &mt('Switch role');
     my @roles_order = ($ccrole,'in','ta','ep','ad','st');
-    if (keys(%courseroles) > 1) {
-        $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);
-        $role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
-                          <select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';
-        $role_selector .= '<option value="">'.$switchtext.'</option>';
+    my $numdiffsec;
+    if (keys(%seccount) == 1) {
+        foreach my $key (keys(%seccount)) {
+            $numdiffsec = $seccount{$key};
+        }
+    }
+    if ((keys(%seccount) > 1) || ($numdiffsec > 1)) {
+        my @submenu;
+        $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);
+        $form = 
+            '<form name="rolechooser" method="post" action="/adm/roles">'."\n".
+            '  <input type="hidden" name="destinationurl" value="'.
+            &HTML::Entities::encode($destinationurl).'" />'."\n".
+            '  <input type="hidden" name="gotorole" value="1" />'."\n".
+            '  <input type="hidden" name="selectrole" value="" />'."\n".
+            '  <input type="hidden" name="switchrole" value="" />'."\n";
+        if ($destsymb ne '') {
+            $form .= '  <input type="hidden" name="destsymb" value="'.
+                        &HTML::Entities::encode($destsymb).'" />'."\n";
+        }
+        $form .= '</form>'."\n";
         foreach my $role (@roles_order) {
+            my $include;
             if (defined($courseroles{$role})) {
-                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>'; 
+                if ($env{'request.role'} =~ m{^\Q$role\E}) {
+                    if ($seccount{$role} > 1) {
+                        $include = 1;
+                    }
+                } else {
+                    $include = 1;
+                }
+            }
+            if ($include) {
+                push(@submenu,['javascript:adhocRole('."'$role'".')',
+                               &Apache::lonnet::plaintext($role,$crstype)]);
             }
         }
         foreach my $role (sort(keys(%courseroles))) {
             if ($role =~ /^cr/) {
-                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; 
+                my $include;
+                if ($env{'request.role'} =~ m{^\Q$role\E}) {
+                    if ($seccount{$role} > 1) {
+                        $include = 1;
+                    }
+                } else {
+                    $include = 1; 
+                }
+                if ($include) {
+                    push(@submenu,['javascript:adhocRole('."'$role'".')',
+                                   &Apache::lonnet::plaintext($role)]);
+                }
             }
         }
-        $role_selector .= '</select>'."\n";
-        if ($destsymb ne '') {
-            $role_selector .= '<input type="hidden" name="destsymb" value="'.
-                              &HTML::Entities::encode($destsymb).'" />'."\n";
+        if (@submenu > 0) {
+            $switcher = &create_submenu('','',$switchtext,\@submenu);
         }
-        $role_selector .=
-               '<input type="hidden" name="destinationurl" value="'.
-               &HTML::Entities::encode($destinationurl).'" />'."\n".
-               '<input type="hidden" name="gotorole" value="1" />'."\n".
-               '<input type="hidden" name="selectrole" value="" />'."\n".
-               '<input type="hidden" name="switch" value="1" />'."\n".
-               '</form>';
     }
-    return $role_selector;
+    return ($js,$form,$switcher);
 }
 
 sub get_all_courseroles {
@@ -1678,6 +1858,7 @@ sub get_all_courseroles {
         push(@{$courseroles->{'st'}},keys(%sections_count));
         $seccount->{'st'} = scalar(keys(%sections_count));
     }
+    $seccount->{'st'} ++; # Increment for a section-less student role.  
     my $rolehash = {
                      'roles'    => $courseroles,
                      'seccount' => $seccount,
@@ -1754,9 +1935,8 @@ sub jump_to_role {
     return <<"END";
 <script type="text/javascript">
 //<![CDATA[
-function adhocRole(roleitem) {
+function adhocRole(newrole) {
     $js
-    var newrole =  document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value;
     if (newrole == '') {
         return;
     } 
@@ -1773,7 +1953,6 @@ function adhocRole(roleitem) {
                 if (confirm("$lt{'role'}\\n$lt{'swit'}")) {
                     document.rolechooser.destinationurl.value = '/adm/menu';
                 } else {
-                    document.rolechooser.elements[roleitem].selectedIndex = 0;
                     return;
                 }
             }
@@ -1809,21 +1988,19 @@ function adhocRole(roleitem) {
             fullrole += '/'+secchoice;
         }
     } else {
-        document.rolechooser.elements[roleitem].selectedIndex = 0;
         if (secchoice != null) {
             alert("$lt{'youe'} \\""+secchoice+"\\".\\n $lt{'plst'}");
         }
         return;
     }
     if (fullrole == "$env{'request.role'}") {
-        document.rolechooser.elements[roleitem].selectedIndex = 0;
         return;
     }
     itemid = retrieveIndex('gotorole');
     if (itemid != -1) {
         document.rolechooser.elements[itemid].name = fullrole;
     }
-    document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value = fullrole;
+    document.rolechooser.switchrole.value = fullrole;
     document.rolechooser.selectrole.value = '1';
     document.rolechooser.submit();
     return;
@@ -1886,7 +2063,6 @@ sub countdown_timer {
         }
         my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
         my @interval=&Apache::lonnet::EXT("resource.0.interval");
-        my $hastimeleft;
         if (@interval > 1) {
             my $first_access=&Apache::lonnet::get_first_access($interval[1]);
             if ($first_access > 0) {
@@ -1944,14 +2120,14 @@ BEGIN {
                         $category_positions{$entries[2]}=$entries[1];
                         $category_names{$entries[2]}=$entries[3];
                     } elsif ($configline=~/^prim\:/) {
-                        my @entries = (split(/\:/, $configline))[1..5];
-                        push @primary_menu, \@entries;
+                        my @entries = (split(/\:/, $configline))[1..6];
+                        push(@primary_menu,\@entries);
                     } elsif ($configline=~/^primsub\:/) {
                         my ($parent,@entries) = (split(/\:/, $configline))[1..4];
-                        push (@{$primary_submenu{$parent}},\@entries);
+                        push(@{$primary_submenu{$parent}},\@entries);
                     } elsif ($configline=~/^scnd\:/) {
                         my @entries = (split(/\:/, $configline))[1..5];
-                        push @secondary_menu, \@entries; 
+                        push(@secondary_menu,\@entries);
                     } elsif ($configline) {
                         push(@desklines,$configline);
                     }