[LON-CAPA-cvs] cvs: loncom(GCI_3) /interface lonmainmenu.pm
raeburn
raeburn@source.lon-capa.org
Mon, 04 Oct 2010 18:54:46 -0000
raeburn Mon Oct 4 18:54:46 2010 EDT
Modified files: (Branch: GCI_3)
/loncom/interface lonmainmenu.pm
Log:
- Customization for GCI_3
- gctest_switcher() and gcitest_switcher_js() moved from lonmainmenu.pm to loncommon.pm
- /adm/menu redirects to Contents page for Inventory, Submission and Tutorial courses
and for non-CC roles in Concept Tests.
Index: loncom/interface/lonmainmenu.pm
diff -u loncom/interface/lonmainmenu.pm:1.8.4.7 loncom/interface/lonmainmenu.pm:1.8.4.8
--- loncom/interface/lonmainmenu.pm:1.8.4.7 Fri Jan 15 04:12:54 2010
+++ loncom/interface/lonmainmenu.pm Mon Oct 4 18:54:46 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# displays the main menu
#
-# $Id: lonmainmenu.pm,v 1.8.4.7 2010/01/15 04:12:54 raeburn Exp $
+# $Id: lonmainmenu.pm,v 1.8.4.8 2010/10/04 18:54:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,13 +53,25 @@
$r->send_http_header;
return OK if $r->header_only;
- my $form;
+ my $custommenu = &Apache::loncommon::needs_gci_custom();
+ my $cid = $env{'request.course.id'};
+ my %gcicourses = (
+ gci_9615072b469884921gcil1 => 'review',
+ gci_1H96711d710194bfegcil1 => 'submit',
+ gci_5422913620b814c90gcil1 => 'tutorial',
+ );
+ if (($custommenu && $cid ne '' && ($gcicourses{$cid} || $env{'request.role'} !~ m{^cc\./gcitest/})) ||
+ ($env{'user.domain'} eq 'gcitest')) {
+ $r->internal_redirect('/adm/navmaps');
+ return OK;
+ }
+
+ my $form;
if ($env{'environment.remote'} ne 'off') {
$form=&Apache::lonmenu::serverform();
}
- my $custommenu = &Apache::loncommon::needs_gci_custom();
- my ($script_tag,$switcher);
+ my $script_tag;
if ($env{'environment.remote'} ne 'off') {
my $utility=&Apache::lonmenu::utilityfunctions('/adm/menu');
$script_tag=(<<ENDSCRIPT);
@@ -67,32 +79,6 @@
$utility
</script>
ENDSCRIPT
- } elsif (($custommenu) || ($env{'user.domain'} eq 'gcitest')) {
- my $role = 'st';
- if ($custommenu) {
- $role = 'cc';
- }
- my $switcher_js;
- my %courses = &Apache::loncommon::existing_gcitest_courses($role);
- my $numcourses = keys(%courses);
- if ($numcourses > 0) {
- $switcher = &gcitest_switcher($role,%courses);
- my $current;
- if ($env{'request.course.id'}) {
- $current = $role.'./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
- '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
- }
- $switcher_js = &gcitest_switcher_js($current,$numcourses);
- $script_tag= <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-
-$switcher_js
-
-// ]]>
-</script>
-ENDSCRIPT
- }
}
# ---- Print the screen, pretend to be in text mode to generate text-based menu
# temporarily set interface to "faketextual" and remote to "off", which renders
@@ -100,10 +86,15 @@
$env{'browser.interface'}='faketextual';
$env{'environment.remote'}='off';
- $r->print(&Apache::loncommon::start_page( 'Main Menu',
- $script_tag,
- {'bread_crumbs' => 1}));
- my $rolecount = 0;
+ # Breadcrumbs
+ my $args;
+ unless ($custommenu && !$env{'request.course.id'}) {
+ my $brcrum = [];
+ $args = {bread_crumbs => $brcrum};
+ }
+ $r->print(&Apache::loncommon::start_page('Main Menu',$script_tag,$args));
+
+ my ($rolecount,$numcourses) = (0,0);
unless (($custommenu) || ($env{'user.domain'} eq 'gcitest')) {
foreach my $envkey (keys(%env)) {
next unless ($envkey =~ /^user\.role\./);
@@ -111,9 +102,7 @@
}
}
if ($custommenu) {
- $r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).$form);
- } elsif ($env{'user.domain'} eq 'gcitest') {
- $r->print(&Apache::lonmenu::inlinemenu('gcistudent',$switcher).$form);
+ $r->print(&Apache::lonmenu::inlinemenu('gcicustom').$form);
} elsif (!$rolecount) {
$r->print(&Apache::lonmenu::inlinemenu('gcinorole').$form);
} else {
@@ -123,79 +112,6 @@
return OK;
}
-sub gcitest_switcher {
- my ($role,%courses) = @_;
- my $output;
- my %Sortby;
- foreach my $course (sort(keys(%courses))) {
- next unless (ref($courses{$course}) eq 'HASH');
- my $clean_title = $courses{$course}{'description'};
- $clean_title =~ s/\W+//g;
- if ($clean_title eq '') {
- $clean_title = $courses{$course}{'description'};
- }
- push(@{$Sortby{$clean_title}},$course);
- }
- my @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
- my $default;
- if (@sorted_courses > 1) {
- if (($env{'request.course.id'}) && ($courses{$env{'request.course.id'}})) {
- $default = &mt('Switch concept test ...');
- } else {
- $default = &mt('Select a concept test ...');
- }
- } else {
- unless (($env{'request.course.id'}) && ($courses{$env{'request.course.id'}})) {
- $default = &mt('Select concept test ...');
- }
- }
- if ($default) {
- $output = '<form name="pickrole" action="/adm/roles" method="post">'.
- '<select name="newrole" onchange="javascript:courseswitcher();">'.
- '<option value="" selected="selected">'.$default.'</option>';
- foreach my $item (@sorted_courses) {
- foreach my $course (@{$Sortby{$item}}) {
- my ($cdom,$cnum) = split('_',$course);
- $output .= '<option value="'.$role.'./'.$cdom.'/'.$cnum.'">'.$courses{$course}{'description'}.'</option>';
- }
- }
- $output .= '</select><input type="hidden" name="selectrole" value="" /></form>';
- }
- return $output;
-}
-
-sub gcitest_switcher_js {
- my ($current,$numcourses) = @_;
- my $output = <<"ENDJS";
-
-function courseswitcher(caller) {
- var numcourses = $numcourses;
- var current = '$current';
- var choice = document.pickrole.newrole.options[document.pickrole.newrole.selectedIndex].value;
- if (choice == '') {
- if (caller == 'icon') {
- alert('No Concept Test selected');
- }
- document.pickrole.selectrole.value = '';
- return;
- }
- if (choice == current) {
- if ((caller != 'icon') && (numcourses > 1)) {
- alert('You have selected the current course.\\nPlease select a different Concept Test course');
- }
- document.pickrole.newrole.selectedIndex = 0;
- document.pickrole.selectrole.value = '';
- return;
- }
- document.pickrole.selectrole.value = '1';
- document.pickrole.submit();
- return;
-}
-
-ENDJS
- return $output;
-}
-
1;
__END__