--- loncom/interface/lonmenu.pm	2012/12/06 21:43:27	1.397
+++ loncom/interface/lonmenu.pm	2013/08/13 11:26:38	1.419
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.397 2012/12/06 21:43:27 raeburn Exp $
+# $Id: lonmenu.pm,v 1.419 2013/08/13 11:26:38 bisitz 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,1);
                 } 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:
@@ -318,6 +321,9 @@ sub secondary_menu {
                                                : '');
     my $canedit       = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});
     my $canviewroster = $env{'course.'.$env{'request.course.id'}.'.student_classlist_view'};
+    if ($canviewroster eq 'disabled') {
+        undef($canviewroster);
+    }
     my $canviewgrps   = &Apache::lonnet::allowed('vcg', $crs_sec); 
     my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec); 
     my $canviewwnew   = &Apache::lonnet::allowed('whn', $crs_sec); 
@@ -326,16 +332,55 @@ sub secondary_menu {
     my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec); 
     my $author        = &getauthor();
 
+    my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv);
+    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;
+            }
+        }
+        unless ($canmgr) {
+            my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
+            if (keys(%slots) > 0) {
+                $showresv = 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;
@@ -349,8 +394,8 @@ sub secondary_menu {
                 && ($canmodifyuser || !$canviewroster);
         next if    $$menuitem[4]   eq 'mgr'
                 && !$canmgr;
-        next if    $$menuitem[4]   eq 'nmgr'
-                && $canmgr;
+        next if    $$menuitem[4]   eq 'showresv'
+                && !$showresv;
         next if    $$menuitem[4]   eq 'whn'
                 && !$canviewwnew;
         next if    $$menuitem[4]   eq 'opa'
@@ -358,18 +403,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,22 +455,39 @@ 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;
 }
 
 sub create_submenu {
-    my ($link,$target,$title,$submenu) = @_;
+    my ($link,$target,$title,$submenu,$translate) = @_;
     return unless (ref($submenu) eq 'ARRAY');
     my $disptarget;
     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,13 +496,24 @@ 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].'">'.
-                     &mt($item->[1]).'</a></li>';
+                     $borderbot.'"><a href="'.$href.'">';
+            if ($translate) {
+                $menu .= &mt($item->[1]);
+            } else {
+                $menu .= $item->[1];
+            }
+             $menu .= '</a></li>';
         }
     }
     $menu .= '</ul></li>';
@@ -487,8 +577,7 @@ sub innerregister {
                 }
                 my $trail;
                 if ($env{'form.folderpath'}) {
-                    my $editbutton =
-                        &prepare_functions($resurl,$forcereg,$group,undef,undef,1);
+                    &prepare_functions($resurl,$forcereg,$group,undef,undef,1);
                     ($trail) =
                         &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                 } else {
@@ -500,6 +589,14 @@ sub innerregister {
                         &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();
@@ -525,7 +622,7 @@ sub innerregister {
         $editbutton = &prepare_functions($resurl,$forcereg,$group);
     }
     if ($editbutton eq '') {
-        &clear(6,1);
+        $editbutton = &clear(6,1);
     }
 
 #
@@ -754,12 +851,24 @@ ENDMENUITEMS
 
 sub get_editbutton {
     my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_;
-    my $jscall = 
-        &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
+    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'}));
+                                                &escape($env{'form.suppurl'},$env{'form.todocs'}));
+    }
     if ($jscall) {
         my $icon = 'pcstr.png';
         my $label = 'Edit';
@@ -820,24 +929,18 @@ 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;
-                }
-                $editbutton = &get_editbutton($cfile,$home,$switchserver,
-                                              $forceedit,$forceview,$forcereg);
+                $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) =
@@ -848,7 +951,15 @@ sub prepare_functions {
                                               $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) =
@@ -870,7 +981,7 @@ sub prepare_functions {
             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');
             }
             my $hideprivileged = 1;
@@ -892,24 +1003,16 @@ 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');
                 }
             }
-        } elsif ($resurl =~ m{^/?adm/viewclasslist}) {
-# This applies to viewclasslist page for users in a course
-            if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
-                &switch('','',6,4,'pparm.png','Settings',
-                        '',
-                        "go('/adm/courseprefs?actions=classlists&phase=display')",
-                        'Student-viewable classlist options');
-            }
         }
         if (($env{'form.folderpath'} =~ /^supplemental/) &&
             (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
@@ -922,7 +1025,7 @@ sub prepare_functions {
             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&forcesupplement=1&supppath=$esc_path'",
+                        "location.href='/adm/coursedocs?command=direct&amp;forcesupplement=1&amp;supppath=$esc_path'",
                         'Folder/Page Content');
             }
         }
@@ -963,8 +1066,9 @@ sub advtools_crumbs {
             'advtools', @funcs[61,71,72,73,74,92]);
     } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {
         &Apache::lonhtmlcommon::add_breadcrumb_tool(
-            'advtools', @funcs[64]);
+            'advtools', $funcs[61]);
     }
+    return;
 }
 
 # ================================================================== Raw Config
@@ -1558,7 +1662,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';
@@ -1646,42 +1750,66 @@ sub roles_selector {
             }
         }
     }
-    my $switchtext;
-    if ($crstype eq 'Community') {
-        $switchtext = &mt('Switch community role to...')
-    } else {
-        $switchtext = &mt('Switch course role to...')
-    }
+    $switchtext = 'Switch role'; # do not translate here
     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 {
@@ -1744,6 +1872,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,
@@ -1820,9 +1949,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;
     } 
@@ -1839,7 +1967,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;
                 }
             }
@@ -1875,21 +2002,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;
@@ -1952,7 +2077,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) {
@@ -2010,14 +2134,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);
                     }