--- loncom/interface/lonmenu.pm 2010/01/18 21:05:08 1.244.2.11 +++ loncom/interface/lonmenu.pm 2009/03/29 20:10:37 1.256 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.244.2.11 2010/01/18 21:05:08 raeburn Exp $ +# $Id: lonmenu.pm,v 1.256 2009/03/29 20:10:37 kaisler Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,7 +144,6 @@ 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); @@ -171,15 +170,15 @@ sub initlittle { return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', 'nav' => 'Navigate Contents', 'main' => 'Main Menu', - 'roles' => (&Apache::loncommon::show_course()? + 'roles' => (&show_course()? 'Courses':'Roles'), 'other' => 'Other Roles', 'docs' => 'Edit Course', - 'exit' => 'Logout', + 'exit' => 'Exit', 'login' => 'Log In', 'launch' => 'Launch Remote Control', 'groups' => 'Groups', - 'gdoc' => 'Community Documents', + 'gdoc' => 'Group Documents', ); } @@ -207,8 +206,8 @@ sub menubuttons { my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); - $logo = '<td class="LC_top_nav_logo"><a href="/adm/about.html"><img src="'. - $logo.'" alt="LON-CAPA Logo" /></a></td>'; + $logo = '<a href="/adm/about.html"><img src="'. + $logo.'" alt="LON-CAPA Logo" class="LC_noBorder" /></a>'; if ($env{'request.state'} eq 'construct') { if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { @@ -247,12 +246,9 @@ ENDNAV <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a> ENDRELOAD } - 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> + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + $docs=(<<ENDDOCS); +<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a> ENDDOCS } if ($showgroups) { @@ -296,17 +292,16 @@ ENDMAINMENU return (<<ENDINLINEMENU); <table id="LC_top_nav"> <tr> - $logo + <td>$logo</td> <td></td> <td class="LC_top_nav_login"> <a href="/adm/roles" target="_top">$lt{'login'}</a> </td> </tr> </table> -</font> ENDINLINEMENU } - $roles = '<td><a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a></td>'; + $roles = '<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>'; # Do we have a NAV link? if ($env{'request.course.id'}) { my $link='/adm/navmaps?postdata='.$escurl.'&postsymb='. @@ -315,35 +310,35 @@ ENDINLINEMENU $link="javascript:gonav('".$link."')"; } $navmaps=(<<ENDNAV); -<td><a href="$link" target="_top">$lt{'nav'}</a></td> +<li><a href="$link" target="_top">$lt{'nav'}</a></li> ENDNAV - my $is_community = - (&Apache::loncommon::course_type() eq 'Community'); + my $is_group = (&Apache::loncommon::course_type() eq 'Group'); if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { - my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'}; + my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'}; $docs=(<<ENDDOCS); -<td><a href="/adm/coursedocs" target="_top">$text</a></td> +<li><a href="/adm/coursedocs" target="_top">$text</a></li> ENDDOCS } if ($showgroups) { $groups =(<<ENDGROUPS); -<td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td> +<li><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></li> ENDGROUPS } if (&show_return_link()) { my $escreload=&escape('return:'); $reloadlink=(<<ENDRELOAD); -<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td> +<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li> ENDRELOAD } if ($role_selector) { - $roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>'; + #$roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>'; + $role_selector = '<li>'.$role_selector.'</li>'; } } if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { my $escreload=&escape('return:'); $reloadlink=(<<ENDCRELOAD); -<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td> +<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li> ENDCRELOAD } my $reg=''; @@ -353,31 +348,40 @@ ENDCRELOAD my $form=&serverform(); my $utility=&utilityfunctions(); + my $messagelink = ""; + if(&Apache::lonmsg::mynewmail()){ + $messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message(new)</a>' + }else{ + $messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message</a>' + } my $helplink=&Apache::loncommon::top_nav_help('Help'); return (<<ENDINLINEMENU); <script type="text/javascript"> -// <![CDATA[ // BEGIN LON-CAPA Internal +// <![CDATA[ $utility // ]]> </script> -<table id="LC_top_nav"> -<tr> -$logo -<td><a href="/adm/menu" target="_top">$lt{'main'}</a></td> +<ol class="LC_smallMenu LC_right"> + <li>$logo</li> + <li>$messagelink</li> + <li>$roles</li> + <li>$helplink</li> + <li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li> +</ol> +<ol id="LC_TabMainMenuContent"> +<li><a href="/adm/menu" target="_top">$lt{'main'}</a></li> $reloadlink $navmaps $docs $groups -$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> -</table> +$role_selector +</ol> $form <script type="text/javascript"> // END LON-CAPA Internal </script> +<br clear="all" /> $reg ENDINLINEMENU } else { @@ -414,9 +418,7 @@ sub registerurl { &unescape($env{'request.noversionuri'})))) && (!$forcereg))) { return $result. - '<script type="text/javascript">'."\n". - 'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n". - '</script>'.$force_title; + '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title; } # Graphical display after login only if ($env{'request.registered'} && !$forcereg) { return ''; } @@ -500,7 +502,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[_4]', + $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]', "gocmd('/adm/grades','gradingmenu')", 'Modify user grades for this assessment resource'); } elsif (&Apache::lonnet::allowed('vgr',$crs)) { @@ -521,12 +523,6 @@ 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'}=~/^(aa|ca|au)/) { # Set defaults for authors @@ -554,7 +550,6 @@ sub innerregister { foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } if (!$allowed) { $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc); - $noeditbutton = 0; } } ## @@ -563,7 +558,6 @@ 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/; @@ -584,27 +578,10 @@ 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 @@ -622,7 +599,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[_3]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource +s&6&3&pub.gif&publish[_1]&resource[_1]&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 @@ -652,17 +629,10 @@ if(length($annotation) > 0){ $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'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) { + if (!$env{'request.enc'}) { $menuitems.=(<<ENDREALRES); -s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata +s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show Metadata ENDREALRES } $menuitems.=(<<ENDREALRES); @@ -764,7 +734,6 @@ ENDREGTEXT $result = (<<ENDREGTHIS); <script type="text/javascript"> -// <![CDATA[ // BEGIN LON-CAPA Internal var swmenu=null; @@ -800,7 +769,6 @@ var swmenu=null; } // END LON-CAPA Internal -// ]]> </script> ENDREGTHIS } @@ -816,7 +784,6 @@ ENDDONOTREGTEXT $result = (<<ENDDONOTREGTHIS); <script type="text/javascript"> -// <![CDATA[ // BEGIN LON-CAPA Internal var swmenu=null; @@ -841,7 +808,6 @@ var swmenu=null; } // END LON-CAPA Internal -// ]]> </script> ENDDONOTREGTHIS } @@ -850,42 +816,6 @@ 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 ''; } @@ -913,7 +843,6 @@ 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') { @@ -963,7 +892,7 @@ function main() { timestart=date.getTime(); wait(); } -// ]]> + </script> ENDREMOTESTARTUP } @@ -971,10 +900,8 @@ ENDREMOTESTARTUP sub setflags() { return(<<ENDSETFLAGS); <script type="text/javascript"> -// <![CDATA[ menuloaded=0; tim=0; -// ]]> </script> ENDSETFLAGS } @@ -984,9 +911,7 @@ sub maincall() { ($env{'environment.remote'} eq 'off')) { return ''; } return(<<ENDMAINCALL); <script type="text/javascript"> -// <![CDATA[ main(); -// ]]> </script> ENDMAINCALL } @@ -998,9 +923,8 @@ sub load_remote_msg { ($env{'environment.remote'} eq 'off')) { return ''; } my $esclowerurl=&escape($lowerurl); - my $link=&mt('[_1]Continue[_2] on in Inline Menu mode', - '<a href="/adm/remote?action=collapse&url='.$esclowerurl.'">', - '</a>'); + my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode', + "/adm/remote?action=collapse&url=$esclowerurl"); return(<<ENDREMOTEFORM); <p> <form name="wheel"> @@ -1031,12 +955,7 @@ sub open { my $returnval=''; if (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off')) { - return - '<script type="text/javascript">'."\n". - '// <![CDATA['."\n". - 'self.name="loncapaclient";'."\n". - '// ]]>'."\n". - '</script>'; + return '<script type="text/javascript">self.name="loncapaclient";</script>'; } my $menuname = &get_menu_name(); @@ -1049,13 +968,11 @@ sub open { #} #ENDRESIZE # } - $returnval=(<<ENDOPEN); -// <![CDATA[ + $returnval.=(<<ENDOPEN); 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>'; } @@ -1120,22 +1037,22 @@ sub switch { my $pic= '<img alt="'.$text.'" src="'. &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img). - '" align="'.($nobreak==3?'right':'left').'" />'; + '" align="'.($nobreak==3?'right':'left').'" class="LC_noBorder" />'; if ($env{'browser.interface'} eq 'faketextual') { # Accessibility if ($nobreak==3) { $inlineremote[$idx]="\n". '<td class="LC_menubuttons_text" align="right">'.$text. - '</td><td class="LC_menubuttons_img" align="left">'. + '</td><td align="left">'. '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>'; } elsif ($nobreak) { $inlineremote[$idx]="\n<tr>". - '<td class="LC_menubuttons_img" align="left">'. + '<td align="left">'. '<a href="javascript:'.$act.';">'.$pic.'</a></td> <td class="LC_menubuttons_text" align="left"><a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$text.'</span></a></td>'; } else { $inlineremote[$idx]="\n<tr>". - '<td class="LC_menubuttons_img" align="left">'. + '<td align="left">'. '<a href="javascript:'.$act.';">'.$pic. '</a></td><td class="LC_menubuttons_text" colspan="3">'. '<a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$desc.'</span></a></td></tr>'; @@ -1186,10 +1103,10 @@ sub inlinemenu { 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.='<fieldset id="LC_mainmenu_fieldset">'; - $output.='<legend class="LC_mainmenu_fieldset_category">'.&mt($category_names{$cat}).'</legend>'; - $output.='<table id="LC_menubuttons_mainmenu">'; + #$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>'; + $output.='<div class="LC_ContentBoxSpecial">'; + $output.='<h4 class="LC_hcell">'.&mt($category_names{$cat}).'</h4>'; + $output.='<table>'; my %active=(); foreach my $menu_item (split(/\:/,$category_members{$cat})) { if ($inlineremote[$menu_item]) { @@ -1200,7 +1117,7 @@ sub inlinemenu { $output.=$inlineremote[$item]; } $output.='</table>'; - $output.='</fieldset>'; + $output.='</div>'; } } $output.="</td>"; @@ -1223,7 +1140,7 @@ 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 $show_course=&show_course(); my $author=$env{'user.author'}; my $crs=''; if ($env{'request.course.id'}) { @@ -1326,14 +1243,16 @@ sub rawconfig { $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; + } elsif ($prt eq 'reqcrs') { + my $showreqcrs = 0; + foreach my $type ('official','unofficial') { + if (&Apache::lonnet::usertools_access($env{'user.name'}, + $env{'user.domain'}, + $type,undef,'requestcourses')) { + $showreqcrs = 1; + last; + } } - my $showreqcrs = &check_for_rcrs(); if (!$showreqcrs) { $output.=&clear($row,$col); next; @@ -1342,7 +1261,6 @@ sub rawconfig { $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') || @@ -1356,28 +1274,6 @@ 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 { @@ -1386,7 +1282,6 @@ sub close { 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"); @@ -1396,7 +1291,6 @@ menu.autologout=0; window.status='Closing Remote Control'; menu.close(); window.status='Done.'; -// ]]> </script> ENDCLOSE } @@ -1429,11 +1323,6 @@ 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'}); @@ -1588,16 +1477,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" ' - +'> <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>' + +"<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' " + +"onclick='javascript:window.close();' /><\\/center><\\/td>" + +"<\\/tr><\\/table><\\/form><\\/center>" +'$end_page_bookmark' ); bmquery.document.close(); } @@ -1672,18 +1561,13 @@ sub hidden_button_check { sub roles_selector { my ($cdom,$cnum) = @_; - my $crstype = &Apache::loncommon::course_type(); my $now = time; - my (%courseroles,%seccount); + my (%courseroles,%seccount,%gotnosection); 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 ($env{'user.role.cc./'.$cdom.'/'.$cnum}) { + my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum}); + if ((($start) && ($start<0)) || (($end) && ($end<$now)) || (($start) && ($now<$start))) { @@ -1693,9 +1577,35 @@ sub roles_selector { } } if ($is_cc) { - &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount); + 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); + @{$courseroles{'st'}} = (); + if (keys(%sections_count) > 0) { + push(@{$courseroles{'st'}},keys(%sections_count)); + } } else { - my %gotnosection; foreach my $item (keys(%env)) { if ($item =~ m-^user\.role\.([^.]+)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) { my $role = $1; @@ -1726,22 +1636,15 @@ sub roles_selector { } } } - 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'); + my @roles_order = ('cc','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>'; + $role_selector .= '<option value="">'.&mt('Switch course role to...').'</option>'; foreach my $role (@roles_order) { if (defined($courseroles{$role})) { - $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>'; + $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; } } foreach my $role (sort(keys(%courseroles))) { @@ -1751,7 +1654,7 @@ sub roles_selector { } $role_selector .= '</select>'."\n". '<input type="hidden" name="destinationurl" value="'. - &HTML::Entities::encode($ENV{'REQUEST_URI'},'"<>&').'" />'."\n". + $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". @@ -1760,61 +1663,6 @@ sub roles_selector { 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( @@ -1846,9 +1694,8 @@ sub jump_to_role { ' numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n"; } } - return <<"END"; + my $output = <<"END"; <script type="text/javascript"> -//<![CDATA[ function adhocRole(roleitem) { $js var newrole = document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value; @@ -1919,9 +1766,11 @@ function retrieveIndex(item) { } return -1; } -// ]]> + + </script> END + return $output; }