version 1.315, 2010/03/03 21:33:15
|
version 1.315.2.1, 2010/05/26 19:50:46
|
Line 220 sub primary_menu {
|
Line 220 sub primary_menu {
|
my $menu; |
my $menu; |
# each element of @primary contains following array: |
# 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) |
|
my $public; |
|
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) |
|
|| (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) { |
|
$public = 1; |
|
} |
foreach my $menuitem (@primary_menu) { |
foreach my $menuitem (@primary_menu) { |
# evaluate conditions |
# evaluate conditions |
next if ref($menuitem) ne 'ARRAY'; # |
next if ref($menuitem) ne 'ARRAY'; # |
Line 227 sub primary_menu {
|
Line 232 sub primary_menu {
|
&& &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 |
&& !&Apache::lonmsg::mynewmail(); # |
&& !&Apache::lonmsg::mynewmail(); # |
next if $$menuitem[4] !~ /public/ ##we've a public user, |
next if $$menuitem[4] !~ /public/ ##we've a public user, |
&& $env{'user.name'} eq 'public' ##who should not see all |
&& $public; ##who should not see all |
&& $env{'user.domain'} eq 'public'; ##links |
##links |
next if $$menuitem[4] eq 'onlypublic'# hide links which are |
next if $$menuitem[4] eq 'onlypublic'# hide links which are |
&& $env{'user.name'} ne 'public' # only visible to public |
&& !$public; # only visible to public |
&& $env{'user.domain'} ne 'public'; # users |
# users |
next if $$menuitem[4] eq 'roles' ##show links depending on |
next if $$menuitem[4] eq 'roles' ##show links depending on |
&& &Apache::loncommon::show_course(); ##term 'Courses' or |
&& &Apache::loncommon::show_course(); ##term 'Courses' or |
next if $$menuitem[4] eq 'courses' ##'Roles' wanted |
next if $$menuitem[4] eq 'courses' ##'Roles' wanted |
&& !&Apache::loncommon::show_course(); ## |
&& !&Apache::loncommon::show_course(); ## |
|
|
|
|
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 { |
Line 336 sub secondary_menu {
|
Line 341 sub secondary_menu {
|
} |
} |
|
|
sub show_return_link { |
sub show_return_link { |
|
if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)}) |
|
|| ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) { |
|
|
|
return if ($env{'form.register'}); |
|
} |
return (($env{'request.noversionuri'}=~m{^/(res|public)/} && |
return (($env{'request.noversionuri'}=~m{^/(res|public)/} && |
$env{'request.symb'} eq '') |
$env{'request.symb'} eq '') |
|| |
|| |
Line 344 sub show_return_link {
|
Line 354 sub show_return_link {
|
(($env{'request.noversionuri'}=~/^\/adm\//) && |
(($env{'request.noversionuri'}=~/^\/adm\//) && |
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && |
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && |
($env{'request.noversionuri'}!~ |
($env{'request.noversionuri'}!~ |
m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) |
m[^/adm/.*/(smppg|bulletinboard)($|\?)]) |
)); |
)); |
} |
} |
|
|
Line 417 sub innerregister {
|
Line 427 sub innerregister {
|
} else { |
} else { |
$contentstext = &mt('Course Contents'); |
$contentstext = &mt('Course Contents'); |
} |
} |
my @crumbs = ({text => $contentstext, |
my @crumbs; |
href => "Javascript:gonav('/adm/navmaps')"}); |
unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps') |
|
&& ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) { |
|
@crumbs = ({text => $contentstext, |
|
href => "Javascript:gopost('/adm/navmaps','')"}); |
|
} |
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { |
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { |
push(@crumbs, {text => '...', |
push(@crumbs, {text => '...', |
no_mt => 1}); |
no_mt => 1}); |
Line 663 $menuitems.="Make notes and annotations
|
Line 676 $menuitems.="Make notes and annotations
|
"&go('/adm/requestcourse')&Course requests\n"; |
"&go('/adm/requestcourse')&Course requests\n"; |
} |
} |
} |
} |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata |
s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata |
Line 722 ENDMENUITEMS
|
Line 735 ENDMENUITEMS
|
Apache::lonhtmlcommon::add_breadcrumb_tool( |
Apache::lonhtmlcommon::add_breadcrumb_tool( |
'tools', @inlineremote[63]); |
'tools', @inlineremote[63]); |
} |
} |
|
|
|
|
Apache::lonhtmlcommon::add_breadcrumb_tool( |
unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) { |
'advtools', @inlineremote[61,71,72,73,92]); |
Apache::lonhtmlcommon::add_breadcrumb_tool( |
|
'advtools', @inlineremote[61,71,72,73,92]); |
|
} |
} |
} |
|
|
# # Registered, textual output |
# # Registered, textual output |
Line 1666 function edit_bookmarks() {
|
Line 1680 function edit_bookmarks() {
|
go(''); |
go(''); |
w_BookmarkPal_flag=1; |
w_BookmarkPal_flag=1; |
bookmarkpal=window.open("/adm/bookmarks", |
bookmarkpal=window.open("/adm/bookmarks", |
"BookmarkPal", "width=400,height=505,scrollbars=0"); |
"BookmarkPal", "width=500,height=505,scrollbars=0"); |
} |
} |
|
|
function annotate() { |
function annotate() { |