--- loncom/interface/lonmenu.pm 2013/05/09 05:24:36 1.414 +++ loncom/interface/lonmenu.pm 2013/12/27 14:17:59 1.424 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.414 2013/05/09 05:24:36 raeburn Exp $ +# $Id: lonmenu.pm,v 1.424 2013/12/27 14:17:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -106,10 +106,11 @@ secondary_menu(). =item primary_menu() -This routine evaluates @primary_menu and returns XHTML for the menu -that contains following links: About, Message, Roles, Help, Logout +This routine evaluates @primary_menu and returns a two item array, +with the array elements containing XHTML for the left and right sides of +the menu that contains the following links: About, Message, Roles, Help, Logout @primary_menu is filled within the BEGIN block of this module with -entries from mydesk.tab +entries from mydesk.tab =item secondary_menu() @@ -203,15 +204,16 @@ sub prep_menuitem { . qq| href="$$menuitem[0]" target="_top">$link</a></li>|; } -# primary_menu() evaluates @primary_menu and returns XHTML for the menu -# that contains following links: -# About, Message, Personal, Roles, Help, Logout +# primary_menu() evaluates @primary_menu and returns a two item array, +# with the array elements containing XHTML for the left and right sides of +# the menu that contains the following links: +# Personal, About, Message, Roles, Help, Logout # @primary_menu is filled within the BEGIN block of this module with # entries from mydesk.tab sub primary_menu { - my $menu; + my (%menu); # each element of @primary contains following array: - # (link url, icon path, alt text, link text, condition) + # (link url, icon path, alt text, link text, condition, position) my $public; if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) { @@ -236,6 +238,10 @@ sub primary_menu { && !&Apache::loncommon::show_course(); ## my $title = $menuitem->[3]; + my $position = $menuitem->[5]; + if ($position eq '') { + $position = 'right'; + } if (defined($primary_submenu{$title})) { my ($link,$target); if ($menuitem->[0] ne '') { @@ -255,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 @@ -268,19 +274,23 @@ 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>"; + my @output = ('',''); + if ($menu{'left'} ne '') { + $output[0] = "<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>"; + } + if ($menu{'right'} ne '') { + $output[1] = "<ol class=\"LC_primary_menu LC_floatright LC_right\">$menu{'right'}</ol>"; + } + return @output; } #returns hashref {user=>'',dom=>''} containing: @@ -309,6 +319,7 @@ sub getauthor{ } sub secondary_menu { + my ($httphost) = @_; my $menu; my $crstype = &Apache::loncommon::course_type(); @@ -317,6 +328,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); @@ -325,7 +339,7 @@ sub secondary_menu { my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec); my $author = &getauthor(); - my ($cdom,$cnum,$showsyllabus,$showfeeds); + 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'}; @@ -345,6 +359,12 @@ sub secondary_menu { $showfeeds = 1; } } + unless ($canmgr) { + my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom); + if (keys(%slots) > 0) { + $showresv = 1; + } + } } my ($canmodifycoauthor); @@ -381,8 +401,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' @@ -404,7 +424,8 @@ sub secondary_menu { ($roleswitcher_js,$roleswitcher_form,my $switcher) = &roles_selector( $env{'course.' . $env{'request.course.id'} . '.domain'}, - $env{'course.' . $env{'request.course.id'} . '.num'} + $env{'course.' . $env{'request.course.id'} . '.num'}, + $httphost ); $menu .= $switcher; } else { @@ -456,15 +477,25 @@ sub secondary_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;">'. ' ▼</span></span></a>'. '<ul>'; @@ -473,13 +504,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>'; @@ -707,7 +749,7 @@ ENDMENUITEMS # wishlist is only available for users with access to resource-pool # and links can only be set for resources within the resource-pool $menuitems .= (<<ENDMENUITEMS); -s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1 +s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in my personal Stored Links repository&&1 ENDMENUITEMS $got_wishlist = 1; } @@ -730,14 +772,17 @@ $menuitems.="Make notes and annotations s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata ENDREALRES } - unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) { + unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) || + ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/})) { $menuitems.=(<<ENDREALRES); s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource ENDREALRES } - $menuitems.=(<<ENDREALRES); + unless ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) { + $menuitems.=(<<ENDREALRES); s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource ENDREALRES + } } } if ($env{'request.uri'} =~ /^\/res/) { @@ -947,7 +992,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&recname=$sname&recdom=$sdom')", 'Send message to specific user'); } my $hideprivileged = 1; @@ -969,13 +1014,13 @@ 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&origin=aboutme&uname=$sname&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&recname=$sname&recdom=$sdom')", 'Add records'); } } @@ -991,7 +1036,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&forcesupplement=1&supppath=$esc_path'", 'Folder/Page Content'); } } @@ -1342,7 +1387,7 @@ sub rawconfig { sub check_for_rcrs { my $showreqcrs = 0; - my @reqtypes = ('official','unofficial','community'); + my @reqtypes = ('official','unofficial','community','textbook'); foreach my $type (@reqtypes) { if (&Apache::lonnet::usertools_access($env{'user.name'}, $env{'user.domain'}, @@ -1409,6 +1454,7 @@ END } sub utilityfunctions { + my ($httphost) = @_; my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); if ($currenturl =~ m{^/adm/wrapper/ext/} && $env{'request.external.querystring'} ) { @@ -1444,7 +1490,7 @@ sub utilityfunctions { my $countdown = &countdown_toggle_js(); return (<<ENDUTILITY) - + var host="$httphost"; var currentURL=unescape("$esc_url"); var reloadURL=unescape("$esc_url"); var currentSymb=unescape("$esc_symb"); @@ -1455,7 +1501,7 @@ $jumptores function gopost(url,postdata) { if (url!='') { - this.document.server.action=url; + this.document.server.action=host+url; this.document.server.postdata.value=postdata; this.document.server.command.value=''; this.document.server.url.value=''; @@ -1466,7 +1512,7 @@ function gopost(url,postdata) { function gocmd(url,cmd) { if (url!='') { - this.document.server.action=url; + this.document.server.action=host+url; this.document.server.postdata.value=''; this.document.server.command.value=cmd; this.document.server.url.value=currentURL; @@ -1518,7 +1564,7 @@ function golist(url) { if (url!='' && url!= null) { currentURL = null; currentSymb= null; - top.location.href=url; + top.location.href=host+url; } } @@ -1529,11 +1575,11 @@ function catalog_info() { } function chat_win() { - lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); + lonchat=window.open(host+'/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); } function group_chat(group) { - var url = '/adm/groupchat?group='+group; + var url = host+'/adm/groupchat?group='+group; var winName = 'LONchat_'+group; grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no'); } @@ -1554,11 +1600,11 @@ function annotate() { function open_StoredLinks_Import(rat) { var newWin; if (rat) { - newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, + newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, 'wishlistImport','scrollbars=1,resizable=1,menubar=0'); } else { - newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import', + newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import', 'wishlistImport','scrollbars=1,resizable=1,menubar=0'); } newWin.focus(); @@ -1623,7 +1669,7 @@ sub hidden_button_check { } sub roles_selector { - my ($cdom,$cnum) = @_; + my ($cdom,$cnum,$httphost) = @_; my $crstype = &Apache::loncommon::course_type(); my $now = time; my (%courseroles,%seccount,%courseprivs); @@ -1716,7 +1762,7 @@ sub roles_selector { } } } - $switchtext = &mt('Switch role'); + $switchtext = 'Switch role'; # do not translate here my @roles_order = ($ccrole,'in','ta','ep','ad','st'); my $numdiffsec; if (keys(%seccount) == 1) { @@ -1728,7 +1774,7 @@ sub roles_selector { my @submenu; $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv); $form = - '<form name="rolechooser" method="post" action="/adm/roles">'."\n". + '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n". ' <input type="hidden" name="destinationurl" value="'. &HTML::Entities::encode($destinationurl).'" />'."\n". ' <input type="hidden" name="gotorole" value="1" />'."\n". @@ -2100,7 +2146,7 @@ BEGIN { $category_positions{$entries[2]}=$entries[1]; $category_names{$entries[2]}=$entries[3]; } elsif ($configline=~/^prim\:/) { - my @entries = (split(/\:/, $configline))[1..5]; + my @entries = (split(/\:/, $configline))[1..6]; push(@primary_menu,\@entries); } elsif ($configline=~/^primsub\:/) { my ($parent,@entries) = (split(/\:/, $configline))[1..4];