[LON-CAPA-cvs] cvs: loncom /auth lonacc.pm /interface lonmenu.pm lonprintout.pm /lonnet/perl lonnet.pm rat lonuserstate.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Fri, 30 Jun 2006 04:23:37 -0000
raeburn Fri Jun 30 00:23:37 2006 EDT
Modified files:
/rat lonuserstate.pm
/loncom/interface lonmenu.pm lonprintout.pm
/loncom/auth lonacc.pm
/loncom/lonnet/perl lonnet.pm
Log:
Fixes so more menu buttons are provided when group page is accessed via Navigation controls (i.e., as a registered resource). Other changes so grppg behaves like smppg.
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.116 rat/lonuserstate.pm:1.117
--- rat/lonuserstate.pm:1.116 Tue May 30 15:47:40 2006
+++ rat/lonuserstate.pm Fri Jun 30 00:23:25 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construct and maintain state and binary representation of course for user
#
-# $Id: lonuserstate.pm,v 1.116 2006/05/30 19:47:40 www Exp $
+# $Id: lonuserstate.pm,v 1.117 2006/06/30 04:23:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -199,7 +199,7 @@
$hash{'ids_'.$idsuri}=''.$rid;
}
- if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/) {
+ if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|grppg|bulletinboard)$/) {
$turi.='?register=1';
}
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.189 loncom/interface/lonmenu.pm:1.190
--- loncom/interface/lonmenu.pm:1.189 Thu Jun 29 22:14:58 2006
+++ loncom/interface/lonmenu.pm Fri Jun 30 00:23:29 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.189 2006/06/30 02:14:58 albertel Exp $
+# $Id: lonmenu.pm,v 1.190 2006/06/30 04:23:29 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|bulletinboard|aboutme)(\?|$)/)) {
+ ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|grppg|bulletinboard|aboutme)(\?|$)/)) {
my $escreload=&escape('return:');
$reloadlink=(<<ENDRELOAD);
<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
@@ -211,7 +211,7 @@
(($env{'request.noversionuri'}=~/^\/adm\//) &&
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
($env{'request.noversionuri'}!~
- m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+ m[^/adm/.*/(smppg|grppg|bulletinboard|aboutme)($|\?)])
)
) {
my $escreload=&escape('return:');
@@ -481,7 +481,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|navmaps|syllabus|aboutme)(\?|$)/) {
+ unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|grppg|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/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.449 loncom/interface/lonprintout.pm:1.450
--- loncom/interface/lonprintout.pm:1.449 Thu Jun 29 21:11:04 2006
+++ loncom/interface/lonprintout.pm Fri Jun 30 00:23:29 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.449 2006/06/30 01:11:04 albertel Exp $
+# $Id: lonprintout.pm,v 1.450 2006/06/30 04:23:29 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1262,7 +1262,7 @@
}
if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
$result .= '\end{document}';
- } elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+ } elsif ($cleanURL=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) {
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
$resources_printed .= $currentURL.':';
@@ -1380,7 +1380,7 @@
}
$result .= $texversion;
$flag_latex_header_remove = 'YES';
- } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+ } elsif ($urlp=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) {
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
$resources_printed .= $urlp.':';
@@ -1874,7 +1874,7 @@
$rendered =~ s/\\end{document}//;
}
$current_output .= $rendered;
- } elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+ } elsif ($res_url=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) {
$printed .= $curresline.':';
my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
@@ -2197,7 +2197,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|aboutme|bulletinboard)$/)) {
+ ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|grppg|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/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.82 loncom/auth/lonacc.pm:1.83
--- loncom/auth/lonacc.pm:1.82 Thu Jun 29 22:58:38 2006
+++ loncom/auth/lonacc.pm Fri Jun 30 00:23:33 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Cookie Based Access Handler
#
-# $Id: lonacc.pm,v 1.82 2006/06/30 02:58:38 albertel Exp $
+# $Id: lonacc.pm,v 1.83 2006/06/30 04:23:33 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -414,7 +414,7 @@
&Apache::lonnet::countacc($requrl);
$requrl=~/\.(\w+)$/;
if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
- ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard)(\?|$)/) ||
+ ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|grppg|bulletinboard)(\?|$)/) ||
($requrl=~/^\/adm\/wrapper\//) ||
($requrl=~m|^/adm/coursedocs/showdoc/|) ||
($requrl=~m|\.problem/smpedit$|) ||
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.759 loncom/lonnet/perl/lonnet.pm:1.760
--- loncom/lonnet/perl/lonnet.pm:1.759 Thu Jun 29 20:26:49 2006
+++ loncom/lonnet/perl/lonnet.pm Fri Jun 30 00:23:36 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.759 2006/06/30 00:26:49 albertel Exp $
+# $Id: lonnet.pm,v 1.760 2006/06/30 04:23:36 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1081,7 +1081,7 @@
sub subscribe {
my $fname=shift;
- if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return ''; }
+ if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg|grppg)$/) { return ''; }
$fname=~s/[\n\r]//g;
my $author=$fname;
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;