version 1.481, 2017/10/07 21:07:17
|
version 1.482, 2017/10/07 22:20:19
|
Line 214 use HTML::Entities();
|
Line 214 use HTML::Entities();
|
use Apache::lonwishlist(); |
use Apache::lonwishlist(); |
|
|
use vars qw(@desklines %category_names %category_members %category_positions |
use vars qw(@desklines %category_names %category_members %category_positions |
$readdesk @primary_menu %primary_submenu @secondary_menu); |
$readdesk @primary_menu %primary_submenu @secondary_menu %secondary_submenu); |
|
|
my @inlineremote; |
my @inlineremote; |
|
|
Line 401 sub secondary_menu {
|
Line 401 sub secondary_menu {
|
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
if ($canedit || $canvieweditor) { |
unless ($canedit || $canvieweditor) { |
$showsyllabus = 1; |
|
$showfeeds = 1; |
|
} else { |
|
unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) { |
unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) { |
if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) || |
if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) || |
($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) || |
($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) || |
Line 471 sub secondary_menu {
|
Line 468 sub secondary_menu {
|
&& !$canviewwnew; |
&& !$canviewwnew; |
next if $$menuitem[4] eq 'params' |
next if $$menuitem[4] eq 'params' |
&& (!$canmodpara && !$canviewpara); |
&& (!$canmodpara && !$canviewpara); |
next if $$menuitem[4] =~ /showgroups$/ |
next if $$menuitem[4] eq 'showgroups' |
&& !$canviewgrps |
&& ($canviewgrps || !$grouptools); |
&& !$grouptools; |
|
next if $$menuitem[4] eq 'showsyllabus' |
next if $$menuitem[4] eq 'showsyllabus' |
&& !$showsyllabus; |
&& !$showsyllabus; |
next if $$menuitem[4] eq 'showfeeds' |
next if $$menuitem[4] eq 'showfeeds' |
Line 483 sub secondary_menu {
|
Line 479 sub secondary_menu {
|
next if $$menuitem[4] eq 'cca' |
next if $$menuitem[4] eq 'cca' |
&& !$canmodifycoauthor; |
&& !$canmodifycoauthor; |
|
|
if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { |
my $title = $menuitem->[3]; |
|
if (defined($secondary_submenu{$title})) { |
|
my ($link,$target); |
|
if ($menuitem->[0] ne '') { |
|
$link = $menuitem->[0]; |
|
$target = '_top'; |
|
} else { |
|
$link = '#'; |
|
} |
|
my @scndsub; |
|
if (ref($secondary_submenu{$title}) eq 'ARRAY') { |
|
foreach my $item (@{$secondary_submenu{$title}}) { |
|
if (ref($item) eq 'ARRAY') { |
|
next if ($item->[2] eq 'vgr' && !$canvgr); |
|
next if ($item->[2] eq 'opa' && !$canmodpara); |
|
next if ($item->[2] eq 'vpa' && !$canviewpara); |
|
next if ($item->[2] eq 'viewusers' && !($canmodifyuser || $canviewusers)); |
|
next if ($item->[2] eq 'mgr' && !$canmgr); |
|
next if ($item->[2] eq 'vcg' && !$canviewgrps); |
|
next if ($item->[2] eq 'crsedit' && !$canedit && !$canvieweditor); |
|
next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara); |
|
push(@scndsub,$item); |
|
} |
|
} |
|
if (@scndsub > 0) { |
|
$menu .= &create_submenu($link,$target,$title,\@scndsub,1); |
|
} elsif ($link ne '#') { |
|
$menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>'; |
|
} |
|
} |
|
} elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { |
# special treatment for role selector |
# special treatment for role selector |
($roleswitcher_js,$roleswitcher_form,my $switcher) = |
($roleswitcher_js,$roleswitcher_form,my $switcher) = |
&roles_selector( |
&roles_selector( |
Line 538 sub secondary_menu {
|
Line 564 sub secondary_menu {
|
} |
} |
$menu =~ s/\[uname\]/$$author{user}/g; |
$menu =~ s/\[uname\]/$$author{user}/g; |
$menu =~ s/\[udom\]/$$author{dom}/g; |
$menu =~ s/\[udom\]/$$author{dom}/g; |
if ($showsyllabus || $showfeeds) { |
if ($env{'request.course.id'}) { |
$menu =~ s/\[cnum\]/$cnum/g; |
$menu =~ s/\[cnum\]/$cnum/g; |
$menu =~ s/\[cdom\]/$cdom/g; |
$menu =~ s/\[cdom\]/$cdom/g; |
} |
} |
Line 2783 BEGIN {
|
Line 2809 BEGIN {
|
} elsif ($configline=~/^scnd\:/) { |
} elsif ($configline=~/^scnd\:/) { |
my @entries = (split(/\:/, $configline))[1..5]; |
my @entries = (split(/\:/, $configline))[1..5]; |
push(@secondary_menu,\@entries); |
push(@secondary_menu,\@entries); |
|
} elsif ($configline=~/^scndsub\:/) { |
|
my ($parent,@entries) = (split(/\:/, $configline))[1..4]; |
|
push(@{$secondary_submenu{$parent}},\@entries); |
} elsif ($configline) { |
} elsif ($configline) { |
push(@desklines,$configline); |
push(@desklines,$configline); |
} |
} |