[LON-CAPA-cvs] cvs: loncom(loncapaMITrelate_1) /interface createaccount.pm lonmenu.pm

[raeburn]

raeburn		Tue May  1 12:39:32 2012 EDT

  Modified files:              (Branch: loncapaMITrelate_1)
    /loncom/interface	createaccount.pm lonmenu.pm 
  Log:
  - Customization for MITrelate
    - Sign-up for summer cohort.
    - Disable printout generation for summer course.
  
  
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.40.2.5.2.13 loncom/interface/createaccount.pm:1.40.2.5.2.14
--- loncom/interface/createaccount.pm:1.40.2.5.2.13	Fri Mar  2 20:44:25 2012
+++ loncom/interface/createaccount.pm	Tue May  1 12:39:32 2012
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.40.2.5.2.13 2012/03/02 20:44:25 raeburn Exp $
+# $Id: createaccount.pm,v 1.40.2.5.2.14 2012/05/01 12:39:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,8 +102,9 @@
     my ($js,$courseid,$title);
     if (defined($env{'form.courseid'})) {
         $courseid = &validate_course($env{'form.courseid'});
-        if ($courseid eq 'relate_3H121116c19344ff3relatel1') {
-            $courseid = 'relate_3e100973b27484f2drelatel1';
+        if (($courseid eq 'relate_3H121116c19344ff3relatel1') ||
+            ($courseid eq 'relate_3e100973b27484f2drelatel1') {
+            $courseid = 'relate_2764113e81b9e4f0crelatel1';
         }
     }
     if ($courseid ne '') {
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.315.2.15.2.2 loncom/interface/lonmenu.pm:1.315.2.15.2.3
--- loncom/interface/lonmenu.pm:1.315.2.15.2.2	Sat Mar  3 01:01:33 2012
+++ loncom/interface/lonmenu.pm	Tue May  1 12:39:32 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.315.2.15.2.2 2012/03/03 01:01:33 raeburn Exp $
+# $Id: lonmenu.pm,v 1.315.2.15.2.3 2012/05/01 12:39:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -744,7 +744,8 @@
 c&8&1
 c&8&2
 ENDMENUITEMS
-            if (($env{'request.course.id'} ne 'relate_3e100973b27484f2drelatel1') ||
+            if ((($env{'request.course.id'} ne 'relate_3e100973b27484f2drelatel1') &&
+                 ($env{'request.course.id'} ne 'relate_2764113e81b9e4f0crelatel1')) ||
                 ($env{'request.role'} =~ /^cc/)) {
                 $menuitems .= "s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document&&&$icon_text{'printout'}\n";
             }
@@ -786,8 +787,9 @@
 	    }
         }
 	if ($env{'request.uri'} =~ /^\/res/) {
-            if (($env{'request.course.id'} ne 'relate_3e100973b27484f2drelatel1') ||
-               ($env{'request.role'} =~ /^cc/)) {
+            if ((($env{'request.course.id'} ne 'relate_3e100973b27484f2drelatel1') &&
+                 ($env{'request.course.id'} ne 'relate_2764113e81b9e4f0crelatel1')) ||
+                ($env{'request.role'} =~ /^cc/)) {
                 my $icontext = &mt('Print');
 	        $menuitems .= (<<ENDMENUITEMS);
 s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document&&&$icontext