--- loncom/interface/lonmenu.pm 2012/12/13 06:33:31 1.369.2.26
+++ loncom/interface/lonmenu.pm 2015/05/28 12:49:30 1.369.2.55
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.369.2.26 2012/12/13 06:33:31 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.55 2015/05/28 12:49:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -106,10 +106,11 @@ secondary_menu().
=item primary_menu()
-This routine evaluates @primary_menu and returns XHTML for the menu
-that contains following links: About, Message, Roles, Help, Logout
+This routine evaluates @primary_menu and returns a two item array,
+with the array elements containing XHTML for the left and right sides of
+the menu that contains the following links: About, Message, Roles, Help, Logout
@primary_menu is filled within the BEGIN block of this module with
-entries from mydesk.tab
+entries from mydesk.tab
=item secondary_menu()
@@ -223,15 +224,16 @@ sub prep_menuitem {
. qq| href="$$menuitem[0]" target="_top">$link|;
}
-# primary_menu() evaluates @primary_menu and returns XHTML for the menu
-# that contains following links:
-# About, Message, Personal, Roles, Help, Logout
+# primary_menu() evaluates @primary_menu and returns a two item array,
+# with the array elements containing XHTML for the left and right sides of
+# the menu that contains the following links:
+# Personal, About, Message, Roles, Help, Logout
# @primary_menu is filled within the BEGIN block of this module with
# entries from mydesk.tab
sub primary_menu {
- my $menu;
+ my %menu;
# each element of @primary contains following array:
- # (link url, icon path, alt text, link text, condition)
+ # (link url, icon path, alt text, link text, condition, position)
my $public;
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
|| (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
@@ -256,6 +258,10 @@ sub primary_menu {
&& !&Apache::loncommon::show_course(); ##
my $title = $menuitem->[3];
+ my $position = $menuitem->[5];
+ if ($position eq '') {
+ $position = 'right';
+ }
if (defined($primary_submenu{$title})) {
my ($link,$target);
if ($menuitem->[0] ne '') {
@@ -268,7 +274,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],
@@ -276,9 +281,9 @@ sub primary_menu {
push(@primsub,$item);
}
if (@primsub > 0) {
- $menu .= &create_submenu($link,$target,$title,\@primsub);
+ $menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1);
} elsif ($link) {
- $menu .= '
'.&mt($title).'';
+ $menu{$position} .= ''.&mt($title).'';
}
}
} elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
@@ -289,19 +294,23 @@ sub primary_menu {
'helpdeskmail',
$defdom,$origmail);
if ($to ne '') {
- $menu .= &prep_menuitem($menuitem);
+ $menu{$position} .= &prep_menuitem($menuitem);
}
} else {
- $menu .= ''.&Apache::loncommon::top_nav_help('Help').'';
+ $menu{$position} .= ''.&Apache::loncommon::top_nav_help('Help').'';
}
} else {
- $menu .= prep_menuitem($menuitem);
+ $menu{$position} .= prep_menuitem($menuitem);
}
}
- $menu =~ s/\[domain\]/$env{'user.domain'}/g;
- $menu =~ s/\[user\]/$env{'user.name'}/g;
-
- return "";
+ my @output = ('','');
+ if ($menu{'left'} ne '') {
+ $output[0] = "";
+ }
+ if ($menu{'right'} ne '') {
+ $output[1] = "";
+ }
+ return @output;
}
#returns hashref {user=>'',dom=>''} containing:
@@ -330,6 +339,7 @@ sub getauthor{
}
sub secondary_menu {
+ my ($httphost) = @_;
my $menu;
my $crstype = &Apache::loncommon::course_type();
@@ -338,6 +348,9 @@ sub secondary_menu {
: '');
my $canedit = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});
my $canviewroster = $env{'course.'.$env{'request.course.id'}.'.student_classlist_view'};
+ if ($canviewroster eq 'disabled') {
+ undef($canviewroster);
+ }
my $canviewgrps = &Apache::lonnet::allowed('vcg', $crs_sec);
my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec);
my $canviewwnew = &Apache::lonnet::allowed('whn', $crs_sec);
@@ -346,16 +359,52 @@ sub secondary_menu {
my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec);
my $author = &getauthor();
+ my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv);
+ if ($env{'request.course.id'}) {
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ unless ($canedit) {
+ unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {
+ if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) ||
+ ($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) ||
+ ($env{'course.'.$env{'request.course.id'}.'.updatedsyllabus'}) ||
+ ($env{'request.course.syllabustime'})) {
+ $showsyllabus = 1;
+ }
+ }
+ if ($env{'request.course.feeds'}) {
+ $showfeeds = 1;
+ }
+ }
+ unless ($canmgr) {
+ my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
+ if (keys(%slots) > 0) {
+ $showresv = 1;
+ }
+ }
+ }
+
+ 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;
@@ -373,16 +422,22 @@ sub secondary_menu {
&& ($canmodifyuser || !$canviewroster);
next if $$menuitem[4] eq 'mgr'
&& !$canmgr;
- next if $$menuitem[4] eq 'nmgr'
- && $canmgr;
+ next if $$menuitem[4] eq 'showresv'
+ && !$showresv;
next if $$menuitem[4] eq 'whn'
&& !$canviewwnew;
next if $$menuitem[4] eq 'opa'
&& !$canmodpara;
next if $$menuitem[4] eq 'nvcg'
&& ($canviewgrps || !%groups);
+ next if $$menuitem[4] eq 'showsyllabus'
+ && !$showsyllabus;
+ next if $$menuitem[4] eq 'showfeeds'
+ && !$showfeeds;
next if $$menuitem[4] eq 'author'
&& !$author;
+ next if $$menuitem[4] eq 'cca'
+ && !$canmodifycoauthor;
my $title = $menuitem->[3];
if (defined($secondary_submenu{$title})) {
@@ -393,7 +448,7 @@ sub secondary_menu {
} else {
$link = '#';
}
- my @scndsub;
+ my @scndsub;
if (ref($secondary_submenu{$title}) eq 'ARRAY') {
foreach my $item (@{$secondary_submenu{$title}}) {
if (ref($item) eq 'ARRAY') {
@@ -402,24 +457,37 @@ sub secondary_menu {
next if ($item->[2] eq 'cst' && !$canmodifyuser);
next if ($item->[2] eq 'mgr' && !$canmgr);
next if ($item->[2] eq 'vcg' && !$canviewgrps);
+ next if ($item->[2] eq 'mdc' && !$canedit);
push(@scndsub,$item);
}
}
if (@scndsub > 0) {
- $menu .= &create_submenu($link,$target,$title,\@scndsub);
- } elsif ($link) {
+ $menu .= &create_submenu($link,$target,$title,\@scndsub,1);
+ } elsif ($link ne '#') {
$menu .= ''.&mt($title).'';
}
}
} 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'},
+ $httphost
+ );
+ $menu .= $switcher;
} else {
+ if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) {
+ my $url = $$menuitem[0];
+ $url =~ s{\[cdom\]/\[cnum\]}{$cdom/$cnum};
+ if (&Apache::lonnet::is_on_map($url)) {
+ unless ($$menuitem[0] =~ /\?register=1/) {
+ $$menuitem[0] .= '?register=1';
+ }
+ } else {
+ $$menuitem[0] =~ s{\?register=1}{};
+ }
+ }
$menu .= &prep_menuitem(\@$menuitem);
}
}
@@ -443,22 +511,39 @@ sub secondary_menu {
}
$menu =~ s/\[uname\]/$$author{user}/g;
$menu =~ s/\[udom\]/$$author{dom}/g;
+ if ($env{'request.course.id'}) {
+ $menu =~ s/\[cnum\]/$cnum/g;
+ $menu =~ s/\[cdom\]/$cdom/g;
+ }
if ($menu) {
$menu = "";
}
+ if ($roleswitcher_form) {
+ $menu .= "\n$roleswitcher_js\n$roleswitcher_form";
+ }
return $menu;
}
sub create_submenu {
- my ($link,$target,$title,$submenu) = @_;
+ my ($link,$target,$title,$submenu,$translate) = @_;
return unless (ref($submenu) eq 'ARRAY');
my $disptarget;
if ($target ne '') {
$disptarget = ' target="'.$target.'"';
}
+ my $name;
+ if ($title eq 'Personal') {
+ if ($env{'user.name'} && $env{'user.domain'}) {
+ $name = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+ } else {
+ $name = &mt($title);
+ }
+ } else {
+ $name = &mt($title);
+ }
my $menu = ''.
- ''.
- ''.&mt($title).
+ ''.
+ ''.$name.
''.
' ▼'.
'';
@@ -467,13 +552,27 @@ sub create_submenu {
foreach my $item (@{$submenu}) {
$count ++;
if (ref($item) eq 'ARRAY') {
+ my $href = $item->[0];
+ if ($href =~ /(aboutme|rss\.html)$/) {
+ next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
+ $href =~ s/\[domain\]/$env{'user.domain'}/g;
+ $href =~ s/\[user\]/$env{'user.name'}/g;
+ }
my $borderbot;
if ($count == $numsub) {
$borderbot = 'border-bottom:1px solid black;';
}
+ unless (($href eq '') || ($href =~ /^\#/)) {
+ $target = ' target="_top"';
+ }
$menu .= '- '.
- &mt($item->[1]).'
';
+ $borderbot.'">';
+ if ($translate) {
+ $menu .= &mt($item->[1]);
+ } else {
+ $menu .= $item->[1];
+ }
+ $menu .= '
';
}
}
$menu .= '';
@@ -530,43 +629,79 @@ sub innerregister {
$newmail= 'swmenu.setstatus("you have","messages");';
}
- my $resurl;
-
- if ($env{'request.course.id'} && $env{'request.symb'} eq '') {
- $resurl = $env{'request.noversionuri'};
- }
+ my ($mapurl,$resurl);
- if ( $env{'request.symb'} && $env{'request.course.id'} ) {
+ 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);
+ 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;
+ } elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &prepare_functions('/public'.$courseurl."/syllabus",
+ $forcereg,$group,undef,undef,1);
+ $title = &mt('Syllabus File');
+ my ($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)
@@ -580,76 +715,89 @@ sub innerregister {
# ============================ This is for URLs that actually can be registered
if ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
|| ($forcereg)) {
- my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit,
- $forceview,$editbutton);
- if ($env{'request.noversionuri'} =~ m{^/adm/($match_domain)/($match_username)/aboutme$}) {
- ($cfile,$home,$switchserver,$forceedit,$forceview) =
- &Apache::lonnet::can_edit_resource($env{'request.noversionuri'},$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);
+
+ my %swtext;
+ if ($noremote) {
+ %swtext = &get_inline_text();
+ } else {
+ %swtext = &get_rc_text();
+ }
+ my $hwkadd='';
+
+ 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();
+ }
+ $editbutton = &prepare_functions($resurl,$forcereg,$group);
+ }
+ if ($editbutton eq '') {
+ $editbutton = &clear(6,1);
}
- } elsif ($env{'request.role'} !~/^(aa|ca|au)/) {
- $editbutton = &prepare_functions($resurl,$forcereg,$group);
- }
- if ($editbutton eq '') {
- &clear(6,1);
- }
#
# This applies in course context
#
- 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');
- }
- 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'}");
+ 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');
+ }
+ 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'}");
+ }
}
- }
#
# Determine whether or not to show Grades and Submissions buttons
#
- if ($env{'request.symb'} ne '' &&
- $env{'request.filename'}=~/$LONCAPA::assess_re/) {
- if ($perms{'mgr'}) {
- &switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
- "gocmd('/adm/grades','gradingmenu')",
- 'Content Grades');
- } elsif ($perms{'vgr'}) {
- &switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
- "gocmd('/adm/grades','submission')",
- 'Content Submissions');
- }
- }
- if (($env{'request.symb'} ne '') && ($perms{'opa'})) {
- &switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
- "gocmd('/adm/parmset','set')",
- 'Content Settings');
- }
+ 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');
+ }
+ }
+ if (($env{'request.symb'} ne '') && ($perms{'opa'})) {
+ $hwkadd .= &switch('','',7,3,'pparm.png','Content Settings',
+ 'parms[_2]',"gocmd('/adm/parmset','set')",
+ 'Content Settings');
+ }
# End grades/submissions check
#
# This applies to items inside a folder/page modifiable in the course.
#
- if (($env{'request.symb'}=~/^uploaded/) && ($perms{'mdc'})) {
- &switch('','',7,4,'docs-22x22.png','Folder/Page Content','parms[_2]',
- "gocmd('/adm/coursedocs','direct')",
- 'Folder/Page Content');
- }
+ 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
@@ -665,6 +813,9 @@ sub innerregister {
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
if ($currdir =~ m-/$-) {
$is_const_dir = 1;
+ if ($thisdisfn eq '') {
+ $is_const_dir = 2;
+ }
} else {
$currdir =~ s|[^/]+$||;
my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
@@ -684,12 +835,12 @@ ENDMENUITEMS
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 '' ) {
#
@@ -712,7 +863,7 @@ ENDMENUITEMS
# wishlist is only available for users with access to resource-pool
# and links can only be set for resources within the resource-pool
$menuitems .= (< 0){
}
$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&";
$menuitems.="Make notes and annotations about this resource&&1\n";
+my $is_mobile;
+if ($env{'browser.mobile'}) {
+ $is_mobile = 1;
+}
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.=(<&"'));
+ $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';
@@ -1152,15 +1335,31 @@ sub get_editbutton {
$icon = 'tolastloc.png';
$label = 'Exit Editing';
}
- &switch('','',6,1,$icon,$label,'resource[_2]',
- $jscall,"Edit this resource");
- return 1;
+ 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) = @_;
+ my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$forbodytag) = @_;
unless ($env{'request.registered'}) {
undef(@inlineremote);
}
@@ -1178,19 +1377,15 @@ sub prepare_functions {
# Determine whether or not to display 'Edit' icon/button
#
if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
-#
-# This applies to a user's own about me page
-#
- my ($sdom,$sname) = ($1,$2);
my $file=&Apache::lonnet::declutter($env{'request.filename'});
- if (($sdom eq $env{'user.domain'}) && ($sname eq $env{'user.name'})) {
- ($cfile,$home,$switchserver,$forceedit,$forceview) =
- &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
- &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
- $editbutton = &get_editbutton($cfile,$env{'user.home'},$switchserver,
+ ($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 ((!$editbutton) && (!$env{'request.course.id'}) &&
+ } elsif ((!$env{'request.course.id'}) &&
($env{'user.author'}) && ($env{'request.filename'}) &&
($env{'request.role'} !~/^(aa|ca|au)/)) {
#
@@ -1201,7 +1396,6 @@ sub prepare_functions {
($cfile,$home,$switchserver,$forceedit,$forceview) =
&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
- # Turn the button on or off
if (($cfile) && ($home ne '') && ($home ne 'no_host')) {
$editbutton = &get_editbutton($cfile,$home,$switchserver,
$forceedit,$forceview,$forcereg);
@@ -1210,25 +1404,37 @@ sub prepare_functions {
#
# 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');
- $editbutton = 1;
+ if (($perms{'mdc'}) &&
+ (($resurl eq "/public/$cdom/$cnum/syllabus") ||
+ ($resurl =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}))) {
+ $cfile = $resurl;
+ $home = &Apache::lonnet::homeserver($cnum,$cdom);
+ if ($env{'form.forceedit'}) {
+ $forceview = 1;
} else {
- $cfile = $resurl;
- $home = &Apache::lonnet::homeserver($cnum,$cdom);
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
+ $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);
+ $forceedit,$forceview,$forcereg,
+ $env{'form.title'},$env{'form.suppurl'});
}
- } elsif ($resurl !~ m{^adm/($match_domain)/($match_username)/aboutme$}) {
+ } 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) =
@@ -1243,17 +1449,19 @@ sub prepare_functions {
}
# End determination of 'Edit' icon/button display
-# This applies to about me page for users in a course
if ($env{'request.course.id'}) {
- if ($resurl =~ m{^adm/($match_domain)/($match_username)/aboutme$}) {
+# 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');
+ "go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')",
+ 'Send message to specific user','','',1);
}
- if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum)) {
+ 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 '') {
@@ -1265,27 +1473,45 @@ sub prepare_functions {
&switch('','',6,5,'trck-22x22.png','Activity',
'',
"go('/adm/trackstudent?selected_student=$sname:$sdom')",
- 'View recent activity by this person');
+ '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');
+ "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');
+ "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 ($env{'request.registered'}) {
+ 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') {
@@ -1298,9 +1524,13 @@ sub prepare_functions {
} elsif (@inlineremote > 0) {
&Apache::lonhtmlcommon::clear_breadcrumb_tools();
&advtools_crumbs(@inlineremote);
- return &Apache::lonhtmlcommon::scripttag('', 'start')
- . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
- . &Apache::lonhtmlcommon::scripttag('', 'end');
+ if (ref($forbodytag)) {
+ $$forbodytag =
+ &Apache::lonhtmlcommon::scripttag('', 'start')
+ .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+ .&Apache::lonhtmlcommon::scripttag('', 'end');
+ }
+ return;
}
}
}
@@ -1313,6 +1543,9 @@ sub advtools_crumbs {
} 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]);
}
}
@@ -1334,7 +1567,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);
@@ -1343,7 +1576,7 @@ 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;
@@ -1496,7 +1729,10 @@ sub rawconfig {
my $pub=($env{'request.state'} eq 'published');
my $con=($env{'request.state'} eq 'construct');
my $rol=$env{'request.role'};
- my $requested_domain = $env{'request.role.domain'};
+ my $requested_domain;
+ if ($rol) {
+ $requested_domain = $env{'request.role.domain'};
+ }
foreach my $line (@desklines) {
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);
$prt=~s/\$uname/$uname/g;
@@ -1510,7 +1746,13 @@ sub rawconfig {
next if ($crstype ne 'Community');
$prt=~s/\$cmty/$crs/g;
}
- $prt=~s/\$requested_domain/$requested_domain/g;
+ if ($prt =~ m/\$requested_domain/) {
+ if ((!$requested_domain) && ($pro eq 'pbre') && ($env{'user.adv'})) {
+ $prt=~s/\$requested_domain/$env{'user.domain'}/g;
+ } else {
+ $prt=~s/\$requested_domain/$requested_domain/g;
+ }
+ }
if ($category_names{$cat}!~/\w/) { $cat='oth'; }
if ($pro eq 'clear') {
$output.=&clear($row,$col);
@@ -1546,8 +1788,9 @@ sub rawconfig {
next;
}
}
- if (&Apache::lonnet::allowed($priv,$prt)) {
- $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+ if ((($priv eq 'bre') && (&Apache::lonnet::allowed($priv,$prt) eq 'F')) ||
+ (($priv ne 'bre') && (&Apache::lonnet::allowed($priv,$prt)))) {
+ $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
}
} elsif ($pro eq 'course') {
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) {
@@ -1663,7 +1906,7 @@ sub rawconfig {
sub check_for_rcrs {
my $showreqcrs = 0;
- my @reqtypes = ('official','unofficial','community');
+ my @reqtypes = ('official','unofficial','community','textbook');
foreach my $type (@reqtypes) {
if (&Apache::lonnet::usertools_access($env{'user.name'},
$env{'user.domain'},
@@ -1752,6 +1995,7 @@ END
}
sub utilityfunctions {
+ my ($httphost) = @_;
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
if ($currenturl =~ m{^/adm/wrapper/ext/}
&& $env{'request.external.querystring'} ) {
@@ -1786,8 +2030,26 @@ sub utilityfunctions {
my $countdown = &countdown_toggle_js();
-return (< 1) {
- $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);
- $role_selector .= '';
}
- return $role_selector;
+ return ($js,$form,$switcher);
}
sub get_all_courseroles {
@@ -2175,6 +2472,7 @@ sub get_all_courseroles {
push(@{$courseroles->{'st'}},keys(%sections_count));
$seccount->{'st'} = scalar(keys(%sections_count));
}
+ $seccount->{'st'} ++; # Increment for a section-less student role.
my $rolehash = {
'roles' => $courseroles,
'seccount' => $seccount,
@@ -2251,9 +2549,8 @@ sub jump_to_role {
return <<"END";