version 1.422, 2013/11/24 15:32:39
|
version 1.427, 2014/02/22 18:12:09
|
Line 283 sub primary_menu {
|
Line 283 sub primary_menu {
|
$menu{$position} .= prep_menuitem($menuitem); |
$menu{$position} .= prep_menuitem($menuitem); |
} |
} |
} |
} |
return ("<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>", |
my @output = ('',''); |
"<ol class=\"LC_primary_menu LC_floatright LC_right\">$menu{'right'}</ol>"); |
if ($menu{'left'} ne '') { |
|
$output[0] = "<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>"; |
|
} |
|
if ($menu{'right'} ne '') { |
|
$output[1] = "<ol class=\"LC_primary_menu LC_floatright LC_right\">$menu{'right'}</ol>"; |
|
} |
|
return @output; |
} |
} |
|
|
#returns hashref {user=>'',dom=>''} containing: |
#returns hashref {user=>'',dom=>''} containing: |
Line 508 sub create_submenu {
|
Line 514 sub create_submenu {
|
if ($count == $numsub) { |
if ($count == $numsub) { |
$borderbot = 'border-bottom:1px solid black;'; |
$borderbot = 'border-bottom:1px solid black;'; |
} |
} |
|
unless (($href eq '') || ($href =~ /^\#/)) { |
|
$target = ' target="_top"'; |
|
} |
$menu .= '<li style="margin:0;padding:0;'. |
$menu .= '<li style="margin:0;padding:0;'. |
$borderbot.'"><a href="'.$href.'">'; |
$borderbot.'"><a href="'.$href.'"'.$target.'>'; |
if ($translate) { |
if ($translate) { |
$menu .= &mt($item->[1]); |
$menu .= &mt($item->[1]); |
} else { |
} else { |
Line 1220 sub rawconfig {
|
Line 1229 sub rawconfig {
|
my $pub=($env{'request.state'} eq 'published'); |
my $pub=($env{'request.state'} eq 'published'); |
my $con=($env{'request.state'} eq 'construct'); |
my $con=($env{'request.state'} eq 'construct'); |
my $rol=$env{'request.role'}; |
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) { |
foreach my $line (@desklines) { |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
$prt=~s/\$uname/$uname/g; |
$prt=~s/\$uname/$uname/g; |
Line 1234 sub rawconfig {
|
Line 1246 sub rawconfig {
|
next if ($crstype ne 'Community'); |
next if ($crstype ne 'Community'); |
$prt=~s/\$cmty/$crs/g; |
$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 ($category_names{$cat}!~/\w/) { $cat='oth'; } |
if ($pro eq 'clear') { |
if ($pro eq 'clear') { |
$output.=&clear($row,$col); |
$output.=&clear($row,$col); |
Line 1270 sub rawconfig {
|
Line 1288 sub rawconfig {
|
next; |
next; |
} |
} |
} |
} |
if (&Apache::lonnet::allowed($priv,$prt)) { |
if ((($priv eq 'bre') && (&Apache::lonnet::allowed($priv,$prt) eq 'F')) || |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
(($priv ne 'bre') && (&Apache::lonnet::allowed($priv,$prt)))) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
} elsif ($pro eq 'course') { |
} elsif ($pro eq 'course') { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |
Line 1381 sub rawconfig {
|
Line 1400 sub rawconfig {
|
|
|
sub check_for_rcrs { |
sub check_for_rcrs { |
my $showreqcrs = 0; |
my $showreqcrs = 0; |
my @reqtypes = ('official','unofficial','community'); |
my @reqtypes = ('official','unofficial','community','textbook'); |
foreach my $type (@reqtypes) { |
foreach my $type (@reqtypes) { |
if (&Apache::lonnet::usertools_access($env{'user.name'}, |
if (&Apache::lonnet::usertools_access($env{'user.name'}, |
$env{'user.domain'}, |
$env{'user.domain'}, |