--- loncom/interface/lonmenu.pm 2006/03/16 22:21:15 1.167 +++ loncom/interface/lonmenu.pm 2006/08/14 09:28:56 1.204 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.167 2006/03/16 22:21:15 albertel Exp $ +# $Id: lonmenu.pm,v 1.204 2006/08/14 09:28:56 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,19 +40,19 @@ package Apache::lonmenu; use strict; use Apache::lonnet; -use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::lonenc(); use Apache::lonlocal; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; use vars qw(@desklines $readdesk); my @inlineremote; -my $font; -my $tabbg; -my $pgbg; + + # ================================================================ Little texts @@ -64,44 +64,53 @@ sub initlittle { 'Roles':'Courses'), 'docs' => 'Course Documents', 'exit' => 'Exit', + 'login' => 'Log In', 'launch' => 'Launch Remote Control', - 'groups' => 'Groups'); + 'groups' => 'Groups', + 'gdoc' => 'Group Documents', + ); } # ============================= This gets called at the top of the body section sub menubuttons { my $forcereg=shift; - my $target =shift; my $registration=shift; my $titletable=shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); if (($env{'form.inhibitmenu'} eq 'yes') || ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; } + + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } + my %lt=&initlittle(); my $navmaps=''; my $reloadlink=''; my $docs=''; my $groups=''; my $showgroups=0; - my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); - my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); - my $face= 'face="Arial,Helvetica,sans-serif"'; + 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>'; + if ($env{'request.state'} eq 'construct') { if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { my $returnurl = $env{'request.filename'}; $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; - $escurl = &Apache::lonnet::escape($returnurl); + $escurl = &escape($returnurl); } } if ($env{'request.course.id'}) { my %coursegroups; - my $viewgrps_permission = - &Apache::lonnet::allowed('vcg',$env{'request.course.id'}); + my $viewgrps_permission = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); if (!$viewgrps_permission) { %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); - } + } if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) { $showgroups = 1; } @@ -109,30 +118,26 @@ sub menubuttons { if ($env{'browser.interface'} eq 'textual') { # Textual display only - $pgbg='#FFFFFF'; - $tabbg='#FFFFFF'; - $font='#000000'; if ($env{'request.course.id'}) { $navmaps=(<<ENDNAV); -<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a> +<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a> ENDNAV if (($env{'request.noversionuri'}=~/^\/adm\//) && ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { - my $escreload=&Apache::lonnet::escape('return:'); + my $escreload=&escape('return:'); $reloadlink=(<<ENDRELOAD); -<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a> +<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a> ENDRELOAD } if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { $docs=(<<ENDDOCS); -<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a> +<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a> ENDDOCS } if ($showgroups) { $groups =(<<ENDGROUPS); -<td bgcolor="$tabbg"> -<a href="/adm/coursegroups" target="_top"><font $face color="$font">$lt{'groups'}</font></a></td> +<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a> ENDGROUPS } } @@ -143,55 +148,41 @@ ENDGROUPS // BEGIN LON-CAPA Internal $utility </script> +<div id="LC_top_nav"> <a href="/adm/menu" target="_top">$lt{'main'}</a> $reloadlink $navmaps $docs $groups -<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a> -<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a> +<a href="/adm/roles" target="_top">$lt{'roles'}</a> +<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,$target); } + if ($registration) { $output.=&innerregister($forcereg); } return $output."<hr />"; } elsif ($env{'environment.remote'} eq 'off') { # Remote Control is switched off # figure out colors my %lt=&initlittle(); - my $function='student'; - if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { - $function='coordinator'; - } - if ($env{'request.role'}=~/^(su|dc|ad|li)/) { - $function='admin'; - } - if (($env{'request.role'}=~/^(au|ca)/) || - ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) { - $function='author'; - } + my $domain=&Apache::loncommon::determinedomain(); - $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); - $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); - $font=&Apache::loncommon::designparm($function.'.font',$domain); + 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') { - my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); return (<<ENDINLINEMENU); -<font face="Arial,Helvetica,sans-serif"> - <table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1"> + <table id="LC_top_nav"> <tr> - <td bgcolor="$tabbg"> - <a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a> - </td> - <td align="right" bgcolor="$tabbg"> - <img align="right" src="$logo" alt="Logo" /> - <b>LON-CAPA</b> + $logo + <td></td> + <td class="LC_top_nav_login"> + <a href="/adm/roles" target="_top">$lt{'login'}</a> </td> - </tr> + </tr> </table> </font> ENDINLINEMENU @@ -204,19 +195,18 @@ ENDINLINEMENU $link="javascript:gonav('".$link."')"; } $navmaps=(<<ENDNAV); -<td bgcolor="$tabbg"> -<a href="$link" target="_top"><font $face color="$font">$lt{'nav'}</font></a></td> +<td><a href="$link" target="_top">$lt{'nav'}</a></td> ENDNAV +my $is_group = (&Apache::loncommon::course_type() eq 'Group'); if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'}; $docs=(<<ENDDOCS); -<td bgcolor="$tabbg"> -<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a></td> +<td><a href="/adm/coursedocs" target="_top">$text</a></td> ENDDOCS } if ($showgroups) { $groups =(<<ENDGROUPS); -<td bgcolor="$tabbg"> -<a href="/adm/coursegroups" target="_top"><font $face color="$font">$lt{'groups'}</font></a></td> +<td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td> ENDGROUPS } if ( @@ -229,28 +219,30 @@ ENDGROUPS m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) ) ) { - my $escreload=&Apache::lonnet::escape('return:'); + my $escreload=&escape('return:'); $reloadlink=(<<ENDRELOAD); -<td bgcolor="$tabbg"> -<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td> +<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td> ENDRELOAD } } if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { - my $escreload=&Apache::lonnet::escape('return:'); + my $escreload=&escape('return:'); $reloadlink=(<<ENDCRELOAD); -<td bgcolor="$tabbg"> -<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td> +<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td> ENDCRELOAD } my $reg=''; if ($registration) { - $reg=&innerregister($forcereg,$target,$titletable); + $reg=&innerregister($forcereg,$titletable); } my $form=&serverform(); my $utility=&utilityfunctions(); - my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); + 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); <script type="text/javascript"> // BEGIN LON-CAPA Internal @@ -258,30 +250,21 @@ ENDCRELOAD $utility // ]]> </script> -<table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1"> +<table id="LC_top_nav"> <tr> -<td bgcolor="$tabbg"> -<a href="/adm/menu" target="_top"><font $face color="$font">$lt{'main'}</font></a> -</td> +$logo +<td><a href="/adm/menu" target="_top">$lt{'main'}</a></td> $reloadlink $navmaps $docs $groups -<td bgcolor="$tabbg"> -<a href="/adm/remote?action=launch&url=$escurl" target="_top"> -<font $face color="$font">$lt{'launch'}</font></a></td> -<td bgcolor="$tabbg"> -<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a> -</td> -<td bgcolor="$tabbg"> -<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a> -</td> -<td bgcolor="$tabbg"> -<img align="right" src="$logo" alt="Logo" /> -<b>LON-CAPA</b></td> -$form +$remote +<td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td> +<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> +$form <script type="text/javascript"> // END LON-CAPA Internal </script> @@ -295,34 +278,25 @@ ENDINLINEMENU # ====================================== This gets called in the header section sub registerurl { - my $forcereg=shift; - my $target = shift; + my ($forcereg) = @_; my $result = ''; - if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } my $force_title=''; if ($env{'request.state'} eq 'construct') { $force_title=&Apache::lonxml::display_title(); } - if ($target eq 'edit') { - $result .="<script type=\"text/javascript\">\n". - "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n". - &Apache::loncommon::browser_and_searcher_javascript(). - "\n</script>\n"; - } if (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off') || ((($env{'request.publicaccess'}) || (!&Apache::lonnet::is_on_map( - &Apache::lonnet::unescape($env{'request.noversionuri'})))) && + &unescape($env{'request.noversionuri'})))) && (!$forcereg))) { return $result. '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title; } # Graphical display after login only - if ($Apache::lonxml::registered && !$forcereg) { return ''; } - if ($target ne 'edit') { - $result.=&innerregister($forcereg,$target); - } + if ($env{'request.registered'} && !$forcereg) { return ''; } + $result.=&innerregister($forcereg); return $result.$force_title; } @@ -330,33 +304,41 @@ sub registerurl { # =========== and in the body of the document sub innerregister { - my $forcereg=shift; - my $target = shift; - my $titletable = shift; + my ($forcereg, $titletable) = @_; my $result = ''; my ($uname,$thisdisfn); my $const_space = ($env{'request.state'} eq 'construct'); my $is_const_dir = 0; - if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - $Apache::lonxml::registered=1; + $env{'request.registered'} = 1; my $textinter=($env{'browser.interface'} eq 'textual'); my $noremote=($env{'environment.remote'} eq 'off'); my $textual=($textinter || $noremote); - @inlineremote=(); - undef @inlineremote; + undef(@inlineremote); my $reopen=&Apache::lonmenu::reopenmenu(); my $newmail=''; if ($noremote) { - $newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'"><font face="Arial,Helvetica,sans-serif">'; + $newmail='<table id="LC_nav_location"><tr>'; } - if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) { + 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");'; + } + } elsif (($textual) + && ($env{'request.symb'}) + && ($env{'request.course.id'})) { + $newmail.= '<td class="LC_current_location">'; my ($mapurl,$rid,$resurl)= &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'}; @@ -368,23 +350,19 @@ sub innerregister { if ($restitle) { $newmail.=': '.$restitle; } - $newmail.=' '; - } - if (&Apache::lonmsg::newmail()) { - $newmail=($textual? - '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />': - 'swmenu.setstatus("you have","messages");'); + $newmail.=' </td>'; } if ($env{'request.state'} eq 'construct') { $newmail = $titletable; } else { if ($noremote) { - $newmail.='</font></td></tr></table>'; + $newmail.='</tr></table>'; } } my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); - my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':''); - my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':''); + 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" />':''); # ============================================================================= # ============================ This is for URLs that actually can be registered if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) { @@ -412,7 +390,7 @@ sub innerregister { &Apache::lonnet::allowed('opa',$crs)) { $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]', "gocmd('/adm/parmset','set')", - 'Modify deadlines, etc, for this resource'); + 'Modify parameter settings for this resource'); } # -- End Homework ### @@ -471,10 +449,7 @@ sub innerregister { ('','',6,1,'cstr.gif','edit[_1]','resource[_2]', "go('".$cfile."');","Edit this resource"); } elsif ($editbutton eq '') { - $editbutton=&switch('','',6,1,'port.gif', - 'port-[_1]','folio[_1]', - "go('/adm/portfolio');", - "Enter my portfolio space"); + $editbutton=&clear(6,1); } } ### @@ -489,16 +464,17 @@ sub innerregister { $is_const_dir = 1; } else { $currdir =~ s#[^/]+$##; + my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); $menuitems=(<<ENDMENUITEMS); s&6&1&list.gif&list[_1]&dir[_1]&golist('$currdir')&List current directory -s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retrieve old version -s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$thisdisfn')&Publish this resource -s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$thisdisfn')&Delete this resource -s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document +s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version +s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource +s&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 } - } elsif (defined($env{'request.course.id'}) && - $env{'request.symb'} ne '') { + } elsif ( defined($env{'request.course.id'}) && + $env{'request.symb'} ne '' ) { $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 @@ -507,8 +483,8 @@ c&6&3 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&2 -s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2 +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 unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { $menuitems.=(<<ENDREALRES); @@ -518,6 +494,11 @@ s&8&2&fdbk.gif&feedback[_1]&discuss[_1]& ENDREALRES } } + if ($env{'request.uri'} =~ /^\/res/) { + $menuitems .= (<<ENDMENUITEMS); +s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document +ENDMENUITEMS + } my $buttons=''; foreach (split(/\n/,$menuitems)) { my ($command,@rest)=split(/\&/,$_); @@ -565,7 +546,7 @@ ENDREGTEXT # Registered, graphical output } else { my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); - $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri)); + $requri=&Apache::lonenc::check_encrypt(&unescape($requri)); my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); my $navstatus=&get_nav_status(); my $clearcstr; @@ -658,13 +639,13 @@ ENDDONOTREGTHIS sub loadevents() { if ($env{'request.state'} eq 'construct' || - $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } return 'LONCAPAreg();'; } sub unloadevents() { if ($env{'request.state'} eq 'construct' || - $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } return 'LONCAPAstale();'; } @@ -680,7 +661,7 @@ sub startupremote { # The Remote actually gets launched! # my $configmenu=&rawconfig(); - my $esclowerurl=&Apache::lonnet::escape($lowerurl); + my $esclowerurl=&escape($lowerurl); my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); return(<<ENDREMOTESTARTUP); <script type="text/javascript"> @@ -763,9 +744,9 @@ sub load_remote_msg { if (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off')) { return ''; } - my $esclowerurl=&Apache::lonnet::escape($lowerurl); + my $esclowerurl=&escape($lowerurl); my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode', - "/adm/remote?action=collapse?url=$esclowerurl"); + "/adm/remote?action=collapse&url=$esclowerurl"); return(<<ENDREMOTEFORM); <p> <form name="wheel"> @@ -806,7 +787,7 @@ ENDRESIZE $returnval.=(<<ENDOPEN); window.status='Opening LON-CAPA Remote Control'; var menu=window.open("/res/adm/pages/menu.html","$menuname", -"height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5"); +"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>'; @@ -838,6 +819,7 @@ sub switch { $bot=&mt($bot); $desc=&mt($desc); $img=&mt($img); + unless (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off')) { # Remote @@ -864,34 +846,33 @@ sub switch { my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } my $pic= - '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}. + '<img alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}. ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'. ($nobreak==3?'right':'left').'" />'; - if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) { + if ($env{'browser.interface'} eq 'faketextual') { # Accessibility if ($nobreak==3) { $inlineremote[10*$row+$col]="\n". - '<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text. - '</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'. + '<td class="LC_menubuttons_text" align="right">'.$text. + '</td><td class="LC_menubuttons_img" align="left">'. '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>'; } elsif ($nobreak) { $inlineremote[10*$row+$col]="\n<tr>". - '<td width="10%" align="left" bgcolor="'.$tabbg.'">'. - '<a href="javascript:'.$act.';">'.$pic. - '</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>'; + '<td class="LC_menubuttons_img" align="left">'. + '<a href="javascript:'.$act.';">'.$pic.'</a></td> + <td class="LC_menubuttons_text" align="left">'.$text.'</td>'; } else { $inlineremote[10*$row+$col]="\n<tr>". - '<td width="10%" align="left" bgcolor="'.$tabbg.'">'. + '<td class="LC_menubuttons_img" align="left">'. '<a href="javascript:'.$act.';">'.$pic. - '</a></td><td colspan="3"><font color="'.$font.'">'.$desc. - '</font></td></tr>'; + '</a></td><td class="LC_menubuttons_text" colspan="3">'. + $desc.'</td></tr>'; } } else { # Inline Menu $inlineremote[10*$row+$col]= '<a href="javascript:'.$act.';">'.$pic. - '</a><font color="'.$font.'" size="2">'.$desc. - '</font>'; + '</a><span class="LC_menubuttons_inline_text">'.$desc.'</span>'; } } return ''; @@ -953,12 +934,16 @@ sub rawconfig { my $con=($env{'request.state'} eq 'construct'); my $rol=$env{'request.role'}; my $requested_domain = $env{'request.role.domain'}; - foreach (@desklines) { - my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_); + foreach my $line (@desklines) { + my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$line); $prt=~s/\$uname/$uname/g; $prt=~s/\$udom/$udom/g; $prt=~s/\$crs/$crs/g; $prt=~s/\$requested_domain/$requested_domain/g; + 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') { @@ -1079,10 +1064,28 @@ 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])); - $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl)); + $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl)); my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); my $nav_control=&nav_control_js(); + + my $start_page_annotate = + &Apache::loncommon::start_page('Annotator',undef, + {'only_body' => 1, + 'js_ready' => 1, + 'bgcolor' => '#BBBBBB', + 'add_entries' => { + 'onload' => 'javascript:document.goannotate.submit();'}}); + + my $start_page_bookmark = + &Apache::loncommon::start_page('Bookmarks',undef, + {'only_body' => 1, + 'js_ready' => 1, + 'bgcolor' => '#BBBBBB',}); + + my $end_page = + &Apache::loncommon::end_page({'js_ready' => 1}); + return (<<ENDUTILITY) var currentURL="$currenturl"; @@ -1177,6 +1180,55 @@ 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'); } + +function group_chat(group) { + var url = '/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'); +} + +function edit_bookmarks() { + go(''); + w_BookmarkPal_flag=1; + bookmarkpal=window.open("/adm/bookmarks", + "BookmarkPal", "width=400,height=505,scrollbars=0"); +} + +function annotate() { + w_Annotator_flag=1; + annotator=window.open('','Annotator','width=365,height=265,scrollbars=0'); + annotator.document.write( + '$start_page_annotate' + +"<form name='goannotate' target='Annotator' method='post' " + +"action='/adm/annotations'>" + +"<input type='hidden' name='urlnew' value='"+currentURL+"' />" + +"<\\/form>" + +'$end_page'); + annotator.document.close(); +} + +function set_bookmark() { + go(''); + clienttitle=document.title; + clienthref=location.pathname; + w_bmquery_flag=1; + bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0'); + bmquery.document.write( + '$start_page_bookmark' + +"<center><form method='post'" + +" name='newlink' action='/adm/bookmarks' target='bmquery' " + +">\\n <table width=340 height=150 " + +"bgcolor='ffffff' align=center><tr><td>Link Name:<br /><input " + +"type='text' name='title' size=45 value='"+clienttitle+"' />" + +"<br />Address:<br /><input type='text' name='address' size='45' " + +"value='"+clienthref+"' /><br /><center><input type='submit' " + +"value='Save' /> <input type='button' value='Close (no save)' " + +"onclick='javascript:window.close();' /><\\/center><\\/td>" + +"<\\/tr><\\/table><\\/form><\\/center>" + +'$end_page' ); + bmquery.document.close(); +} + ENDUTILITY } @@ -1220,56 +1272,20 @@ sub get_nav_status { return $navstatus; } -# ================================================ Handler when called directly - - -sub handler { - my $r = shift; - &Apache::loncommon::no_cache($r); - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - return OK if $r->header_only; - - my $form; - if ($env{'environment.remote'} ne 'off' && - $env{'browser.interface'} ne 'textual') { - $form=&serverform(); - } - my $function='student'; - if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { - $function='coordinator'; - } - if ($env{'request.role'}=~/^(su|dc|ad|li)/) { - $function='admin'; - } - if (($env{'request.role'}=~/^(au|ca)/) || - ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) { - $function='author'; - } - my $domain=&Apache::loncommon::determinedomain(); - $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); - $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); - $font=&Apache::loncommon::designparm($function.'.font',$domain); - my $script_tag; - if ($env{'environment.remote'} ne 'off') { - my $utility=&utilityfunctions('/adm/menu'); - $script_tag=(<<ENDSCRIPT); -<script type="text/javascript"> -$utility -</script> -ENDSCRIPT +#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; } -# ---- Print the screen, pretend to be in text mode to generate text-based menu - unless ($env{'browser.interface'} eq 'textual') { - $env{'browser.interface'}='faketextual'; - $env{'environment.remote'}='off'; - } - $r->print(&Apache::loncommon::start_page('Main Menu',$script_tag)); - $r->print('<table>'.&inlinemenu().'</table>'.$form); - $r->print(&Apache::loncommon::end_page()); - return OK; + return $rolename; } + # ================================================================ Main Program BEGIN {