--- loncom/interface/lonmenu.pm 2012/08/03 22:38:35 1.369.2.18 +++ loncom/interface/lonmenu.pm 2013/01/14 18:04:32 1.369.2.37 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.369.2.18 2012/08/03 22:38:35 raeburn Exp $ +# $Id: lonmenu.pm,v 1.369.2.37 2013/01/14 18:04:32 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -268,7 +268,6 @@ sub primary_menu { if (ref($primary_submenu{$title}) eq 'ARRAY') { foreach my $item (@{$primary_submenu{$title}}) { next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'})); - next if (($item->[2] eq 'reqcrs') && (!&check_for_rcrs())); next if ((($item->[2] eq 'portfolio') || ($item->[2] eq 'blog')) && (!&Apache::lonnet::usertools_access('','',$item->[2], @@ -346,16 +345,27 @@ sub secondary_menu { my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec); my $author = &getauthor(); + my ($canmodifycoauthor); + if ($env{'request.role'} eq "au./$env{'user.domain'}/") { + my $extent = "$env{'user.domain'}/$env{'user.name'}"; + if ((&Apache::lonnet::allowed('cca',$extent)) || + (&Apache::lonnet::allowed('caa',$extent))) { + $canmodifycoauthor = 1; + } + } + 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'}); + my ($roleswitcher_js,$roleswitcher_form); + foreach my $menuitem (@secondary_menu) { # evaluate conditions next if ref($menuitem) ne 'ARRAY'; next if $$menuitem[4] ne 'always' - && $$menuitem[4] ne 'author' + && ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca') && !$env{'request.course.id'}; next if $$menuitem[4] =~ /^mdc/ && !$canedit; @@ -383,6 +393,8 @@ sub secondary_menu { && ($canviewgrps || !%groups); next if $$menuitem[4] eq 'author' && !$author; + next if $$menuitem[4] eq 'cca' + && !$canmodifycoauthor; my $title = $menuitem->[3]; if (defined($secondary_submenu{$title})) { @@ -413,12 +425,12 @@ sub secondary_menu { } } elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { # special treatment for role selector - my $roles_selector = &roles_selector( + ($roleswitcher_js,$roleswitcher_form,my $switcher) = + &roles_selector( $env{'course.' . $env{'request.course.id'} . '.domain'}, - $env{'course.' . $env{'request.course.id'} . '.num'} ); - - $menu .= $roles_selector ? "
  • $roles_selector
    • " - : ''; + $env{'course.' . $env{'request.course.id'} . '.num'} + ); + $menu .= $switcher; } else { $menu .= &prep_menuitem(\@$menuitem); } @@ -443,8 +455,13 @@ sub secondary_menu { } $menu =~ s/\[uname\]/$$author{user}/g; $menu =~ s/\[udom\]/$$author{dom}/g; - - return ""; + if ($menu) { + $menu = ""; + } + if ($roleswitcher_form) { + $menu .= "\n$roleswitcher_js\n$roleswitcher_form"; + } + return $menu; } sub create_submenu { @@ -486,7 +503,7 @@ sub registerurl { if ($env{'request.state'} eq 'construct') { $force_title=&Apache::lonxml::display_title(); } - if (($env{'environment.remote'} eq 'off') || + if (($env{'environment.remote'} ne 'on') || ((($env{'request.publicaccess'}) || (!&Apache::lonnet::is_on_map( &unescape($env{'request.noversionuri'})))) && @@ -507,7 +524,7 @@ sub registerurl { } sub innerregister { - my ($forcereg,$bread_crumbs) = @_; + my ($forcereg,$bread_crumbs,$group) = @_; my $const_space = ($env{'request.state'} eq 'construct'); my $is_const_dir = 0; @@ -515,7 +532,7 @@ sub innerregister { $env{'request.registered'} = 1; - my $noremote = ($env{'environment.remote'} eq 'off'); + my $noremote = ($env{'environment.remote'} ne 'on'); undef(@inlineremote); @@ -528,231 +545,171 @@ sub innerregister { $newmail= 'swmenu.setstatus("you have","messages");'; } - my $resurl; - if ( $env{'request.symb'} && $env{'request.course.id'} ) { + my ($mapurl,$resurl); + + if ($env{'request.course.id'}) { + if ($env{'request.symb'}) { + ($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); + my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'}; - (my $mapurl, my $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 $maptitle = &Apache::lonnet::gettitle($mapurl); - my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread()); #SD #course_type only Course and Community? # - my @crumbs; - unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps') - && ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) { - @crumbs = ({text => Apache::loncommon::course_type() - . ' Contents', - href => "Javascript:gopost('/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); - }elsif (! $const_space){ + my @crumbs; + unless (($forcereg) && + ($env{'request.noversionuri'} eq '/adm/navmaps') && + ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) { + @crumbs = ({text => Apache::loncommon::course_type() + . ' Contents', + href => "Javascript:gopost('/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); + } else { + $resurl = $env{'request.noversionuri'}; + my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); + my $crstype = &Apache::loncommon::course_type(); + my $title = &mt('View Resource'); + if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default|\d+)/}) { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']); + &Apache::lonhtmlcommon::clear_breadcrumbs(); + if ($env{'form.title'}) { + $title = $env{'form.title'}; + } + my $trail; + if ($env{'form.folderpath'}) { + &prepare_functions($resurl,$forcereg,$group,undef,undef,1); + ($trail) = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + } else { + &Apache::lonhtmlcommon::add_breadcrumb( + {text => "Supplemental $crstype Content", + href => "javascript:gopost('/adm/supplemental','')"}); + $title = &mt('View Resource'); + ($trail) = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + } + return $trail; + } + unless ($env{'request.state'} eq 'construct') { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'}); + } + } + } elsif (! $const_space){ #a situation when we're looking at a resource outside of context of a #course or construction space (e.g. with cumulative rights) &Apache::lonhtmlcommon::clear_breadcrumbs(); - &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'}); + unless ($env{'request.noversionuri'} =~ m{^/adm/$match_domain/$match_username/aboutme$}) { + &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'}); + } } my $timesync = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' ); # ============================================================================= # ============================ This is for URLs that actually can be registered if ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/}) || ($forcereg)) { -# -- This applies to homework problems for users with grading privileges - my $crs='/'.$env{'request.course.id'}; - if ($env{'request.course.sec'}) { - $crs.='_'.$env{'request.course.sec'}; - } - $crs=~s/\_/\//g; + my %swtext; + if ($noremote) { + %swtext = &get_inline_text(); + } else { + %swtext = &get_rc_text(); + } my $hwkadd=''; - if ($env{'request.symb'} ne '' && - $env{'request.filename'}=~/$LONCAPA::assess_re/) { - if (&Apache::lonnet::allowed('mgr',$crs)) { - $hwkadd.=&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]', - "gocmd('/adm/grades','gradingmenu')", - 'Content Grades'); - } elsif (&Apache::lonnet::allowed('vgr',$crs)) { - $hwkadd.=&switch('','',7,2,'subm.png','Content Submissions','missions[_1]', - "gocmd('/adm/grades','submission')", - 'Content Submissions'); + + my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit, + $forceview,$editbutton); + if (($resurl =~ m{^/adm/($match_domain)/($match_username)/aboutme$}) || + ($env{'request.role'} !~/^(aa|ca|au)/)) { + if (($env{'environment.remote'} eq 'on') && ($env{'request.symb'})) { + &Apache::lonhtmlcommon::clear_breadcrumbs(); } - } - if ($env{'request.symb'} ne '' && - &Apache::lonnet::allowed('opa',$crs)) { - $hwkadd.=&switch('','',7,3,'pparm.png','Content Settings','parms[_2]', - "gocmd('/adm/parmset','set')", - 'Content Settings'); - } - if ($noremote) { - if ($env{'request.symb'}=~/^uploaded/ && - &Apache::lonnet::allowed('mdc',$crs)) { - $hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]', - "gocmd('/adm/coursedocs','direct')", - 'Folder/Page Content'); - } - } -# -- End Homework - ### - ### Determine whether or not to display the 'cstr' button for this - ### resource - ### - my $editbutton = ''; - my $noeditbutton = 1; - my ($cnum,$cdom); - if ($env{'request.course.id'}) { - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $editbutton = &prepare_functions($resurl,$forcereg,$group); + } + if ($editbutton eq '') { + $editbutton = &clear(6,1); } - if ($env{'user.author'}) { - if ($env{'request.role'}=~/^(aa|ca|au)/) { + # -# We have the role of an author +# This applies in course context # - # Set defaults for authors - my ($top,$bottom) = ('con-','struct'); - my $action = "go('/priv/".$env{'user.domain'}.'/'.$env{'user.name'}."');"; - my $cadom = $env{'request.role.domain'}; - my $caname = $env{'user.name'}; - my $desc = "Enter my construction space"; - # Set defaults for co-authors - if ($env{'request.role'} =~ /^ca/) { - ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); - ($top,$bottom) = ('co con-','struct'); - $action = "go('/priv/".$cadom.'/'.$caname."');"; - $desc = "Enter construction space as co-author"; - } elsif ($env{'request.role'} =~ /^aa/) { - ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); - ($top,$bottom) = ('co con-','struct'); - $action = "go('/priv/".$cadom.'/'.$caname."');"; - $desc = "Enter construction space as assistant co-author"; - } - # Check that we are on the correct machine - my $home = &Apache::lonnet::homeserver($caname,$cadom); - my $allowed=0; - my @ids=&Apache::lonnet::current_machine_ids(); - foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } - if (!$allowed) { - $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc); - $noeditbutton = 0; + if ($env{'request.course.id'}) { + $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'}); + my @privs; + if ($env{'request.symb'} ne '') { + if ($env{'request.filename'}=~/$LONCAPA::assess_re/) { + push(@privs,('mgr','vgr')); } + push(@privs,'opa'); } -# -# 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. - ## - my $cfile=''; - my $cfuname=''; - my $cfudom=''; - my $uploaded; - my $switchserver=''; - my $home; - if ($env{'request.filename'}) { - my $file=&Apache::lonnet::declutter($env{'request.filename'}); - if (defined($cnum) && defined($cdom)) { - $uploaded = &is_course_upload($file,$cnum,$cdom); - } - if (!$uploaded) { - - $file=~s{^(priv/$match_domain/$match_username)}{/$1}; - $file=~s{^($match_domain/$match_username)}{/priv/$1}; - - # Check that the user has permission to edit this resource - my $setpriv = 1; - ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$setpriv); - if (defined($cfudom)) { - $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; - } else { - $switchserver=$file; - } - } + foreach my $priv (@privs) { + $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'}); + if (!$perms{$priv} && $env{'request.course.sec'} ne '') { + $perms{$priv} = + &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}"); } } - # Finally, turn the button on or off - if (($cfile || $switchserver) && !$const_space) { - my $nocrsedit; - # Suppress display where CC has switched to student role. - if ($env{'request.course.id'}) { - unless(&Apache::lonnet::allowed('mdc', - $env{'request.course.id'})) { - $nocrsedit = 1; - } - } - if ($nocrsedit) { - $editbutton=&clear(6,1); - } else { - my $bot = "go('$cfile')"; - if ($switchserver) { - if ( $env{'request.symb'} && $env{'request.course.id'} ) { - $cfile = '/adm/switchserver?otherserver='.$home.'&role='. - &HTML::Entities::encode($env{'request.role'},'"<>&').'&symb='. - &HTML::Entities::encode($env{'request.symb'},'"<>&'); - $bot = "need_switchserver('$cfile');"; - } - } - $editbutton=&switch - ('','',6,1,'pcstr.png','Edit','resource[_2]', - $bot,"Edit this resource"); - $noeditbutton = 0; +# +# Determine whether or not to show Grades and Submissions buttons +# + if ($env{'request.symb'} ne '' && + $env{'request.filename'}=~/$LONCAPA::assess_re/) { + if ($perms{'mgr'}) { + $hwkadd.= &switch('','',7,2,'pgrd.png','Content Grades', + 'grades[_4]', + "gocmd('/adm/grades','gradingmenu')", + 'Content Grades'); + } elsif ($perms{'vgr'}) { + $hwkadd .= &switch('','',7,2,'subm.png','Content Submissions', + 'missions[_1]', + "gocmd('/adm/grades','submission')", + 'Content Submissions'); } - } elsif ($editbutton eq '') { - $editbutton=&clear(6,1); } - } - if (($noeditbutton) && ($env{'request.filename'})) { - if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { - my $file=&Apache::lonnet::declutter($env{'request.filename'}); - if (defined($cnum) && defined($cdom)) { - if (&is_course_upload($file,$cnum,$cdom)) { - my $cfile = &edit_course_upload($file,$cnum,$cdom); - if ($cfile) { - $editbutton=&switch - ('','',6,1,'pcstr.png','Edit', - 'resource[_2]',"go('".$cfile."');", - 'Edit this resource'); - } - } - } + if (($env{'request.symb'} ne '') && ($perms{'opa'})) { + $hwkadd .= &switch('','',7,3,'pparm.png','Content Settings', + 'parms[_2]',"gocmd('/adm/parmset','set')", + 'Content Settings'); } - } - if ($env{'request.course.id'}) { - if ($resurl eq "public/$cdom/$cnum/syllabus") { - if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) { - if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { - $editbutton=&switch('','',6,1,'pcstr.png','Edit', - 'resource[_2]', - "go('/adm/courseprefs?phase=display&actions=courseinfo')", - 'Edit this resource'); - } +# End grades/submissions check + +# +# This applies to items inside a folder/page modifiable in the course. +# + if (($env{'request.symb'}=~/^uploaded/) && ($perms{'mdc'})) { + my $text = 'Edit Folder'; + if (($mapurl =~ /\.page$/) || + ($env{'request.symb'}=~ + m{uploaded/$cdom/$cnum/default_\d+\.page$})) { + $text = 'Edit Page'; } + $hwkadd .= &switch('','',7,4,'docs-22x22.png',$text,'parms[_2]', + "gocmd('/adm/coursedocs','direct')", + 'Folder/Page Content'); } +# End modifiable folder/page container check } - ### - ### +# End course context + # Prepare the rest of the buttons - my ($menuitems,$got_prt,$got_wishlist); + my ($menuitems,$got_prt,$got_wishlist,$cstritems); if ($const_space) { # # We are in construction space @@ -778,27 +735,32 @@ s&6&3&pub.png&Publish&resource[_3]&gocst s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document ENDMENUITEMS + unless ($noremote) { + $cstritems = $menuitems; + undef($menuitems); + } } - if (ref($bread_crumbs) eq 'ARRAY') { - &Apache::lonhtmlcommon::clear_breadcrumbs(); - foreach my $crumb (@{$bread_crumbs}){ - &Apache::lonhtmlcommon::add_breadcrumb($crumb); - } + if (ref($bread_crumbs) eq 'ARRAY') { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + foreach my $crumb (@{$bread_crumbs}){ + &Apache::lonhtmlcommon::add_breadcrumb($crumb); } + } } elsif ( defined($env{'request.course.id'}) && $env{'request.symb'} ne '' ) { # # We are in a course and looking at a registered URL # Should probably be in mydesk.tab # + $menuitems=(< 0){ }else{ $menuitems.="anot.png"; } -$menuitems.="&Notes&&annotate()&"; +$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&"; $menuitems.="Make notes and annotations about this resource&&1\n"; unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { $menuitems.=(< + +$cstrcrumbs ENDREGTHIS } } else { @@ -985,6 +970,7 @@ var swmenu=null; swmenu.clearbut(8,1); swmenu.clearbut(8,2); swmenu.clearbut(8,3); + swmenu.clearbut(9,1); if (swmenu.currentURL) { swmenu.switchbutton (3,1,'reload.gif','return','location','go(currentURL)'); @@ -1006,40 +992,39 @@ ENDDONOTREGTHIS } } -sub is_course_upload { - my ($file,$cnum,$cdom) = @_; - my $uploadpath = &LONCAPA::propath($cdom,$cnum); - $uploadpath =~ s{^\/}{}; - if (($file =~ m{^\Q$uploadpath\E/userfiles/docs/}) || - ($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/docs/})) { - return 1; - } - return; +sub get_inline_text { + my %text = ( + pgrd => 'Content Grades', + subm => 'Content Submissions', + pparm => 'Content Settings', + docs => 'Folder/Page Content', + pcstr => 'Edit', + prt => 'Print', + alnk => 'Stored Links', + anot => 'Notes', + catalog => 'Info', + eval => 'Evaluate', + fdbk => 'Feedback', + ); + return %text; } -sub edit_course_upload { - my ($file,$cnum,$cdom) = @_; - my $cfile; - if ($file =~/\.(htm|html|css|js|txt)$/) { - my $ext = $1; - my $url = &Apache::lonnet::hreflocation('',$file); - my $home = &Apache::lonnet::homeserver($cnum,$cdom); - my @ids=&Apache::lonnet::current_machine_ids(); - my $dest; - if ($home && grep(/^\Q$home\E$/,@ids)) { - $dest = $url.'?forceedit=1'; - } else { - unless (&Apache::lonnet::get_locks()) { - $dest = '/adm/switchserver?otherserver='. - $home.'&role='.$env{'request.role'}. - '&url='.$url.'&forceedit=1'; - } - } - if ($dest) { - $cfile = &HTML::Entities::encode($dest,'"<>&'); - } - } - return $cfile; +sub get_rc_text { + my %text = ( + pgrd => 'problem[_1]', + subm => 'view sub-[_1]', + pparm => 'problem[_2]', + pcstr => 'edit[_1]', + prt => 'prepare[_1]', + back => 'backward[_1]', + forw => 'forward[_1]', + alnk => 'add to[_1]', + anot => 'anno-[_1]', + catalog => 'catalog[_2]', + eval => 'evaluate[_1]', + fdbk => 'feedback[_1]', + ); + return %text; } sub loadevents() { @@ -1211,6 +1196,252 @@ ENDOPEN return ''; } +sub get_editbutton { + my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_; + my $jscall; + if (($forceview) && ($env{'form.todocs'})) { + my ($folderpath,$command); + if ($env{'request.symb'}) { + $folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'}); + } elsif ($env{'form.folderpath'} =~ /^supplemental/) { + $folderpath = $env{'form.folderpath'}; + $command = '&forcesupplement=1'; + } + $folderpath = &escape(&HTML::Entities::encode(&escape($folderpath),'<>&"')); + $jscall = "go('/adm/coursedocs?folderpath=$folderpath$command')"; + } else { + $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, + $forceedit,$forcereg,$env{'request.symb'}, + &escape($env{'form.folderpath'}), + &escape($env{'form.title'}),$env{'form.idx'}, + &escape($env{'form.suppurl'},$env{'form.todocs'})); + } + if ($jscall) { + my $icon = 'pcstr.png'; + my $label = 'Edit'; + if ($forceview) { + $icon = 'tolastloc.png'; + $label = 'Exit Editing'; + } + my $infunc = 1; + my $clearbutton; + if ($env{'environment.remote'} eq 'on') { + if ($cfile =~ m{^/priv/}) { + undef($infunc); + $label = 'edit'; + } else { + $clearbutton = 1; + } + } + my $editor = &switch('','',6,1,$icon,$label,'resource[_2]', + $jscall,"Edit this resource",'','',$infunc); + if ($infunc) { + return 1; + } elsif ($clearbutton) { + return &clear(6,1); + } else { + return $editor; + } + } + return; +} + +sub prepare_functions { + my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$forbodytag) = @_; + unless ($env{'request.registered'}) { + undef(@inlineremote); + } + my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit, + $forceview); + + if ($env{'request.course.id'}) { + $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'}); + } + + my $editbutton = ''; +# +# Determine whether or not to display 'Edit' icon/button +# + if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) { + my $file=&Apache::lonnet::declutter($env{'request.filename'}); + ($cfile,$home,$switchserver,$forceedit,$forceview) = + &Apache::lonnet::can_edit_resource($file,$cnum,$cdom, + &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group); + if (($cfile) && ($home ne '') && ($home ne 'no_host')) { + $editbutton = &get_editbutton($cfile,$home,$switchserver, + $forceedit,$forceview,$forcereg); + } + } elsif ((!$env{'request.course.id'}) && + ($env{'user.author'}) && ($env{'request.filename'}) && + ($env{'request.role'} !~/^(aa|ca|au)/)) { +# +# Currently do not have the role of author or co-author. +# Do we have authoring privileges for the resource? +# + my $file=&Apache::lonnet::declutter($env{'request.filename'}); + ($cfile,$home,$switchserver,$forceedit,$forceview) = + &Apache::lonnet::can_edit_resource($file,$cnum,$cdom, + &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group); + if (($cfile) && ($home ne '') && ($home ne 'no_host')) { + $editbutton = &get_editbutton($cfile,$home,$switchserver, + $forceedit,$forceview,$forcereg); + } + } elsif ($env{'request.course.id'}) { +# +# This applies in course context +# + if (($resurl eq "/public/$cdom/$cnum/syllabus") && ($perms{'mdc'})) { + if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) { + &switch('','',6,1,'pcstr.png','Edit', + 'resource[_2]', + "go('/adm/courseprefs?phase=display&actions=courseinfo')", + 'Edit this resource','','',1); + $editbutton = 1; + } else { + $cfile = $resurl; + $home = &Apache::lonnet::homeserver($cnum,$cdom); + if ($env{'form.forceedit'}) { + $forceview = 1; + } else { + $forceedit = 1; + } + $editbutton = &get_editbutton($cfile,$home,$switchserver, + $forceedit,$forceview,$forcereg); + } + } elsif (($resurl eq '/adm/extresedit') && + (($env{'form.symb'}) || ($env{'form.folderpath'}))) { + ($cfile,$home,$switchserver,$forceedit,$forceview) = + &Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl, + $env{'form.symb'}); + if ($cfile ne '') { + $editbutton = &get_editbutton($cfile,$home,$switchserver, + $forceedit,$forceview,$forcereg, + $env{'form.title'},$env{'form.suppurl'}); + } + } elsif (($resurl =~ m{^/?adm/viewclasslist$}) && + (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) { + ($cfile,$home,$switchserver,$forceedit,$forceview) = + &Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl, + $env{'form.symb'}); + $editbutton = &get_editbutton($cfile,$home,$switchserver, + $forceedit,$forceview,$forcereg); + } elsif (($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) && + ($resurl ne '/cgi-bin/printout.pl')) { + if ($env{'request.filename'}) { + my $file=&Apache::lonnet::declutter($env{'request.filename'}); + ($cfile,$home,$switchserver,$forceedit,$forceview) = + &Apache::lonnet::can_edit_resource($file,$cnum,$cdom, + &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group); + if ($cfile ne '') { + $editbutton = &get_editbutton($cfile,$home,$switchserver, + $forceedit,$forceview,$forcereg); + } + } + } + } +# End determination of 'Edit' icon/button display + + if ($env{'request.course.id'}) { +# This applies to about me page for users in a course + if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) { + my ($sdom,$sname) = ($1,$2); + 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')", + 'Send message to specific user','','',1); + } + my $hideprivileged = 1; + if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef, + $hideprivileged)) { + foreach my $priv ('vsa','vgr','srm') { + $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'}); + if (!$perms{$priv} && $env{'request.course.sec'} ne '') { + $perms{$priv} = + &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}"); + } + } + if ($perms{'vsa'}) { + &switch('','',6,5,'trck-22x22.png','Activity', + '', + "go('/adm/trackstudent?selected_student=$sname:$sdom')", + 'View recent activity by this person','','',1); + } + if ($perms{'vgr'}) { + &switch('','',6,6,'rsrv-22x22.png','Reservations', + '', + "go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')", + 'Slot reservation history','','',1); + } + if ($perms{'srm'}) { + &switch('','',6,7,'contact-new-22x22.png','Records', + '', + "go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')", + 'Add records','','',1); + } + } + } + if (($env{'form.folderpath'} =~ /^supplemental/) && + (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && + (($resurl =~ m{^/adm/wrapper/ext/}) || + ($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) || + ($resurl eq '/adm/supplemental') || + ($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) || + ($resurl =~ m{^/adm/$match_domain/$match_username/aboutme$}))) { + my @folders=split('&',$env{'form.folderpath'}); + 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'", + 'Folder/Page Content','','',1); + } + } + } + +# End checking for items for about me page for users in a course + if ($docscrumbs) { + &Apache::lonhtmlcommon::clear_breadcrumb_tools(); + &advtools_crumbs(@inlineremote); + return $editbutton; + } elsif (($env{'request.registered'}) && (!ref($forbodytag))) { + return $editbutton; + } else { + if (ref($bread_crumbs) eq 'ARRAY') { + if (@inlineremote > 0) { + if (ref($advtools) eq 'ARRAY') { + @{$advtools} = @inlineremote; + } + } + return; + } elsif (@inlineremote > 0) { + &Apache::lonhtmlcommon::clear_breadcrumb_tools(); + &advtools_crumbs(@inlineremote); + if (ref($forbodytag)) { + $$forbodytag = + &Apache::lonhtmlcommon::scripttag('', 'start') + .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) + .&Apache::lonhtmlcommon::scripttag('', 'end'); + } + return; + } + } +} + +sub advtools_crumbs { + my @funcs = @_; + if ($env{'request.noversionuri'} =~ m{^/adm/$match_domain/$match_username/aboutme$}) { + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'advtools', @funcs[61,64,65,66,67,74]); + } elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) { + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'advtools', @funcs[61,71,72,73,74,92]); + } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') { + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'advtools', $funcs[61]); + } +} # ================================================================== Raw Config @@ -1230,7 +1461,7 @@ sub clear { # The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)". sub switch { - my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak)=@_; + my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$infunc)=@_; $act=~s/\$uname/$uname/g; $act=~s/\$udom/$udom/g; $top=&mt($top); @@ -1239,8 +1470,18 @@ sub switch { my $idx=10*$row+$col; $category_members{$cat}.=':'.$idx; - if ($env{'environment.remote'} eq 'on') { + if (($env{'environment.remote'} eq 'on') && (!$infunc)) { if (($row<1) || ($row>13)) { return ''; } + if ($env{'request.state'} eq 'construct') { + my $text = $top.' '.$bot; + $text=~s/\s*\-\s*//gs; + my $pic = ''.$text.''; + $inlineremote[$idx] = + ''. + $pic.''.$top.' '; + } # Remote $img=~s/\.png$/\.gif/; return "\n". @@ -1665,8 +1906,7 @@ sub utilityfunctions { my $end_page_annotate = &Apache::loncommon::end_page({'js_ready' => 1}); - my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'. - &mt('Switch server?'); + my $jumptores = &Apache::lonhtmlcommon::javascript_jumpto_resource(); my $esc_url=&escape($currenturl); my $esc_symb=&escape($currentsymb); @@ -1689,14 +1929,7 @@ function go(url) { } } -function need_switchserver(url) { - if (url!='' && url!= null) { - if (confirm("$confirm_switch")) { - go(url); - } - } - return; -} +$jumptores function gopost(url,postdata) { if (url!='') { @@ -1883,15 +2116,29 @@ sub roles_selector { my $now = time; my (%courseroles,%seccount,%courseprivs); my $is_cc; - my $role_selector; + my ($js,$form,$switcher,$switchtext); my $ccrole; if ($crstype eq 'Community') { $ccrole = 'co'; } else { $ccrole = 'cc'; } - my $priv; + my ($priv,$gotsymb,$destsymb); my $destinationurl = $ENV{'REQUEST_URI'}; + if ($destinationurl =~ /\?symb=/) { + $gotsymb = 1; + } elsif ($destinationurl =~ m{^/enc/}) { + my $plainurl = &Apache::lonenc::unencrypted($destinationurl); + if ($plainurl =~ /\?symb=/) { + $gotsymb = 1; + } + } + unless ($gotsymb) { + $destsymb = &Apache::lonnet::symbread(); + if ($destsymb ne '') { + $destsymb = &Apache::lonenc::check_encrypt($destsymb); + } + } my $reqprivs = &required_privs(); if (ref($reqprivs) eq 'HASH') { my $destination = $destinationurl; @@ -1957,37 +2204,66 @@ sub roles_selector { } } } - my $switchtext; - if ($crstype eq 'Community') { - $switchtext = &mt('Switch community role to...') - } else { - $switchtext = &mt('Switch course role to...') - } + $switchtext = &mt('Switch role'); my @roles_order = ($ccrole,'in','ta','ep','ad','st'); - if (keys(%courseroles) > 1) { - $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv); - $role_selector .= '
    - '."\n". + ' '."\n". + ' '."\n". + ' '."\n"; + if ($destsymb ne '') { + $form .= ' '."\n"; + } + $form .= '
    '."\n"; foreach my $role (@roles_order) { + my $include; if (defined($courseroles{$role})) { - $role_selector .= "\n".''; + if ($env{'request.role'} =~ m{^\Q$role\E}) { + if ($seccount{$role} > 1) { + $include = 1; + } + } else { + $include = 1; + } + } + if ($include) { + push(@submenu,['javascript:adhocRole('."'$role'".')', + &Apache::lonnet::plaintext($role,$crstype)]); } } foreach my $role (sort(keys(%courseroles))) { if ($role =~ /^cr/) { - $role_selector .= "\n".''; + my $include; + if ($env{'request.role'} =~ m{^\Q$role\E}) { + if ($seccount{$role} > 1) { + $include = 1; + } + } else { + $include = 1; + } + if ($include) { + push(@submenu,['javascript:adhocRole('."'$role'".')', + &Apache::lonnet::plaintext($role)]); + } } } - $role_selector .= ''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - ''; + if (@submenu > 0) { + $switcher = &create_submenu('','',$switchtext,\@submenu); + } } - return $role_selector; + return ($js,$form,$switcher); } sub get_all_courseroles { @@ -2126,9 +2402,8 @@ sub jump_to_role { return <<"END";