[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm lonprintout.pm /lonnet/perl lonnet.pm

[raeburn]

raeburn		Fri Jul  7 17:55:26 2006 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm lonmenu.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Replacing grppg with smppg from group homepages. Group context for group homepages detected from course domain and course number in URL.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.455 loncom/interface/lonprintout.pm:1.456
--- loncom/interface/lonprintout.pm:1.455	Mon Jul  3 09:48:41 2006
+++ loncom/interface/lonprintout.pm	Fri Jul  7 17:55:05 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.455 2006/07/03 13:48:41 albertel Exp $
+# $Id: lonprintout.pm,v 1.456 2006/07/07 21:55:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1296,7 +1296,7 @@
 	    }
 	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
 	    $result .= '\end{document}';   
-	} elsif ($cleanURL=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) { 
+	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
 		$resources_printed .= $currentURL.':';
@@ -1419,7 +1419,7 @@
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    } elsif ($urlp=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) { 
+	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
 		$resources_printed .= $urlp.':';
@@ -1914,7 +1914,7 @@
 			$rendered =~ s/\\end{document}//;
 		    }
 		    $current_output .= $rendered;		    
-		} elsif ($res_url=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) {
+		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
 		    $printed .= $curresline.':';
 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 
@@ -2240,7 +2240,7 @@
     # If the user has pfo (print for otheres) allow them to print all 
     # problems and resources  in the entier course, optionally for selected students
     if ($perm{'pfo'} && 
-        ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|grppg|aboutme|bulletinboard)$/)) { 
+        ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
 
         push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
 	push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.192 loncom/interface/lonmenu.pm:1.193
--- loncom/interface/lonmenu.pm:1.192	Mon Jul  3 00:14:21 2006
+++ loncom/interface/lonmenu.pm	Fri Jul  7 17:55:05 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.192 2006/07/03 04:14:21 albertel Exp $
+# $Id: lonmenu.pm,v 1.193 2006/07/07 21:55:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,7 +118,7 @@
 ENDNAV
             if (($env{'request.noversionuri'}=~/^\/adm\//) &&
          ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|grppg|bulletinboard|aboutme)(\?|$)/)) {
+         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
@@ -134,7 +134,7 @@
 #<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a>
 #ENDGROUPS
 #            }
-	}
+#	}
         my $form=&serverform();
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
@@ -211,7 +211,7 @@
 		(($env{'request.noversionuri'}=~/^\/adm\//) &&
 		 ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
 		 ($env{'request.noversionuri'}!~
-		        m[^/adm/.*/(smppg|grppg|bulletinboard|aboutme)($|\?)])
+		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
 		  )
 		 ) {
                 my $escreload=&escape('return:');
@@ -478,7 +478,7 @@
 s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&1
 s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&1
 ENDMENUITEMS
-            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|grppg|navmaps|syllabus|aboutme)(\?|$)/) {
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
 	        $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
 s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.760 loncom/lonnet/perl/lonnet.pm:1.761
--- loncom/lonnet/perl/lonnet.pm:1.760	Fri Jun 30 00:23:36 2006
+++ loncom/lonnet/perl/lonnet.pm	Fri Jul  7 17:55:23 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.760 2006/06/30 04:23:36 raeburn Exp $
+# $Id: lonnet.pm,v 1.761 2006/07/07 21:55:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1081,7 +1081,7 @@
 
 sub subscribe {
     my $fname=shift;
-    if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg|grppg)$/) { return ''; }
+    if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return ''; }
     $fname=~s/[\n\r]//g;
     my $author=$fname;
     $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;