version 1.309.2.16, 2010/10/04 23:00:46
|
version 1.309.2.17, 2010/10/07 15:39:27
|
Line 183 sub primary_menu {
|
Line 183 sub primary_menu {
|
next if $$menuitem[4] eq 'gci' |
next if $$menuitem[4] eq 'gci' |
&& (!$custommenu || $env{'request.role'} =~ m{^st\./gcitest/}); |
&& (!$custommenu || $env{'request.role'} =~ m{^st\./gcitest/}); |
next if $$menuitem[4] eq 'home' |
next if $$menuitem[4] eq 'home' |
&& $custommenu; |
&& (($custommenu) || ($env{'user.domain'} eq 'gcitest')); |
next if $$menuitem[4] eq 'gcitest' |
next if $$menuitem[4] eq 'gcitest' |
&& $env{'user.domain'} eq 'gci'; |
&& (($env{'user.domain'} eq 'gci') || ($env{'request.role'} eq 'cm')); |
next if $$menuitem[4] eq 'roles' # hide links which are |
next if $$menuitem[4] eq 'roles' # hide links which are |
&& $custommenu; # not visible when GCI |
&& $custommenu; # not visible when GCI |
next if $$menuitem[4] eq 'courses' # tabbed interface in use |
next if $$menuitem[4] eq 'courses' # tabbed interface in use |
Line 224 sub secondary_menu {
|
Line 224 sub secondary_menu {
|
$env{'course.' . $env{'request.course.id'} . '.num'}); |
$env{'course.' . $env{'request.course.id'} . '.num'}); |
my $custommenu = &Apache::loncommon::needs_gci_custom(); |
my $custommenu = &Apache::loncommon::needs_gci_custom(); |
my $numdc = &Apache::loncommon::check_for_gci_dc(); |
my $numdc = &Apache::loncommon::check_for_gci_dc(); |
|
my $role = $env{'request.role'}; |
foreach my $menuitem (@secondary_menu) { |
foreach my $menuitem (@secondary_menu) { |
# evaluate conditions |
# evaluate conditions |
next if ref($menuitem) ne 'ARRAY'; |
next if ref($menuitem) ne 'ARRAY'; |
next if $$menuitem[4] eq 'showmenu' |
next if $$menuitem[4] eq 'showmenu' |
&& ($custommenu || !$numdc); |
&& ($custommenu || (!$numdc && $role eq 'cm')); |
|
next if $$menuitem[4] ne 'showmenu' |
|
&& $$menuitem[4] ne 'author' |
|
&& !$env{'request.course.id'}; |
next if $$menuitem[4] eq 'showreturn' |
next if $$menuitem[4] eq 'showreturn' |
&& !$showlink |
&& !$showlink |
&& !($env{'request.state'} eq 'construct'); |
&& !($env{'request.state'} eq 'construct'); |
Line 250 sub secondary_menu {
|
Line 254 sub secondary_menu {
|
&& !$canviewgrps |
&& !$canviewgrps |
&& !%groups; |
&& !%groups; |
next if $$menuitem[4] eq 'showroles' |
next if $$menuitem[4] eq 'showroles' |
&& ($custommenu || !$numdc); |
&& ($custommenu || !$numdc || ($numdc && $env{'request.noversionuri'} eq '/adm/roles')); |
if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'} && !$custommenu) { |
if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'} && !$custommenu) { |
# special treatment for role selector |
# special treatment for role selector |
my $roles_selector = &roles_selector( |
my $roles_selector = &roles_selector( |
Line 529 ENDINLINEMENU
|
Line 533 ENDINLINEMENU
|
} |
} |
|
|
sub show_return_link { |
sub show_return_link { |
|
return unless ($env{'request.course.id'}); |
if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)}) |
if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)}) |
|| ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) { |
|| ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) { |
return if ($env{'form.register'}); |
return if ($env{'form.register'}); |
Line 2333 function adhocRole(roleitem) {
|
Line 2338 function adhocRole(roleitem) {
|
secok = 0; |
secok = 0; |
var numrolesec = rolesections[selidx].length; |
var numrolesec = rolesections[selidx].length; |
var msgidx = numsec[selidx] - numrolesec; |
var msgidx = numsec[selidx] - numrolesec; |
secchoice = prompt("$lt{'this'} "+secpick[msgidx]+"\\n$lt{'avai'} "+roleseclist[selidx],""); |
secchoice = prompt("$lt{'this'}\\n"+secpick[msgidx]+"\\n$lt{'avai'} "+roleseclist[selidx],""); |
if (secchoice == '') { |
if (secchoice == '') { |
if (msgidx > 0) { |
if (msgidx > 0) { |
secok = 1; |
secok = 1; |