--- loncom/interface/lonmenu.pm	2007/09/11 23:37:58	1.227
+++ loncom/interface/lonmenu.pm	2010/01/18 21:35:55	1.244.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.227 2007/09/11 23:37:58 albertel Exp $
+# $Id: lonmenu.pm,v 1.244.2.12 2010/01/18 21:35:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,100 @@
 # browser.interface is 'textual'
 #
 
+=head1 NAME
+
+Apache::lonmenu
+
+=head1 SYNOPSIS
+
+Coordinates the response to clicking an image.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item show_course()
+
+Little texts
+
+=item initlittle()
+
+=item menubuttons()
+
+This gets called at the top of the body section
+
+=item show_return_link()
+
+=item registerurl()
+
+This gets called in the header section
+
+=item innerregister()
+
+This gets called in order to register a URL, both with the Remote
+and in the body of the document
+
+=item loadevents()
+
+=item unloadevents()
+
+=item startupremote()
+
+=item setflags()
+
+=item maincall()
+
+=item load_remote_msg()
+
+=item get_menu_name()
+
+=item reopenmenu()
+
+=item open()
+
+Open the menu
+
+=item clear()
+
+=item switch()
+
+Switch a button or create a link
+Switch acts on the javascript that is executed when a button is clicked.  
+The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)".
+
+=item secondlevel()
+
+=item openmenu()
+
+=item inlinemenu()
+
+=item rawconfig()
+
+=item close()
+
+=item footer()
+
+=item utilityfunctions()
+
+=item serverform()
+
+=item constspaceform()
+
+=item get_nav_status()
+
+=item hidden_button_check()
+
+=item roles_selector()
+
+=item jump_to_role()
+
+=back
+
+=cut
+
 package Apache::lonmenu;
 
 use strict;
@@ -45,6 +139,7 @@ use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
 
 use vars qw(@desklines %category_names %category_members %category_positions $readdesk);
 
@@ -53,25 +148,36 @@ my @inlineremote;
 
 
 
-# ================================================================ Little texts
+sub show_course {
+    my $course = !$env{'user.adv'};
+    if (!$env{'user.adv'}) {
+	foreach my $env (keys(%env)) {
+	    next if ($env !~ m/^user\.priv\./);
+	    if ($env !~ m/^user\.priv\.(?:st|cm)/) {
+		$course = 0;
+		last;
+	    }
+	}
+    }
+    return $course;
+}
 
 sub initlittle {
     return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
 				       'nav' => 'Navigate Contents',
 				       'main' => 'Main Menu',
-                                       'roles' => ($env{'user.adv'}?
-                                                    'Roles':'Courses'),
+                                       'roles' => (&Apache::loncommon::show_course()?
+                                                    'Courses':'Roles'),
+                                       'other' => 'Other Roles',
                                        'docs' => 'Edit Course',
-                                       'exit' => 'Exit',
+                                       'exit' => 'Logout',
                                        'login' => 'Log In',
 				       'launch' => 'Launch Remote Control',
                                        'groups' => 'Groups',
-                                       'gdoc' => 'Group Documents',
+                                       'gdoc' => 'Community Documents',
                                        );
 }
 
-# ============================= This gets called at the top of the body section
-
 sub menubuttons {
     my $forcereg=shift;
     my $registration=shift;
@@ -88,7 +194,10 @@ sub menubuttons {
     my $reloadlink='';
     my $docs='';
     my $groups='';
+    my $roles='<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>';
+    my $role_selector;
     my $showgroups=0;
+    my ($cnum,$cdom);
     my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
     my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
 
@@ -104,15 +213,21 @@ sub menubuttons {
         }
     }
     if ($env{'request.course.id'}) {
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my %coursegroups;
         my $viewgrps_permission =
 	    &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
         if (!$viewgrps_permission) {
-            %coursegroups = &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'});
+            %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$cdom,$cnum);
 	}
         if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) {
             $showgroups = 1;
         }
+        $role_selector = &roles_selector($cdom,$cnum);
+        if ($role_selector) {
+            $roles = '<span class="LC_nobreak">'.$role_selector.'&nbsp;&nbsp;<a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></span>';
+        }
     }
 
     if ($env{'browser.interface'} eq 'textual') {
@@ -121,17 +236,18 @@ sub menubuttons {
 	    $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&amp;postsymb=$escsymb" target="_top">$lt{'nav'}</a>
 ENDNAV
-            if (($env{'request.noversionuri'}=~/^\/adm\//) &&
-         ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+            if (&show_return_link()) {
                 my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
 ENDRELOAD
             }
-	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-               $docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
+            my $is_community =
+                (&Apache::loncommon::course_type() eq 'Community');
+            if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
+                $docs=(<<ENDDOCS);
+<a href="/adm/coursedocs" target="_top">$text</a>
 ENDDOCS
             }
             if ($showgroups) {
@@ -149,8 +265,7 @@ $utility
 </script>
 <div id="LC_top_nav">
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
-$reloadlink $navmaps $docs $groups
-<a href="/adm/roles" target="_top">$lt{'roles'}</a>
+$reloadlink $navmaps $docs $groups $roles
 <a href="/adm/logout" target="_top">$lt{'exit'}</a>
 </div>
 <br />
@@ -186,6 +301,7 @@ ENDMAINMENU
 </font>
 ENDINLINEMENU
         }
+        $roles = '<td><a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a></td>';
 # Do we have a NAV link?
         if ($env{'request.course.id'}) {
 	    my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
@@ -196,9 +312,10 @@ ENDINLINEMENU
 	    $navmaps=(<<ENDNAV);
 <td><a href="$link" target="_top">$lt{'nav'}</a></td>
 ENDNAV
-my $is_group = (&Apache::loncommon::course_type() eq 'Group');
+            my $is_community =
+                (&Apache::loncommon::course_type() eq 'Community');
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};
+                my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
 		$docs=(<<ENDDOCS);
 <td><a href="/adm/coursedocs" target="_top">$text</a></td>
 ENDDOCS
@@ -208,21 +325,15 @@ ENDDOCS
 <td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
 ENDGROUPS
             }
-	    if (
-		($env{'request.noversionuri'}=~m[^/(res|public)/] &&
-		 $env{'request.symb'} eq '')
-		||
-		(($env{'request.noversionuri'}=~/^\/adm\//) &&
-		 ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-		 ($env{'request.noversionuri'}!~
-		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
-		  )
-		 ) {
+	    if (&show_return_link()) {
                 my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
 ENDRELOAD
             }
+            if ($role_selector) {
+                $roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>';
+            }
         }
 	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
 	    my $escreload=&escape('return:');
@@ -236,16 +347,12 @@ ENDCRELOAD
         }
         my $form=&serverform();
 	my $utility=&utilityfunctions();
-	my $remote;
-	if ($env{'user.adv'}) {
-	    $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
-	}
 
         my $helplink=&Apache::loncommon::top_nav_help('Help');
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
-// BEGIN LON-CAPA Internal
 // <![CDATA[
+// BEGIN LON-CAPA Internal
 $utility
 // ]]>
 </script>
@@ -257,8 +364,7 @@ $reloadlink
 $navmaps
 $docs
 $groups
-$remote
-<td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>
+$roles
 <td class="LC_top_nav_help">$helplink</td>
 <td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
 </tr>
@@ -274,7 +380,19 @@ ENDINLINEMENU
     }
 }
 
-# ====================================== This gets called in the header section
+sub show_return_link {
+    return (($env{'request.noversionuri'}=~m{^/(res|public)/} &&
+	     $env{'request.symb'} eq '')
+	    ||
+	    ($env{'request.noversionuri'}=~ m{^/cgi-bin/printout.pl})
+	    ||
+	    (($env{'request.noversionuri'}=~/^\/adm\//) &&
+	     ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+	     ($env{'request.noversionuri'}!~
+	      m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+	     ));
+}
+
 
 sub registerurl {
     my ($forcereg) = @_;
@@ -291,7 +409,9 @@ sub registerurl {
 	   &unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
  	return $result.
-          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
+               '<script type="text/javascript">'."\n".
+               'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n".
+               '</script>'.$force_title;
     }
 # Graphical display after login only
     if ($env{'request.registered'} && !$forcereg) { return ''; }
@@ -299,9 +419,6 @@ sub registerurl {
     return $result.$force_title;
 }
 
-# =========== This gets called in order to register a URL, both with the Remote
-# =========== and in the body of the document
-
 sub innerregister {
     my ($forcereg, $titletable) = @_;
     my $result = '';
@@ -334,16 +451,18 @@ sub innerregister {
 	} else {
 	    $newmail= 'swmenu.setstatus("you have","messages");';
 	}
-    } elsif (($textual) 
+    } 
+    if (($textual) 
 	     && ($env{'request.symb'}) 
 	     && ($env{'request.course.id'})) {
 	$newmail.= '<td class="LC_current_location">';
 	my ($mapurl,$rid,$resurl)=
 	    &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
-        $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'};
+        my $coursetitle=$env{'course.'.$env{'request.course.id'}.'.description'};
+        $newmail.=$coursetitle;
         my $maptitle=&Apache::lonnet::gettitle($mapurl);
 	my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread());
-        if ($maptitle && $maptitle ne 'default.sequence') {
+        if ($maptitle && ($maptitle ne 'default.sequence') && ($maptitle ne $coursetitle)) {
 	    $newmail.=', '.$maptitle;
         }
         if ($restitle) {
@@ -376,7 +495,7 @@ sub innerregister {
         if ($env{'request.symb'} ne '' &&
 	    $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
 	    if (&Apache::lonnet::allowed('mgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
+		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_4]',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');
             } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
@@ -397,20 +516,31 @@ sub innerregister {
         ### resource
         ###
         my $editbutton = '';
+        my $noeditbutton = 1;
+        my ($cnum,$cdom);
+        if ($env{'request.course.id'}) {
+            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        }
         if ($env{'user.author'}) {
-            if ($env{'request.role'}=~/^(ca|au)/) {
+            if ($env{'request.role'}=~/^(aa|ca|au)/) {
                 # Set defaults for authors
                 my ($top,$bottom) = ('con-','struct');
                 my $action = "go('/priv/".$env{'user.name'}."');";
                 my $cadom  = $env{'request.role.domain'};
                 my $caname = $env{'user.name'};
-                my $desc = "Enter my resource construction space";
+                my $desc = "Enter my construction space";
                 # Set defaults for co-authors
                 if ($env{'request.role'} =~ /^ca/) { 
                     ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/);
                     ($top,$bottom) = ('co con-','struct');
                     $action = "go('/priv/".$caname."');";
                     $desc = "Enter construction space as co-author";
+                } elsif ($env{'request.role'} =~ /^aa/) {
+                    ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/);
+                    ($top,$bottom) = ('co con-','struct');
+                    $action = "go('/priv/".$caname."');";
+                    $desc = "Enter construction space as assistant co-author";
                 }
                 # Check that we are on the correct machine
                 my $home = &Apache::lonnet::homeserver($caname,$cadom);
@@ -419,6 +549,7 @@ sub innerregister {
 		foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
 		if (!$allowed) {
 		    $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
+                    $noeditbutton = 0;
                 }
             }
             ##
@@ -427,6 +558,7 @@ sub innerregister {
             my $cfile='';
             my $cfuname='';
             my $cfudom='';
+            my $uploaded;
             if ($env{'request.filename'}) {
                 my $file=&Apache::lonnet::declutter($env{'request.filename'});
                 $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
@@ -447,10 +579,27 @@ sub innerregister {
                 $editbutton=&switch
                     ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
+                $noeditbutton = 0;
             } elsif ($editbutton eq '') {
                 $editbutton=&clear(6,1);
             }
         }
+        if (($noeditbutton) && ($env{'request.filename'})) {
+            if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                my $file=&Apache::lonnet::declutter($env{'request.filename'});
+                if (defined($cnum) && defined($cdom)) {
+                    if (&is_course_upload($file,$cnum,$cdom)) {
+                        my $cfile = &edit_course_upload($file,$cnum,$cdom);
+                        if ($cfile) {
+                            $editbutton=&switch
+                                        ('','',6,1,'pcstr.gif','edit[_1]',
+                                         'resource[_2]',"go('".$cfile."');",
+                                         'Edit this resource');
+                        }
+                    }
+                }
+            }
+        }
         ###
         ###
 # Prepare the rest of the buttons
@@ -468,7 +617,7 @@ sub innerregister {
                 $menuitems=(<<ENDMENUITEMS);
 s&6&1&list.gif&list[_1]&dir[_1]&golist('$esc_currdir')&List current directory
 s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version
-s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
+s&6&3&pub.gif&publish[_1]&resource[_3]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
 s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource
 s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
@@ -484,13 +633,31 @@ c&8&1
 c&8&2
 s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&&1
-s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&&1
 ENDMENUITEMS
 
+my $currentURL = &Apache::loncommon::get_symb();
+my ($symb_old,$symb_old_enc) = &Apache::loncommon::clean_symb($currentURL);
+my $annotation = &Apache::loncommon::get_annotation($symb_old,$symb_old_enc);
+$menuitems.="s&9&3&";
+if(length($annotation) > 0){
+	$menuitems.="anot2.gif";
+}else{
+	$menuitems.="anot.gif";
+}
+$menuitems.="&anno-[_1]&tations[_1]&annotate()&";
+$menuitems.="Make notes and annotations about this resource&&1\n";
+
+            unless ($noremote) {
+                my $showreqcrs = &check_for_rcrs();
+                if ($showreqcrs) {
+                    $menuitems.="s&8&1&rcrs.gif&request[_1]&course[_16]".
+                                "&go('/adm/requestcourse')&Course requests\n";
+                }
+            }
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
-		if (!$env{'request.enc'}) {
+                if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
 		    $menuitems.=(<<ENDREALRES);
-s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
+s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata
 ENDREALRES
                 }
 	        $menuitems.=(<<ENDREALRES);
@@ -592,6 +759,7 @@ ENDREGTEXT
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
+// <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -627,6 +795,7 @@ var swmenu=null;
       }
 
 // END LON-CAPA Internal 
+// ]]>
 </script>
 ENDREGTHIS
         }
@@ -642,6 +811,7 @@ ENDDONOTREGTEXT
            $result = (<<ENDDONOTREGTHIS);
 
 <script type="text/javascript">
+// <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -666,6 +836,7 @@ var swmenu=null;
     }
 
 // END LON-CAPA Internal
+// ]]>
 </script>
 ENDDONOTREGTHIS
        }
@@ -674,6 +845,42 @@ ENDDONOTREGTHIS
     return $result;
 }
 
+sub is_course_upload {
+    my ($file,$cnum,$cdom) = @_;
+    my $uploadpath = &LONCAPA::propath($cdom,$cnum);
+    $uploadpath =~ s{^\/}{};
+    if (($file =~ m{^\Q$uploadpath\E/userfiles/docs/}) ||
+        ($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/docs/})) {
+        return 1;
+    }
+    return;
+}
+
+sub edit_course_upload {
+    my ($file,$cnum,$cdom) = @_;
+    my $cfile;
+    if ($file =~/\.(htm|html|css|js|txt)$/) {
+        my $ext = $1;
+        my $url = &Apache::lonnet::hreflocation('',$file);
+        my $home = &Apache::lonnet::homeserver($cnum,$cdom);
+        my @ids=&Apache::lonnet::current_machine_ids();
+        my $dest;
+        if ($home && grep(/^\Q$home\E$/,@ids)) {
+            $dest = $url.'?forceedit=1';
+        } else {
+            unless (&Apache::lonnet::get_locks()) {
+                $dest = '/adm/switchserver?otherserver='.
+                        $home.'&role='.$env{'request.role'}.
+                        '&url='.$url.'&forceedit=1';
+            }
+        }
+        if ($dest) {
+            $cfile = &HTML::Entities::encode($dest,'"<>&');
+        }
+    }
+    return $cfile;
+}
+
 sub loadevents() {
     if ($env{'request.state'} eq 'construct' ||
 	$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
@@ -686,7 +893,6 @@ sub unloadevents() {
     return 'LONCAPAstale();';
 }
 
-# ============================================================= Start up remote
 
 sub startupremote {
     my ($lowerurl)=@_;
@@ -702,6 +908,7 @@ sub startupremote {
     my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);
 <script type="text/javascript">
+// <![CDATA[
 var timestart;
 function wheelswitch() {
     if (typeof(document.wheel) != 'undefined') {
@@ -751,7 +958,7 @@ function main() {
    timestart=date.getTime();
    wait();
 }
-
+// ]]>
 </script>
 ENDREMOTESTARTUP
 }
@@ -759,8 +966,10 @@ ENDREMOTESTARTUP
 sub setflags() {
     return(<<ENDSETFLAGS);
 <script type="text/javascript">
+// <![CDATA[
     menuloaded=0;
     tim=0;
+// ]]>
 </script>
 ENDSETFLAGS
 }
@@ -770,7 +979,9 @@ sub maincall() {
         ($env{'environment.remote'} eq 'off')) { return ''; }
     return(<<ENDMAINCALL);
 <script type="text/javascript">
+// <![CDATA[
     main();
+// ]]>
 </script>
 ENDMAINCALL
 }
@@ -782,8 +993,9 @@ sub load_remote_msg {
         ($env{'environment.remote'} eq 'off')) { return ''; }
 
     my $esclowerurl=&escape($lowerurl);
-    my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
-		 "/adm/remote?action=collapse&amp;url=$esclowerurl");
+    my $link=&mt('[_1]Continue[_2] on in Inline Menu mode',
+		 '<a href="/adm/remote?action=collapse&amp;url='.$esclowerurl.'">',
+                 '</a>');
     return(<<ENDREMOTEFORM);
 <p>
 <form name="wheel">
@@ -793,25 +1005,35 @@ sub load_remote_msg {
 <p>$link</p>
 ENDREMOTEFORM
 }
-# ================================================================= Reopen menu
+
+sub get_menu_name {
+    my $hostid = $Apache::lonnet::perlvar{'lonHostID'};
+    $hostid =~ s/\W//g;
+    return 'LCmenu'.$hostid;
+}
+
 
 sub reopenmenu {
    if (($env{'browser.interface'} eq 'textual') ||
        ($env{'environment.remote'} eq 'off')) { return ''; }
-   my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
+   my $menuname = &get_menu_name();
    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
    return('window.open('.$nothing.',"'.$menuname.'","",false);');
 } 
 
-# =============================================================== Open the menu
 
 sub open {
     my $returnval='';
     if (($env{'browser.interface'} eq 'textual') ||
         ($env{'environment.remote'} eq 'off')) { 
-	return '<script type="text/javascript">self.name="loncapaclient";</script>';
+	return 
+         '<script type="text/javascript">'."\n".
+         '// <![CDATA['."\n".
+         'self.name="loncapaclient";'."\n".
+         '// ]]>'."\n".
+         '</script>';
     }
-    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
+    my $menuname = &get_menu_name();
     
 #    unless (shift eq 'unix') {
 # resizing does not work on linux because of virtual desktop sizes
@@ -822,11 +1044,13 @@ sub open {
 #}
 #ENDRESIZE
 #    }
-    $returnval.=(<<ENDOPEN);
+    $returnval=(<<ENDOPEN);
+// <![CDATA[
 window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html","$menuname",
 "height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 self.name='loncapaclient';
+// ]]>
 ENDOPEN
     return '<script type="text/javascript">'.$returnval.'</script>';
 }
@@ -856,8 +1080,9 @@ sub switch {
     $top=&mt($top);
     $bot=&mt($bot);
     $desc=&mt($desc);
-    $img=&mt($img);
-
+    if (($env{'environment.remote'} ne 'off') || ($env{'environment.icons'} eq 'classic')) {
+       $img=&mt($img);
+    }
     my $idx=10*$row+$col;
     $category_members{$cat}.=':'.$idx;
 
@@ -939,7 +1164,7 @@ sub secondlevel {
 }
 
 sub openmenu {
-    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
+    my $menuname = &get_menu_name();
     if (($env{'browser.interface'} eq 'textual') ||
         ($env{'environment.remote'} eq 'off')) { return ''; }
     my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
@@ -952,11 +1177,14 @@ sub inlinemenu {
     &rawconfig(1);
     my $output='<table id="LC_mainmenu"><tr>';
     for (my $col=1; $col<=2; $col++) {
-        $output.='<td class="LC_mainmenu_column">';
+        $output.='<td class="LC_mainmenu_col_fieldset">';
         for (my $row=1; $row<=8; $row++) {
             foreach my $cat (keys(%category_members)) {
                if ($category_positions{$cat} ne "$col,$row") { next; }
-               $output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
+               #$output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
+               $output.='<fieldset id="LC_mainmenu_fieldset">';
+	       $output.='<legend class="LC_mainmenu_fieldset_category">'.&mt($category_names{$cat}).'</legend>';
+               $output.='<table id="LC_menubuttons_mainmenu">';
                my %active=();
                foreach my $menu_item (split(/\:/,$category_members{$cat})) {
                   if ($inlineremote[$menu_item]) {
@@ -967,6 +1195,7 @@ sub inlinemenu {
                   $output.=$inlineremote[$item];
                }
                $output.='</table>';
+               $output.='</fieldset>';
             }
          }
          $output.="</td>";
@@ -989,14 +1218,17 @@ sub rawconfig {
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
     my $adv=$env{'user.adv'};
+    my $show_course=&Apache::loncommon::show_course();
     my $author=$env{'user.author'};
     my $crs='';
+    my $crstype='';
     if ($env{'request.course.id'}) {
        $crs='/'.$env{'request.course.id'};
        if ($env{'request.course.sec'}) {
 	   $crs.='_'.$env{'request.course.sec'};
        }
        $crs=~s/\_/\//g;
+       $crstype = &Apache::loncommon::course_type();
     }
     my $pub=($env{'request.state'} eq 'published');
     my $con=($env{'request.state'} eq 'construct');
@@ -1006,13 +1238,18 @@ sub rawconfig {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
-        $prt=~s/\$crs/$crs/g; 
+        $prt=~s/\$crs/$crs/g;
+        if ($prt =~ /\$crs/) {
+            next unless ($env{'request.course.id'});
+            next if ($crstype eq 'Community');
+            $prt=~s/\$crs/$crs/g;
+        } elsif ($prt =~ /\$cmty/) {
+            next unless ($env{'request.course.id'});
+            next if ($crstype ne 'Community');
+            $prt=~s/\$cmty/$crs/g;
+        }
         $prt=~s/\$requested_domain/$requested_domain/g;
         if ($category_names{$cat}!~/\w/) { $cat='oth'; }
-        my $type = &Apache::loncommon::course_type();
-        if ($type eq 'Group') {
-            $desc = &convert_menu_function($desc,$type);
-        }
         if ($pro eq 'clear') {
 	    $output.=&clear($row,$col);
         } elsif ($pro eq 'any') {
@@ -1028,35 +1265,89 @@ sub rawconfig {
                $output.=&secondlevel(
 	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
             }
+	} elsif ($pro eq 'shc') {
+            if ($show_course) {
+               $output.=&secondlevel(
+          $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
+            }
+        } elsif ($pro eq 'nsc') {
+            if (!$show_course) {
+               $output.=&secondlevel(
+	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
+            }
         } elsif (($pro=~/^p(\w+)/) && ($prt)) {
-	    if (&Apache::lonnet::allowed($1,$prt)) {
+            my $priv = $1;
+            if ($priv =~ /^mdc(Course|Community)/) {
+                if ($crstype eq $1) {
+                    $priv = 'mdc';
+                } else {
+                    next;
+                }
+            }
+	    if (&Apache::lonnet::allowed($priv,$prt)) {
                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
             }
-        } elsif ($pro eq 'course') {
-            if ($env{'request.course.fn'}) {
+        } elsif ($pro eq 'course')  {
+            if (($env{'request.course.fn'}) && ($crstype ne 'Community')) {
                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
-	    }
+            }
+        } elsif ($pro eq 'community')  {
+            if (($env{'request.course.fn'}) && ($crstype eq 'Community')) {
+               $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+            }
         } elsif ($pro =~ /^courseenv_(.*)$/) {
             my $key = $1;
-            if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) {
-                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+            if ($crstype ne 'Community') {
+                my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key};
+                if ($key eq 'canuse_pdfforms') {
+                    if ($env{'request.course.id'} && $coursepref eq '') {
+                        my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+                        $coursepref = $domdefs{'canuse_pdfforms'};
+                    }
+                }
+                if ($coursepref) {
+                    $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+                }
+            }
+        } elsif ($pro =~ /^communityenv_(.*)$/) {
+            my $key = $1;
+            if ($crstype eq 'Community') {
+                my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key};
+                if ($key eq 'canuse_pdfforms') {
+                    if ($env{'request.course.id'} && $coursepref eq '') {
+                        my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+                        $coursepref = $domdefs{'canuse_pdfforms'};
+                    }
+                }
+                if ($coursepref) {
+                    $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+                }
             }
         } elsif ($pro =~ /^course_(.*)$/) {
             # Check for permissions inside of a course
-            if (($env{'request.course.id'}) &&
+            if (($env{'request.course.id'}) && ($crstype ne 'Community') &&
                 (&Apache::lonnet::allowed($1,$env{'request.course.id'}.
             ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
                  )) {
                 $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
-	    }
+            }
+        } elsif ($pro =~ /^community_(.*)$/) {
+            # Check for permissions inside of a community
+            if (($env{'request.course.id'}) && ($crstype eq 'Community') &&
+                (&Apache::lonnet::allowed($1,$env{'request.course.id'}.
+            ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
+                 )) {
+                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+            }
         } elsif ($pro eq 'author') {
             if ($author) {
                 if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) ||
+                    (($prt eq 'raa') && ($env{'request.role'}=~/^aa/)) || 
                     (($prt eq 'rau') && ($env{'request.role'}=~/^au/))) {
                     # Check that we are on the correct machine
                     my $cadom=$requested_domain;
                     my $caname=$env{'user.name'};
-                    if ($prt eq 'rca') {
+                    if (($prt eq 'rca') || ($prt eq 'raa')) {
 		       ($cadom,$caname)=
                                ($env{'request.role'}=~/($match_domain)\/($match_username)$/);
                     }                       
@@ -1071,6 +1362,32 @@ sub rawconfig {
                     }
                 }
             }
+        } elsif ($pro eq 'tools') {
+            my @tools = ('aboutme','blog','portfolio');
+            if (grep(/^\Q$prt\E$/,@tools)) {
+                if (!&Apache::lonnet::usertools_access($env{'user.name'},
+                                                       $env{'user.domain'},
+                                                       $prt,undef,'tools')) {
+                    $output.=&clear($row,$col);
+                    next;
+                }
+            } elsif (($prt eq 'reqcrsnsc') || ($prt eq 'reqcrsshc')) {
+                if (($prt eq 'reqcrsnsc') && ($show_course))   {
+                    next;
+                }
+                if (($prt eq 'reqcrsshc') && (!$show_course)) {
+                    next;
+                }
+                my $showreqcrs = &check_for_rcrs();
+                if (!$showreqcrs) {
+                    $output.=&clear($row,$col);
+                    next;
+                }
+            }
+            $prt='any';
+            $output.=&secondlevel(
+          $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
+
         }
     }
     unless (($env{'browser.interface'} eq 'textual') ||
@@ -1084,14 +1401,37 @@ sub rawconfig {
     return $output;
 }
 
+sub check_for_rcrs {
+    my $showreqcrs = 0;
+    my @reqtypes = ('official','unofficial','community');
+    foreach my $type (@reqtypes) {
+        if (&Apache::lonnet::usertools_access($env{'user.name'},
+                                              $env{'user.domain'},
+                                              $type,undef,'requestcourses')) {
+            $showreqcrs = 1;
+            last;
+        }
+    }
+    if (!$showreqcrs) {
+        foreach my $type (@reqtypes) {
+            if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
+                $showreqcrs = 1;
+                last;
+            }
+        }
+    }
+    return $showreqcrs;
+}
+
 # ======================================================================= Close
 
 sub close {
     if (($env{'browser.interface'} eq 'textual') ||
         ($env{'environment.remote'} eq 'off')) { return ''; }
-    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
+    my $menuname = &get_menu_name();
     return(<<ENDCLOSE);
 <script type="text/javascript">
+// <![CDATA[
 window.status='Accessing Remote Control';
 menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
@@ -1101,6 +1441,7 @@ menu.autologout=0;
 window.status='Closing Remote Control';
 menu.close();
 window.status='Done.';
+// ]]>
 </script>
 ENDCLOSE
 }
@@ -1133,6 +1474,11 @@ sub utilityfunctions {
     unless (($env{'browser.interface'} eq 'textual')  ||
         ($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
     my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+    if ($currenturl =~ m{^/adm/wrapper/ext/}) {
+        if ($env{'request.external.querystring'}) {
+            $currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'};
+        }
+    }
     $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
     
     my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
@@ -1287,16 +1633,16 @@ function set_bookmark() {
    bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
    bmquery.document.write(
    '$start_page_bookmark'
-   +"<center><form method='post'"
-   +" name='newlink' action='/adm/bookmarks' target='bmquery' "
-   +">\\n <table width=340 height=150 "
-   +"bgcolor='ffffff' align=center><tr><td>Link Name:<br /><input "
-   +"type='text' name='title' size=45 value='"+clienttitle+"' />"
-   +"<br />Address:<br /><input type='text' name='address' size='45' "
-   +"value='"+clienthref+"' /><br /><center><input type='submit' "
-   +"value='Save' /> <input type='button' value='Close (no save)' "
-   +"onclick='javascript:window.close();' /><\\/center><\\/td>"
-   +"<\\/tr><\\/table><\\/form><\\/center>"
+   +'<center><form method="post"'
+   +' name="newlink" action="/adm/bookmarks" target="bmquery" '
+   +'> <table width="340" height="150" '
+   +'bgcolor="ffffff" align="center"><tr><td>Link Name:<br /><input '
+   +'type="text" name="title" size="45" value="'+clienttitle+'" />'
+   +'<br />Address:<br /><input type="text" name="address" size="45" '
+   +'value="'+clienthref+'" /><br /><center><input type="submit" '
+   +'value="Save" /> <input type="button" value="Close" '
+   +'onclick="javascript:window.close();" /></center></td>'
+   +'</tr></table></form></center>'
    +'$end_page_bookmark' );
    bmquery.document.close();
 }
@@ -1344,19 +1690,6 @@ sub get_nav_status {
     return $navstatus;
 }
 
-#FIXME this needs to move into mydesktab and the other locations 
-# the text is generated
-sub convert_menu_function {
-    my ($rolename,$type) = @_;
-    if ($type eq 'Group') {
-        $rolename =~ s/student/member/g;
-        $rolename =~ s/group/team/g;
-        $rolename =~ s/course/group/g;
-        $rolename =~ s/Course/Group/g;
-    }
-    return $rolename;
-}
-
 sub hidden_button_check {
     my $hidden;
     if ($env{'request.course.id'} eq '') {
@@ -1365,9 +1698,265 @@ sub hidden_button_check {
     if ($env{'request.role.adv'}) {
         return;
     }
-    return &Apache::lonnet::EXT('resource.0.buttonshide'); 
+    my $buttonshide = &Apache::lonnet::EXT('resource.0.buttonshide');
+    return $buttonshide; 
 }
 
+sub roles_selector {
+    my ($cdom,$cnum) = @_;
+    my $crstype = &Apache::loncommon::course_type();
+    my $now = time;
+    my (%courseroles,%seccount);
+    my $is_cc;
+    my $role_selector;
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
+    if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
+        my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
+        if ((($start) && ($start<0)) || 
+            (($end) && ($end<$now))  ||
+            (($start) && ($now<$start))) {
+            $is_cc = 0;
+        } else {
+            $is_cc = 1;
+        }
+    }
+    if ($is_cc) {
+        &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
+    } else {
+        my %gotnosection;
+        foreach my $item (keys(%env)) {
+            if ($item =~ m-^user\.role\.([^.]+)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
+                my $role = $1;
+                my $sec = $2;
+                next if ($role eq 'gr');
+                my ($start,$end) = split(/\./,$env{$item});
+                next if (($start && $start > $now) || ($end && $end < $now));
+                if ($sec eq '') {
+                    if (!$gotnosection{$role}) {
+                        $seccount{$role} ++;
+                        $gotnosection{$role} = 1;
+                    }
+                }
+                if (ref($courseroles{$role}) eq 'ARRAY') {
+                    if ($sec ne '') {
+                        if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) {
+                            push(@{$courseroles{$role}},$sec);
+                            $seccount{$role} ++;
+                        }
+                    }
+                } else {
+                    @{$courseroles{$role}} = ();
+                    if ($sec ne '') {
+                        $seccount{$role} ++;
+                        push(@{$courseroles{$role}},$sec);
+                    }
+                }
+            }
+        }
+    }
+    my $switchtext;
+    if ($crstype eq 'Community') {
+        $switchtext = &mt('Switch community role to...')
+    } else {
+        $switchtext = &mt('Switch course role to...')
+    }
+
+    my @roles_order = ($ccrole,'in','ta','ep','ad','st');
+    if (keys(%courseroles) > 1) {
+        $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles);
+        $role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
+                          <select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';
+        $role_selector .= '<option value="">'.$switchtext.'</option>';
+        foreach my $role (@roles_order) {
+            if (defined($courseroles{$role})) {
+                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>'; 
+            }
+        }
+        foreach my $role (sort(keys(%courseroles))) {
+            if ($role =~ /^cr/) {
+                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; 
+            }
+        }
+        $role_selector .= '</select>'."\n".
+               '<input type="hidden" name="destinationurl" value="'.
+               &HTML::Entities::encode($ENV{'REQUEST_URI'},'"<>&').'" />'."\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;
+}
+
+sub get_all_courseroles {
+    my ($cdom,$cnum,$courseroles,$seccount) = @_;
+    unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH')) {
+        return;
+    }
+    my ($result,$cached) =
+        &Apache::lonnet::is_cached_new('getcourseroles',$cdom.'_'.$cnum);
+    if (defined($cached)) {
+        if (ref($result) eq 'HASH') {
+            if ((ref($result->{'roles'}) eq 'HASH') &&
+                (ref($result->{'seccount'}) eq 'HASH')) {
+                %{$courseroles} = %{$result->{'roles'}};
+                %{$seccount} = %{$result->{'seccount'}};
+                return;
+            }
+        }
+    }
+    my %gotnosection;
+    my %adv_roles =
+         &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
+    foreach my $role (keys(%adv_roles)) {
+        my ($urole,$usec) = split(/:/,$role);
+        if (!$gotnosection{$urole}) {
+            $seccount->{$urole} ++;
+            $gotnosection{$urole} = 1;
+        }
+        if (ref($courseroles->{$urole}) eq 'ARRAY') {
+            if ($usec ne '') {
+                if (!grep(/^\Q$usec\E$/,@{$courseroles->{$urole}})) {
+                    push(@{$courseroles->{$urole}},$usec);
+                    $seccount->{$urole} ++;
+                }
+            }
+        } else {
+            @{$courseroles->{$urole}} = ();
+            if ($usec ne '') {
+                $seccount->{$urole} ++;
+                push(@{$courseroles->{$urole}},$usec);
+            }
+        }
+    }
+    my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum,['st']);
+    @{$courseroles->{'st'}} = ();
+    if (keys(%sections_count) > 0) {
+        push(@{$courseroles->{'st'}},keys(%sections_count));
+        $seccount->{'st'} = scalar(keys(%sections_count));
+    }
+    my $rolehash = {
+                     'roles'    => $courseroles,
+                     'seccount' => $seccount,
+                   };
+    &Apache::lonnet::do_cache_new('getcourseroles',$cdom.'_'.$cnum,$rolehash);
+    return;
+}
+
+sub jump_to_role {
+    my ($cdom,$cnum,$seccount,$courseroles) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                this => 'This role has section(s) associated with it.',
+                ente => 'Enter a specific section.',
+                orlb => 'Enter a specific section, or leave blank for no section.',
+                avai => 'Available sections are:',
+                youe => 'You entered an invalid section choice:',
+                plst => 'Please try again',
+    );
+    my $js;
+    if (ref($courseroles) eq 'HASH') {
+        $js = '    var secpick = new Array("'.$lt{'ente'}.'","'.$lt{'orlb'}.'");'."\n". 
+              '    var numsec = new Array();'."\n".
+              '    var rolesections = new Array();'."\n".
+              '    var rolenames = new Array();'."\n".
+              '    var roleseclist = new Array();'."\n";
+        my @items = keys(%{$courseroles});
+        for (my $i=0; $i<@items; $i++) {
+            $js .= '    rolenames['.$i.'] = "'.$items[$i].'";'."\n";
+            my ($secs,$secstr);
+            if (ref($courseroles->{$items[$i]}) eq 'ARRAY') {
+                my @sections = sort { $a <=> $b } @{$courseroles->{$items[$i]}};
+                $secs = join('","',@sections);
+                $secstr = join(', ',@sections);
+            }
+            $js .= '    rolesections['.$i.'] = new Array("'.$secs.'");'."\n".
+                   '    roleseclist['.$i.'] = "'.$secstr.'";'."\n".
+                   '    numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n";
+        }
+    }
+    return <<"END";
+<script type="text/javascript">
+//<![CDATA[
+function adhocRole(roleitem) {
+    $js
+    var newrole =  document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value;
+    if (newrole == '') {
+        return; 
+    } 
+    var fullrole = newrole+'./$cdom/$cnum';
+    var selidx = '';
+    for (var i=0; i<rolenames.length; i++) {
+        if (rolenames[i] == newrole) {
+            selidx = i;
+        }
+    }
+    var secok = 1;
+    var secchoice = '';
+    if (selidx >= 0) {
+        if (numsec[selidx] > 1) {
+            secok = 0;
+            var numrolesec = rolesections[selidx].length;
+            var msgidx = numsec[selidx] - numrolesec;
+            secchoice = prompt("$lt{'this'}\\n"+secpick[msgidx]+"\\n$lt{'avai'} "+roleseclist[selidx],"");
+            if (secchoice == '') {
+                if (msgidx > 0) {
+                    secok = 1;
+                }
+            } else {
+                for (var j=0; j<rolesections[selidx].length; j++) {
+                    if (rolesections[selidx][j] == secchoice) {
+                        secok = 1;
+                    }
+                }
+            }
+        } else {
+            if (rolesections[selidx].length == 1) {
+                secchoice = rolesections[selidx][0];
+            }
+        }
+    }
+    if (secok == 1) {
+        if (secchoice != '') {
+            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'}") {
+        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.selectrole.value = '1';
+    document.rolechooser.submit();
+    return;
+}
+
+function retrieveIndex(item) {
+    for (var i=0;i<document.rolechooser.elements.length;i++) {
+        if (document.rolechooser.elements[i].name == item) {
+            return i;
+        }
+    }
+    return -1;
+}
+// ]]>
+</script>
+END
+}
+
+
 # ================================================================ Main Program
 
 BEGIN {