--- loncom/interface/lonmenu.pm 2008/06/04 23:00:49 1.237 +++ loncom/interface/lonmenu.pm 2008/12/09 04:49:01 1.249 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.237 2008/06/04 23:00:49 bisitz Exp $ +# $Id: lonmenu.pm,v 1.249 2008/12/09 04:49:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,105 @@ # 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 convert_menu_function() + +FIXME this needs to move into mydesktab and the other locations +the text is generated + +=item hidden_button_check() + +=item roles_selector() + +=item jump_to_role() + +=back + +=cut + package Apache::lonmenu; use strict; @@ -53,7 +152,6 @@ my @inlineremote; -# ================================================================ Little texts sub show_course { my $course = !$env{'user.adv'}; if (!$env{'user.adv'}) { @@ -84,8 +182,6 @@ sub initlittle { ); } -# ============================= This gets called at the top of the body section - sub menubuttons { my $forcereg=shift; my $registration=shift; @@ -111,7 +207,7 @@ sub menubuttons { 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.'" alt="LON-CAPA Logo" class="noBorder" /></a></td>'; if ($env{'request.state'} eq 'construct') { if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { @@ -203,7 +299,6 @@ ENDMAINMENU </td> </tr> </table> -</font> ENDINLINEMENU } $roles = '<td><a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a></td>'; @@ -251,10 +346,6 @@ ENDCRELOAD } my $form=&serverform(); my $utility=&utilityfunctions(); - my $remote; - if ($env{'user.adv'}) { - $remote = '<td><a href="/adm/remote?action=launch&url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>' - } my $helplink=&Apache::loncommon::top_nav_help('Help'); return (<<ENDINLINEMENU); @@ -272,10 +363,9 @@ $reloadlink $navmaps $docs $groups -$remote $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> +<td style="width: 2.0em;">$helplink</td> +<td style="width: 2.0em;"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td> </tr> </table> $form @@ -302,7 +392,6 @@ sub show_return_link { )); } -# ====================================== This gets called in the header section sub registerurl { my ($forcereg) = @_; @@ -327,9 +416,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 = ''; @@ -519,9 +605,20 @@ 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 ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { if (!$env{'request.enc'}) { $menuitems.=(<<ENDREALRES); @@ -721,7 +818,6 @@ sub unloadevents() { return 'LONCAPAstale();'; } -# ============================================================= Start up remote sub startupremote { my ($lowerurl)=@_; @@ -835,7 +931,6 @@ sub get_menu_name { return 'LCmenu'.$hostid; } -# ================================================================= Reopen menu sub reopenmenu { if (($env{'browser.interface'} eq 'textual') || @@ -845,7 +940,6 @@ sub reopenmenu { return('window.open('.$nothing.',"'.$menuname.'","",false);'); } -# =============================================================== Open the menu sub open { my $returnval=''; @@ -898,8 +992,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; @@ -932,22 +1027,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="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>'; @@ -994,11 +1089,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><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>'; + $output.='<div class="ContentBoxSpecial">'; + $output.='<h4 class="hcell">'.&mt($category_names{$cat}).'</h4>'; + $output.='<table>'; my %active=(); foreach my $menu_item (split(/\:/,$category_members{$cat})) { if ($inlineremote[$menu_item]) { @@ -1009,6 +1107,7 @@ sub inlinemenu { $output.=$inlineremote[$item]; } $output.='</table>'; + $output.='</div>'; } } $output.="</td>"; @@ -1125,6 +1224,18 @@ 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)) { + $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') || @@ -1426,7 +1537,7 @@ sub hidden_button_check { sub roles_selector { my ($cdom,$cnum) = @_; my $now = time; - my %courseroles; + my (%courseroles,%seccount,%gotnosection); my $is_cc; my $role_selector; if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) { @@ -1443,34 +1554,66 @@ sub roles_selector { if ($is_cc) { my %adv_roles = &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1); - foreach my $role (keys(%adv_roles),'st') { + foreach my $role (keys(%adv_roles)) { my ($urole,$usec) = split(/:/,$role); - @{$courseroles{$urole}} = 'none'; + 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 { foreach my $item (keys(%env)) { - if ($item =~ m-^user\.role\.([^.]+)\./\Q$cdom\E/\Q$cnum\E(/?\w*)$-) { + 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 '') { - $sec = 'none'; + if (!$gotnosection{$role}) { + $seccount{$role} ++; + $gotnosection{$role} = 1; + } } if (ref($courseroles{$role}) eq 'ARRAY') { - if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) { - push(@{$courseroles{$role}},$sec); + if ($sec ne '') { + if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) { + push(@{$courseroles{$role}},$sec); + $seccount{$role} ++; + } } } else { - @{$courseroles{$role}} = ($sec); + @{$courseroles{$role}} = (); + if ($sec ne '') { + $seccount{$role} ++; + push(@{$courseroles{$role}},$sec); + } } } } } my @roles_order = ('cc','in','ta','ep','ad','st'); if (keys(%courseroles) > 1) { - $role_selector = &jump_to_role($cdom,$cnum); + $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="">'.&mt('Switch course role to...').'</option>'; @@ -1496,23 +1639,95 @@ sub roles_selector { } sub jump_to_role { - my ($cdom,$cnum) = @_; + 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"; + } + } my $output = <<"END"; <script type="text/javascript"> function adhocRole(roleitem) { + $js var newrole = document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value; if (newrole == '') { return; } - newrole += './$cdom/$cnum'; - if (newrole == "$env{'request.role'}") { + 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 = newrole; + document.rolechooser.elements[itemid].name = fullrole; } - document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value = newrole; + document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value = fullrole; document.rolechooser.selectrole.value = '1'; document.rolechooser.submit(); return;