--- loncom/interface/lonmenu.pm 2010/01/18 20:47:57 1.244.2.9 +++ loncom/interface/lonmenu.pm 2009/10/20 01:57:42 1.293 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.244.2.9 2010/01/18 20:47:57 raeburn Exp $ +# $Id: lonmenu.pm,v 1.293 2009/10/20 01:57:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,15 +26,10 @@ # http://www.lon-capa.org/ # # -# There are two parameters controlling the action of this module: -# -# browser.interface - if this is 'textual', it overrides the second parameter -# and goes to screen reader PDA mode +# There is one parameter controlling the action of this module: # # environment.remote - if this is 'on', the routines controll the remote -# control, otherwise they render the main window controls; ignored it -# browser.interface is 'textual' -# +# control, otherwise they render the main window controls; =head1 NAME @@ -51,8 +46,6 @@ described at http://www.lon-capa.org. =over -=item show_course() - Little texts =item initlittle() @@ -120,11 +113,6 @@ The javascript is usually similar to "go =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() @@ -146,30 +134,155 @@ use Apache::lonlocal; use LONCAPA qw(:DEFAULT :match); use HTML::Entities(); -use vars qw(@desklines %category_names %category_members %category_positions $readdesk); - +use vars qw(@desklines %category_names %category_members %category_positions + $readdesk @primary_menu @secondary_menu); my @inlineremote; +sub prep_menuitem { + my ($menuitem) = @_; + return '' unless(ref($menuitem) eq 'ARRAY'); + my $link; + if ($$menuitem[1]) { # graphical Link + $link = "<img class=\"LC_noBorder\"" + . " src=\"" . &Apache::loncommon::lonhttpdurl($$menuitem[1]) . "\"" + . " alt=\"" . &mt($$menuitem[2]) . "\" />"; + } else { # textual Link + $link = &mt($$menuitem[3]); + } + return '<li><a href="'.$$menuitem[0].'">'.$link.'</a></li>'; +} + +# primary_menu() evaluates @primary_menu and returns XHTML for the menu +# that contains following links: +# 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; + # each element of @primary contains following array: + # (link url, icon path, alt text, link text, condition) + foreach my $menuitem (@primary_menu) { + # evaluate conditions + next if $$menuitem[4] eq 'nonewmsg' # show links depending on + && &Apache::lonmsg::mynewmail(); # whether a new msg + next if $$menuitem[4] eq 'newmsg' # arrived or not + && !&Apache::lonmsg::mynewmail(); # + next if $$menuitem[4] !~ /public/ ##we've a public user, + && $env{'user.name'} eq 'public' ##who should not see all + && $env{'user.domain'} eq 'public'; ##links + next if $$menuitem[4] eq 'onlypublic'# hide links which are + && $env{'user.name'} ne 'public' # only visible to public + && $env{'user.domain'} ne 'public'; # users + next if $$menuitem[4] eq 'roles' ##show links depending on + && &Apache::loncommon::show_course(); ##term 'Courses' or + next if $$menuitem[4] eq 'courses' ##'Roles' wanted + && !&Apache::loncommon::show_course(); ## + + + if ($$menuitem[3] eq 'Help') { # special treatment for helplink + $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>'; + } else { + if (ref($menuitem) eq 'ARRAY') { + my @items = @{$menuitem}; + $items[0] = 'javascript:'.$menuitem->[0].';'; + $menu .= &prep_menuitem(\@items); + } + } + } + return "<ol class=\"LC_primary_menu LC_right\">$menu</ol>"; +} -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; - } - } + +sub secondary_menu { + my $menu; + + my $crstype = &Apache::loncommon::course_type(); + my $canedit = &Apache::lonnet::allowed('mdc', $env{'request.course.id'}); + my $canviewgrps = &Apache::lonnet::allowed('vcg', $env{'request.course.id'} + . ($env{'request.course.sec'} ? "/$env{'request.course.sec'}" + : '')); + my $showlink = &show_return_link(); + my %groups = &Apache::lonnet::get_active_groups( + $env{'user.domain'}, $env{'user.name'}, + $env{'course.' . $env{'request.course.id'} . '.domain'}, + $env{'course.' . $env{'request.course.id'} . '.num'}); + foreach my $menuitem (@secondary_menu) { + # evaluate conditions + next if $$menuitem[4] ne 'always' + && !$env{'request.course.id'}; + next if $$menuitem[4] eq 'showreturn' + && !$showlink + && !($env{'request.state'} eq 'construct'); + next if $$menuitem[4] =~ /^mdc/ + && !$canedit; + next if $$menuitem[4] eq 'mdcCourse' + && $crstype eq 'Community'; + next if $$menuitem[4] eq 'mdcCommunity' + && $crstype ne 'Community'; + next if $$menuitem[4] =~ /^remotenav/ + && $env{'environment.remotenavmap'} ne 'on'; + next if $$menuitem[4] =~ /noremotenav/ + && $env{'environment.remotenavmap'} eq 'on'; + next if $$menuitem[4] =~ /showgroups$/ + && $canviewgrps + && !%groups; + + if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { + # special treatment for role selector + my $roles_selector = roles_selector( + $env{'course.' . $env{'request.course.id'} . '.domain'}, + $env{'course.' . $env{'request.course.id'} . '.num'} ); + + $menu .= $roles_selector ? "<li>$roles_selector</li>" + : ''; + } else { + if ($env{'environment.remotenavmap'} eq 'on') { + my @items = @{$menuitem}; + if ($menuitem->[4] eq 'remotenav') { + $items[0] = "javascript:gonav('$menuitem->[0]');"; + } else { + $items[0] = "javascript:go('$menuitem->[0]');"; + } + $menu .= &prep_menuitem(\@items); + } else { + $menu .= &prep_menuitem(\@$menuitem); + } + } } - return $course; + if ($menu =~ /\[url\].*\[symb\]/) { + my $escurl = &escape( &Apache::lonenc::check_encrypt( + $env{'request.noversionuri'})); + + my $escsymb = &escape( &Apache::lonenc::check_encrypt( + $env{'request.symb'})); + + if ( $env{'request.state'} eq 'construct' + and ( $env{'request.noversionuri'} eq '' + || !defined($env{'request.noversionuri'}))) + { + ($escurl = $env{'request.filename'}) =~ + s{^/home/([^/]+)/public_html/(.*)$}{/priv/$1/$2}; + + $escurl = &escape($escurl); + } + $menu =~ s/\[url\]/$escurl/g; + $menu =~ s/\[symb\]/$escsymb/g; + } + + return "<ul id=\"LC_secondary_menu\">$menu</ul>"; } + +# +# This routine returns a translated hash for the menu items in the top inline menu row +# Probably should be in mydesk.tab + +#SD this sub is deprecated - don't use it sub initlittle { return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', - 'nav' => 'Navigate Contents', + 'nav' => 'Course Contents', 'main' => 'Main Menu', 'roles' => (&Apache::loncommon::show_course()? 'Courses':'Roles'), @@ -183,10 +296,14 @@ sub initlittle { ); } +#SD this sub is deprecated - don't use it +#SD functionality is covered by new loncommon::bodytag and primary_menu(), secondary_menu() sub menubuttons { my $forcereg=shift; - my $registration=shift; my $titletable=shift; +# +# Early-out for pages that should not have a menu, triggered by query string "inhibitmenu=yes" +# &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); if (($env{'form.inhibitmenu'} eq 'yes') || @@ -203,14 +320,20 @@ sub menubuttons { my $role_selector; my $showgroups=0; my ($cnum,$cdom); +# +# if the URL is hidden, symbs and the non-versioned version of the URL would be encrypted +# my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); 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') { +# +# We are in construction space +# if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { my $returnurl = $env{'request.filename'}; $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; @@ -218,6 +341,9 @@ sub menubuttons { } } if ($env{'request.course.id'}) { +# +# We are in a course +# $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my %coursegroups; @@ -235,78 +361,28 @@ sub menubuttons { } } - if ($env{'browser.interface'} eq 'textual') { -# Textual display only - if ($env{'request.course.id'}) { - $navmaps=(<<ENDNAV); -<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a> -ENDNAV - if (&show_return_link()) { - my $escreload=&escape('return:'); - $reloadlink=(<<ENDRELOAD); -<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> -ENDDOCS - } - if ($showgroups) { - $groups =(<<ENDGROUPS); -<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a> -ENDGROUPS - } - } - my $form=&serverform(); - my $utility=&utilityfunctions(); - my $output=(<<ENDMAINMENU); -<script type="text/javascript"> -// BEGIN LON-CAPA Internal -$utility -</script> -<div id="LC_top_nav"> -<a href="/adm/menu" target="_top">$lt{'main'}</a> -$reloadlink $navmaps $docs $groups $roles -<a href="/adm/logout" target="_top">$lt{'exit'}</a> -</div> -<br /> -<script type="text/javascript"> -// END LON-CAPA Internal -</script> -$form -ENDMAINMENU - if ($registration) { $output.=&innerregister($forcereg); } - return $output."<hr />"; - } elsif ($env{'environment.remote'} eq 'off') { + if ($env{'environment.remote'} eq 'off') { # Remote Control is switched off # figure out colors - my %lt=&initlittle(); + my %lt=&initlittle(); my $domain=&Apache::loncommon::determinedomain(); - my $function =&Apache::loncommon::get_users_function(); + my $function=&Apache::loncommon::get_users_function(); my $link=&Apache::loncommon::designparm($function.'.link',$domain); my $alink=&Apache::loncommon::designparm($function.'.alink',$domain); my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain); my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain); - if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { - return (<<ENDINLINEMENU); - <table id="LC_top_nav"> - <tr> - $logo - <td></td> - <td class="LC_top_nav_login"> - <a href="/adm/roles" target="_top">$lt{'login'}</a> - </td> - </tr> - </table> -</font> + + if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { + return (<<ENDINLINEMENU); + <ol class="LC_primary_menu LC_right"> + <li>$logo</li> + <li><a href="/adm/roles" target="_top">$lt{'login'}</a></li> + </ol> + <hr /> 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,45 +391,48 @@ 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 = + 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); -<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=''; - if ($registration) { - $reg=&innerregister($forcereg,$titletable); - } - my $form=&serverform(); - my $utility=&utilityfunctions(); + my $reg = $forcereg ? &innerregister($forcereg,$titletable) : ''; + my $form = &serverform(); + my $utility = &utilityfunctions(); + + #Prepare the message link that indicates the arrival of new mail + my $messagelink = &Apache::lonmsg::mynewmail() ? "Message (new)" : "Message"; + $messagelink = '<a href="javascript:go(\'/adm/communicate\');">' + . mt($messagelink) .'</a>'; - my $helplink=&Apache::loncommon::top_nav_help('Help'); + my $helplink = &Apache::loncommon::top_nav_help('Help'); return (<<ENDINLINEMENU); <script type="text/javascript"> // <![CDATA[ @@ -361,19 +440,21 @@ ENDCRELOAD $utility // ]]> </script> -<table id="LC_top_nav"> -<tr> -$logo -<td><a href="/adm/menu" target="_top">$lt{'main'}</a></td> +<ol class="LC_primary_menu 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> +<ul id="LC_secondary_menu"> +<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 +</ul> $form <script type="text/javascript"> // END LON-CAPA Internal @@ -407,16 +488,19 @@ sub registerurl { if ($env{'request.state'} eq 'construct') { $force_title=&Apache::lonxml::display_title(); } - if (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off') || + if (($env{'environment.remote'} eq 'off') || ((($env{'request.publicaccess'}) || (!&Apache::lonnet::is_on_map( &unescape($env{'request.noversionuri'})))) && (!$forcereg))) { - return $result. - '<script type="text/javascript">'."\n". - 'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n". - '</script>'.$force_title; + return + $result + .'<script type="text/javascript">'."\n" + .'// <![CDATA['."\n" + .'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n" + .'// ]]>'."\n" + .'</script>' + .$force_title; } # Graphical display after login only if ($env{'request.registered'} && !$forcereg) { return ''; } @@ -435,57 +519,59 @@ sub innerregister { $env{'request.registered'} = 1; - my $textinter=($env{'browser.interface'} eq 'textual'); - my $noremote=($env{'environment.remote'} eq 'off'); + my $noremote = ($env{'environment.remote'} eq 'off'); - my $textual=($textinter || $noremote); - undef(@inlineremote); my $reopen=&Apache::lonmenu::reopenmenu(); my $newmail=''; - if ($noremote) { - $newmail='<table id="LC_nav_location"><tr>'; - } - if (&Apache::lonmsg::newmail()) { - if ($textual) { - $newmail.= '<td class="LC_new_mail"> - <a href="/adm/communicate" target="_top">'. - &mt('You have new messages').'</a></td>'; - } else { - $newmail= 'swmenu.setstatus("you have","messages");'; - } + + if (&Apache::lonmsg::newmail() && !$noremote) { + # We have new mail and remote is up + $newmail= 'swmenu.setstatus("you have","messages");'; } - if (($textual) + + my ($breadcrumb,$separator); + if ($noremote && ($env{'request.symb'}) && ($env{'request.course.id'})) { - $newmail.= '<td class="LC_current_location">'; - my ($mapurl,$rid,$resurl)= - &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); - 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') && ($maptitle ne $coursetitle)) { - $newmail.=', '.$maptitle; - } - if ($restitle) { - $newmail.=': '.$restitle; + + my ($mapurl,$rid,$resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); + my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'}; + + my $maptitle = &Apache::lonnet::gettitle($mapurl); + my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread()); + my @crumbs = ({text => "Course Contents", + href => "Javascript:gonav('/adm/navmaps')"}); + + if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { + push(@crumbs, {text => '...', + no_mt => 1}); + } + + push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle + && $maptitle ne 'default.sequence' + && $maptitle ne $coursetitle); + + push @crumbs, {text => $restitle, no_mt => 1} if $restitle; + + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb(@crumbs); + $breadcrumb .= &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0); + unless (($env{'request.state'} eq 'edit') || ($newmail) || + ($env{'request.state'} eq 'construct') || + ($env{'form.register'})) { + $separator = &Apache::loncommon::head_subbox(); } - $newmail.=' </td>'; + # } if ($env{'request.state'} eq 'construct') { $newmail = $titletable; - } else { - if ($noremote) { - $newmail.='</tr></table>'; - } - } - my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); - my $tablestart=($noremote?'<table id="LC_menubuttons">':''). - ($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':''); - my $tableend=($noremote?'</table>':'').($textinter?'<a name="content" />':''); + } + my $timesync = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' ); + my $tablestart = ( $noremote ? '<table id="LC_menubuttons">' : ''); + my $tableend = ( $noremote ? '</table>' : ''); # ============================================================================= # ============================ This is for URLs that actually can be registered if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) { @@ -529,6 +615,9 @@ sub innerregister { } if ($env{'user.author'}) { if ($env{'request.role'}=~/^(aa|ca|au)/) { +# +# We have the role of an author +# # Set defaults for authors my ($top,$bottom) = ('con-','struct'); my $action = "go('/priv/".$env{'user.name'}."');"; @@ -557,6 +646,11 @@ sub innerregister { $noeditbutton = 0; } } +# +# We are an author for some stuff, but currently do not have the role of author. +# Figure out if we have authoring privileges for the resource we are looking at. +# This should maybe become a privilege check in lonnet +# ## ## Determine if user can edit url. ## @@ -566,19 +660,24 @@ sub innerregister { my $uploaded; if ($env{'request.filename'}) { my $file=&Apache::lonnet::declutter($env{'request.filename'}); - $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; - # Check that the user has permission to edit this resource - ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); - if (defined($cfudom)) { - my $home=&Apache::lonnet::homeserver($cfuname,$cfudom); - my $allowed=0; - my @ids=&Apache::lonnet::current_machine_ids(); - foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } - if ($allowed) { - $cfile=$file; + if (defined($cnum) && defined($cdom)) { + $uploaded = &is_course_upload($file,$cnum,$cdom); + } + if (!$uploaded) { + $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; + # Check that the user has permission to edit this resource + ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); + if (defined($cfudom)) { + my $home=&Apache::lonnet::homeserver($cfuname,$cfudom); + my $allowed=0; + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } + if ($allowed) { + $cfile=$file; + } } } - } + } # Finally, turn the button on or off if ($cfile && !$const_space) { $editbutton=&switch @@ -589,7 +688,7 @@ sub innerregister { $editbutton=&clear(6,1); } } - if (($noeditbutton) && ($env{'request.filename'})) { + 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)) { @@ -610,15 +709,21 @@ sub innerregister { # Prepare the rest of the buttons my $menuitems; if ($const_space) { +# +# We are in construction space +# my ($uname,$thisdisfn) = ($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); my $currdir = '/priv/'.$uname.'/'.$thisdisfn; if ($currdir =~ m-/$-) { $is_const_dir = 1; } else { - $currdir =~ s#[^/]+$##; + $currdir =~ s|[^/]+$||; my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); my $esc_currdir = &Apache::loncommon::escape_single($currdir); +# +# Probably should be in mydesk.tab +# $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 @@ -629,6 +734,10 @@ ENDMENUITEMS } } elsif ( defined($env{'request.course.id'}) && $env{'request.symb'} ne '' ) { +# +# We are in a course and looking at a registred URL +# Should probably be in mydesk.tab +# $menuitems=(<<ENDMENUITEMS); c&3&1 s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&&1 @@ -652,7 +761,7 @@ if(length($annotation) > 0){ $menuitems.="&anno-[_1]&tations[_1]&annotate()&"; $menuitems.="Make notes and annotations about this resource&&1\n"; - unless ($noremote) { + unless ($noremote) { my $showreqcrs = &check_for_rcrs(); if ($showreqcrs) { $menuitems.="s&8&1&rcrs.gif&request[_1]&course[_16]". @@ -695,16 +804,12 @@ ENDMENUITEMS } } - if ($textual) { + if ($noremote) { my $addremote=0; - foreach (@inlineremote) { if ($_ ne '') { $addremote=1; } } + foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } my $inlinebuttons=''; if ($addremote) { -# Registered, textual output - if ($env{'browser.interface'} eq 'textual') { - $inlinebuttons= - join('',map { (defined($_)?$_:'') } @inlineremote); - } else { + # Registered, textual output if ($env{'environment.icons'} eq 'iconsonly') { $inlinebuttons=(<<ENDARROWSINLINE); <tr><td> @@ -736,17 +841,18 @@ ENDLINE } } } - } } $result =(<<ENDREGTEXT); <script type="text/javascript"> // BEGIN LON-CAPA Internal </script> $timesync +$breadcrumb $tablestart $inlinebuttons $tableend $newmail +$separator <script type="text/javascript"> // END LON-CAPA Internal </script> @@ -807,9 +913,9 @@ ENDREGTHIS # ============================================================================= } else { # ========================================== This can or will not be registered - if ($textual) { -# Not registered, textual - $result= (<<ENDDONOTREGTEXT); + if ($noremote) { +# Not registered + $result= (<<ENDDONOTREGTEXT); ENDDONOTREGTEXT } else { # Not registered, graphical @@ -901,8 +1007,7 @@ sub unloadevents() { sub startupremote { my ($lowerurl)=@_; - if (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { + if ($env{'environment.remote'} eq 'off') { return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />'); } # @@ -963,6 +1068,7 @@ function main() { timestart=date.getTime(); wait(); } + // ]]> </script> ENDREMOTESTARTUP @@ -980,8 +1086,7 @@ ENDSETFLAGS } sub maincall() { - if (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { return ''; } + if ($env{'environment.remote'} eq 'off') { return ''; } return(<<ENDMAINCALL); <script type="text/javascript"> // <![CDATA[ @@ -994,13 +1099,12 @@ ENDMAINCALL sub load_remote_msg { my ($lowerurl)=@_; - if (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { return ''; } + if ($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('[_1]Continue[_2] on in Inline Menu mode' + ,'<a href="/adm/remote?action=collapse&url='.$esclowerurl.'">' + ,'</a>'); return(<<ENDREMOTEFORM); <p> <form name="wheel"> @@ -1019,8 +1123,7 @@ sub get_menu_name { sub reopenmenu { - if (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { return ''; } + if ($env{'environment.remote'} eq 'off') { return ''; } my $menuname = &get_menu_name(); my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); return('window.open('.$nothing.',"'.$menuname.'","",false);'); @@ -1029,14 +1132,13 @@ sub reopenmenu { 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>'; + if ($env{'environment.remote'} eq 'off') { + return + '<script type="text/javascript">'."\n" + .'// <![CDATA['."\n" + .'self.name="loncapaclient";'."\n" + .'// ]]>'."\n" + .'</script>'; } my $menuname = &get_menu_name(); @@ -1052,7 +1154,7 @@ sub open { $returnval=(<<ENDOPEN); // <![CDATA[ window.status='Opening LON-CAPA Remote Control'; -var menu=window.open("/res/adm/pages/menu.html","$menuname", +var menu=window.open("/res/adm/pages/menu.html?inhibitmenu=yes","$menuname", "height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5"); self.name='loncapaclient'; // ]]> @@ -1065,8 +1167,8 @@ ENDOPEN sub clear { my ($row,$col)=@_; - unless (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { + unless ($env{'environment.remote'} eq 'off') { + if (($row<1) || ($row>13)) { return ''; } return "\n".qq(window.status+='.';swmenu.clearbut($row,$col);); } else { $inlineremote[10*$row+$col]=''; @@ -1091,23 +1193,11 @@ sub switch { my $idx=10*$row+$col; $category_members{$cat}.=':'.$idx; - unless (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { + unless ($env{'environment.remote'} eq 'off') { + if (($row<1) || ($row>13)) { return ''; } # Remote return "\n". qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc");); - } elsif ($env{'browser.interface'} eq 'textual') { -# Accessibility - if ($nobreak==2) { return ''; } - my $text=$top.' '.$bot; - $text=~s/\s*\-\s*//gs; - if ($nobreak) { - $inlineremote[$idx]= - '<a href="javascript:'.$act.';">'.$text.'</a>'; - } else { - $inlineremote[$idx]="\n<br />". - $desc.' <a href="javascript:'.$act.';">'.$text.'</a>'; - } } else { # Inline Remote if ($env{'environment.icons'} ne 'classic') { @@ -1120,22 +1210,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 +# Main Menu 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>'; @@ -1170,8 +1260,7 @@ sub secondlevel { sub openmenu { my $menuname = &get_menu_name(); - if (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { return ''; } + if ($env{'environment.remote'} eq 'off') { return ''; } my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); return "window.open(".$nothing.",'".$menuname."');"; } @@ -1179,6 +1268,7 @@ sub openmenu { sub inlinemenu { undef(@inlineremote); undef(%category_members); +# calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control &rawconfig(1); my $output='<table id="LC_mainmenu"><tr>'; for (my $col=1; $col<=2; $col++) { @@ -1186,10 +1276,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_Box">'; + $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 +1290,7 @@ sub inlinemenu { $output.=$inlineremote[$item]; } $output.='</table>'; - $output.='</fieldset>'; + $output.='</div>'; } } $output.="</td>"; @@ -1210,10 +1300,14 @@ sub inlinemenu { } sub rawconfig { +# +# This evaluates mydesk.tab +# Need to add more positions and more privileges to deal with all +# menu items. +# my $textualoverride=shift; my $output=''; - unless (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { + unless ($env{'environment.remote'} eq 'off') { $output.= "window.status='Opening Remote Control';var swmenu=".&openmenu(). "\nwindow.status='Configuring Remote Control ';"; @@ -1245,9 +1339,6 @@ sub rawconfig { $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') { @@ -1342,11 +1433,9 @@ 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') || - ($env{'environment.remote'} eq 'off')) { + unless ($env{'environment.remote'} eq 'off') { $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';"; if (&Apache::lonmsg::newmail()) { $output.='swmenu.setstatus("you have","messages");'; @@ -1381,8 +1470,7 @@ sub check_for_rcrs { # ======================================================================= Close sub close { - if (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { return ''; } + if ($env{'environment.remote'} eq 'off') { return ''; } my $menuname = &get_menu_name(); return(<<ENDCLOSE); <script type="text/javascript"> @@ -1426,9 +1514,16 @@ NAVCONTROL sub utilityfunctions { my $caller = shift; - unless (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; } + unless ($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'}); @@ -1546,7 +1641,7 @@ function catalog_info() { } function chat_win() { - lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no'); + lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); } function group_chat(group) { @@ -1586,7 +1681,7 @@ function set_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 ' + +'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" ' @@ -1640,19 +1735,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 '') { @@ -1667,18 +1749,17 @@ sub hidden_button_check { sub roles_selector { my ($cdom,$cnum) = @_; - my $crstype = &Apache::loncommon::course_type(); + my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}; + if ($crstype eq '') { + $crstype = 'Course'; + } 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 ($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))) { @@ -1706,7 +1787,7 @@ sub roles_selector { } if (ref($courseroles{$role}) eq 'ARRAY') { if ($sec ne '') { - if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) { + if (!grep(/^\Q$sec\E$/,@{$courseroles{$role}})) { push(@{$courseroles{$role}},$sec); $seccount{$role} ++; } @@ -1727,8 +1808,7 @@ sub roles_selector { } 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"> @@ -1736,7 +1816,7 @@ sub roles_selector { $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>'; + $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; } } foreach my $role (sort(keys(%courseroles))) { @@ -1746,7 +1826,7 @@ sub roles_selector { } $role_selector .= '</select>'."\n". '<input type="hidden" name="destinationurl" value="'. - &HTML::Entities::encode($ENV{'REQUEST_URI'},'"<>&').'" />'."\n". + &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". @@ -1760,11 +1840,11 @@ sub get_all_courseroles { unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH')) { return; } - my ($result,$cached) = + 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') && + if ((ref($result->{'roles'}) eq 'HASH') && (ref($result->{'seccount'}) eq 'HASH')) { %{$courseroles} = %{$result->{'roles'}}; %{$seccount} = %{$result->{'seccount'}}; @@ -1783,7 +1863,7 @@ sub get_all_courseroles { } if (ref($courseroles->{$urole}) eq 'ARRAY') { if ($usec ne '') { - if (!grep(/^\Q$usec\E$/,@{$courseroles->{$urole}})) { + if (!grep(/^Q$usec\E$/,@{$courseroles->{$urole}})) { push(@{$courseroles->{$urole}},$usec); $seccount->{$urole} ++; } @@ -1800,7 +1880,7 @@ sub get_all_courseroles { @{$courseroles->{'st'}} = (); if (keys(%sections_count) > 0) { push(@{$courseroles->{'st'}},keys(%sections_count)); - $seccount->{'st'} = scalar(keys(%sections_count)); + $seccount->{'st'} = scalar(keys(%sections_count)); } my $rolehash = { 'roles' => $courseroles, @@ -1924,34 +2004,34 @@ END BEGIN { if (! defined($readdesk)) { - { - my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab'; - if ( CORE::open( my $config,"<$tabfile") ) { - while (my $configline=<$config>) { - $configline=(split(/\#/,$configline))[0]; - $configline=~s/^\s+//; - chomp($configline); + { + my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab'; + if ( CORE::open( my $config,"<$tabfile") ) { + while (my $configline=<$config>) { + $configline=(split(/\#/,$configline))[0]; + $configline=~s/^\s+//; + chomp($configline); if ($configline=~/^cat\:/) { - my @entries=split(/\:/,$configline); - $category_positions{$entries[2]}=$entries[1]; - $category_names{$entries[2]}=$entries[3]; - } elsif ($configline) { - push(@desklines,$configline); - } - } - CORE::close($config); - } - } - $readdesk='done'; + my @entries=split(/\:/,$configline); + $category_positions{$entries[2]}=$entries[1]; + $category_names{$entries[2]}=$entries[3]; + } elsif ($configline=~/^prim\:/) { + my @entries = (split(/\:/, $configline))[1..5]; + push @primary_menu, \@entries; + } elsif ($configline=~/^scnd\:/) { + my @entries = (split(/\:/, $configline))[1..5]; + push @secondary_menu, \@entries; + } elsif ($configline) { + push(@desklines,$configline); + } + } + CORE::close($config); + } + } + $readdesk='done'; } } 1; __END__ - - - - - -