version 1.295, 2009/10/26 21:19:22
|
version 1.296, 2009/10/28 09:01:59
|
Line 164 sub primary_menu {
|
Line 164 sub primary_menu {
|
# (link url, icon path, alt text, link text, condition) |
# (link url, icon path, alt text, link text, condition) |
foreach my $menuitem (@primary_menu) { |
foreach my $menuitem (@primary_menu) { |
# evaluate conditions |
# evaluate conditions |
|
next if ref($menuitem) ne 'ARRAY'; # |
next if $$menuitem[4] eq 'nonewmsg' # show links depending on |
next if $$menuitem[4] eq 'nonewmsg' # show links depending on |
&& &Apache::lonmsg::mynewmail(); # whether a new msg |
&& &Apache::lonmsg::mynewmail(); # whether a new msg |
next if $$menuitem[4] eq 'newmsg' # arrived or not |
next if $$menuitem[4] eq 'newmsg' # arrived or not |
Line 183 sub primary_menu {
|
Line 184 sub primary_menu {
|
if ($$menuitem[3] eq 'Help') { # special treatment for helplink |
if ($$menuitem[3] eq 'Help') { # special treatment for helplink |
$menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>'; |
$menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>'; |
} else { |
} else { |
if (ref($menuitem) eq 'ARRAY') { |
my @items = @{$menuitem}; |
my @items = @{$menuitem}; |
$items[0] = 'javascript:'.$menuitem->[0].';'; |
$items[0] = 'javascript:'.$menuitem->[0].';'; |
$menu .= &prep_menuitem(\@items); |
$menu .= &prep_menuitem(\@items); |
|
} |
|
} |
} |
} |
} |
|
|
Line 210 sub secondary_menu {
|
Line 209 sub secondary_menu {
|
$env{'course.' . $env{'request.course.id'} . '.num'}); |
$env{'course.' . $env{'request.course.id'} . '.num'}); |
foreach my $menuitem (@secondary_menu) { |
foreach my $menuitem (@secondary_menu) { |
# evaluate conditions |
# evaluate conditions |
|
next if ref($menuitem) ne 'ARRAY'; |
next if $$menuitem[4] ne 'always' |
next if $$menuitem[4] ne 'always' |
&& !$env{'request.course.id'}; |
&& !$env{'request.course.id'}; |
next if $$menuitem[4] eq 'showreturn' |
next if $$menuitem[4] eq 'showreturn' |
Line 241 sub secondary_menu {
|
Line 241 sub secondary_menu {
|
|
|
$menu .= $roles_selector ? "<li>$roles_selector</li>" |
$menu .= $roles_selector ? "<li>$roles_selector</li>" |
: ''; |
: ''; |
} else { |
} elsif ($env{'environment.remotenavmap'} eq 'on') { |
if ($env{'environment.remotenavmap'} eq 'on') { |
# open link using javascript when remote navmap is activated |
my @items = @{$menuitem}; |
my @items = @{$menuitem}; |
if ($menuitem->[4] eq 'remotenav') { |
if ($menuitem->[4] eq 'remotenav') { |
$items[0] = "javascript:gonav('$menuitem->[0]');"; |
$items[0] = "javascript:gonav('$menuitem->[0]');"; |
} else { |
|
$items[0] = "javascript:go('$menuitem->[0]');"; |
|
} |
|
$menu .= &prep_menuitem(\@items); |
|
} else { |
} else { |
$menu .= &prep_menuitem(\@$menuitem); |
$items[0] = "javascript:go('$menuitem->[0]');"; |
} |
} |
|
$menu .= &prep_menuitem(\@items); |
|
} else { |
|
$menu .= &prep_menuitem(\@$menuitem); |
} |
} |
} |
} |
if ($menu =~ /\[url\].*\[symb\]/) { |
if ($menu =~ /\[url\].*\[symb\]/) { |
Line 578 sub innerregister {
|
Line 577 sub innerregister {
|
my $tableend = ( $noremote ? '</table>' : ''); |
my $tableend = ( $noremote ? '</table>' : ''); |
# ============================================================================= |
# ============================================================================= |
# ============================ This is for URLs that actually can be registered |
# ============================ This is for URLs that actually can be registered |
if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) { |
if (($env{'request.noversionuri'}!~m{^/(res/)*adm/}) || ($forcereg)) { |
# -- This applies to homework problems for users with grading privileges |
# -- This applies to homework problems for users with grading privileges |
my $crs='/'.$env{'request.course.id'}; |
my $crs='/'.$env{'request.course.id'}; |
if ($env{'request.course.sec'}) { |
if ($env{'request.course.sec'}) { |