[LON-CAPA-cvs] cvs: rat / lonsequence.pm lonuserstate.pm loncom/auth lonroles.pm loncom/interface loncreatecourse.pm londocs.pm
www
lon-capa-cvs@mail.lon-capa.org
Sat, 31 Aug 2002 00:43:13 -0000
This is a MIME encoded message
--www1030754593
Content-Type: text/plain
www Fri Aug 30 20:43:13 2002 EDT
Modified files:
/loncom/auth lonroles.pm
/loncom/interface loncreatecourse.pm londocs.pm
/rat lonsequence.pm lonuserstate.pm
Log:
Various new functionality for "ad hoc" courses.
--www1030754593
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20020830204313.txt"
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.42 loncom/auth/lonroles.pm:1.43
--- loncom/auth/lonroles.pm:1.42 Wed Aug 28 10:11:27 2002
+++ loncom/auth/lonroles.pm Fri Aug 30 20:43:12 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.42 2002/08/28 14:11:27 www Exp $
+# $Id: lonroles.pm,v 1.43 2002/08/31 00:43:12 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,16 +118,17 @@
&Apache::loncommon::no_cache($r);
$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig($r);
+ my $bodytag=&Apache::loncommon::bodytag('Switching Role');
print (<<ENDREDIR);
<head><title>Entering Course</title>
<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$furl">
</head>
<html>
-<body bgcolor="#FFFFFF">
+$bodytag
<script>
$swinfo
</script>
-$msg
+<h1>$msg</h1>
</body>
</html>
ENDREDIR
@@ -329,7 +330,8 @@
my %newhash=Apache::lonnet::coursedescription
($tcourseid);
if (%newhash) {
- $twhere=$newhash{'description'};
+ $twhere=
+&Apache::loncommon::syllabuswrapper($newhash{'description'},$trest,$tdom);
} else {
$twhere='Currently not available';
$ENV{'course.'.$tcourseid.'.description'}=$twhere;
@@ -389,7 +391,7 @@
$r->print("</form>\n");
}
# ------------------------------------------------------------ Privileges Info
- if ($advanced) {
+ if (($advanced) && (($ENV{'user.error.msg'}) || ($error))) {
$r->print('<hr><h2>Current Privileges</h2>');
foreach $envkey (sort keys %ENV) {
Index: loncom/interface/loncreatecourse.pm
diff -u loncom/interface/loncreatecourse.pm:1.11 loncom/interface/loncreatecourse.pm:1.12
--- loncom/interface/loncreatecourse.pm:1.11 Sun Aug 18 17:43:59 2002
+++ loncom/interface/loncreatecourse.pm Fri Aug 30 20:43:12 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.11 2002/08/18 21:43:59 www Exp $
+# $Id: loncreatecourse.pm,v 1.12 2002/08/31 00:43:12 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,7 +44,7 @@
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet;
-
+use Apache::loncommon;
# ===================================================== Phase one: fill-in form
sub print_course_creation_page {
@@ -58,6 +58,8 @@
}
$course_home .= "\n</select>\n";
my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
+ my $bodytag=&Apache::loncommon::bodytag('Create a New Course');
+
$r->print(<<ENDDOCUMENT);
<html>
<script language="JavaScript" type="text/javascript">
@@ -82,9 +84,7 @@
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
-<body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif">
-<h1>Create a new Course</h1>
+$bodytag
<form action="/adm/createcourse" method="post" name="ccrs">
<h2>Course Information</h2>
<p>
@@ -143,14 +143,13 @@
$ccdomain=~s/\W//g;
my $cdescr=$ENV{'form.title'};
my $curl=$ENV{'form.topmap'};
+ my $bodytag=&Apache::loncommon::bodytag('Create a New Course');
$r->print(<<ENDENHEAD);
<html>
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Create a new Course</h1>
+$bodytag
ENDENHEAD
#
# Verify data
@@ -178,30 +177,63 @@
$r->print('New LON-CAPA Course ID: '.$courseid.'<br>');
#
-# Set optional courseid
+# Check if created correctly
#
my ($crsudom,$crsunum)=($courseid=~/^\/(\w+)\/(\w+)$/);
my $crsuhome=&Apache::lonnet::homeserver($crsunum,$crsudom);
$r->print('Created on: '.$crsuhome.'<br>');
+#
+# Set environment
+#
+ my %cenv=();
+ my $envflag=0;
if ($ENV{'form.crsid'}) {
- $r->print('Setting optional Course ID/Number: '.
- &Apache::lonnet::reply('put:'.$crsudom.':'.
- $crsunum.':environment:courseid='.
- &Apache::lonnet::escape($ENV{'form.crsid'}),
- $crsuhome).'<br>');
+ $envflag=1;
+ $cenv{'courseid'}=$ENV{'form.crsid'};
+ }
+ if (($ccdomain) && ($ccuname)) {
+ if ($ENV{'form.setpolicy'}) {
+ $envflag=1;
+ $cenv{'policy.email'}=$ccuname.':'.$ccdomain;
+ }
+ if ($ENV{'form.setcontent'}) {
+ $envflag=1;
+ $cenv{'question.email'}=$ccuname.':'.$ccdomain;
+ }
}
+ if ($envflag) {
+ $r->print('Setting environment: '.
+ &Apache::lonnet::put('environment',\%cenv,$crsudom,$crsunum).'<br>');
+ }
+#
+# Open all assignments
+#
+ if ($ENV{'form.openall'}) {
+ my $storeunder=$crsudom.'_'.$crsunum.'.0.opendate';
+ my %storecontent = ($storeunder => time,
+ $storeunder.'type' => 'date_start');
+
+ $r->print('Opening all assignments: '.&Apache::lonnet::cput
+ ('resourcedata',\%storecontent,$crsudom,$crsunum).'<br>');
+ }
+
#
# Make current user course adminstrator
#
- $r->print('Assigning role of course coordinator to self: '.
+ my $end=undef;
+ my $addition='';
+ if ($ENV{'form.expireown'}) { $end=time+5; $addition='expired'; }
+ $r->print('Assigning '.$addition.' role of course coordinator to self: '.
&Apache::lonnet::assignrole(
- $ENV{'user.domain'},$ENV{'user.name'},$courseid,'cc').'<br>');
+ $ENV{'user.domain'},$ENV{'user.name'},$courseid,'cc',$end).'<br>');
#
# Make additional user course administrator
#
+ if (($ccdomain) && ($ccuname)) {
$r->print('Assigning role of course coordinator to '.
$ccuname.' at '.$ccdomain.': '.
&Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').'<p>');
+ }
$r->print('Roles will be active at next login.</body></html>');
}
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.13 loncom/interface/londocs.pm:1.14
--- loncom/interface/londocs.pm:1.13 Wed Aug 28 10:11:27 2002
+++ loncom/interface/londocs.pm Fri Aug 30 20:43:12 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.13 2002/08/28 14:11:27 www Exp $
+# $Id: londocs.pm,v 1.14 2002/08/31 00:43:12 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -209,6 +209,13 @@
my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+# get personal data
+
+ my $uname=$ENV{'user.name'};
+ my $udom=$ENV{'user.domain'};
+ my $plainname=&Apache::lonnet::escape(
+ &Apache::loncommon::plainname($uname,$udom));
+
# graphics settings
$iconpath = $r->dir_config('lonIconsURL') . "/";
@@ -266,13 +273,14 @@
value="External Resource" />
</form>
<form action="/adm/coursedocs" method="post" name="newsyl">
-<input type=hidden name="importdetail" value="">
-<input name="newsyl" type="button" onClick="javascript:newsyl();"
-value="Syllabus" />
+<input type=hidden name="importdetail"
+value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+<input name="newsyl" type="submit" value="Syllabus" />
</form>
<form action="/adm/coursedocs" method="post" name="newaboutme">
-<input type=hidden name="importdetail" value="">
-<input name="newaboutme" type="button" onClick="javascript:newaboutme();"
+<input type=hidden name="importdetail"
+value="$plainname=/adm/$udom/$uname/aboutme">
+<input name="newaboutme" type="submit" onClick="javascript:newaboutme();"
value="My Personal Info" />
</form>
</td></tr>
Index: rat/lonsequence.pm
diff -u rat/lonsequence.pm:1.13 rat/lonsequence.pm:1.14
--- rat/lonsequence.pm:1.13 Mon Aug 12 14:21:42 2002
+++ rat/lonsequence.pm Fri Aug 30 20:43:13 2002
@@ -2,7 +2,7 @@
#
# Sequence Handler
#
-# $Id: lonsequence.pm,v 1.13 2002/08/12 18:21:42 albertel Exp $
+# $Id: lonsequence.pm,v 1.14 2002/08/31 00:43:13 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,6 +45,7 @@
use Apache::lonratedt;
use Apache::lonratsrv;
use Apache::lonpageflip;
+use Apache::loncommon;
my %selhash;
my $successtied;
@@ -89,7 +90,7 @@
</script>
ENDSCRIPT
}
- $r->print('<body bgcolor="#FFFFFF">');
+ $r->print(&Apache::loncommon::bodytag('Map Contents').'<h1>'.$url.'</h1>');
# ------------------ This is trying to select. Provide buttons and tie %selhash
if ($ENV{'form.forceselect'}) { $r->print(<<ENDSELECT);
<form name=fileattr><input type=hidden name=acts value=''>
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.38 rat/lonuserstate.pm:1.39
--- rat/lonuserstate.pm:1.38 Sat Aug 17 14:23:27 2002
+++ rat/lonuserstate.pm Fri Aug 30 20:43:13 2002
@@ -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.38 2002/08/17 18:23:27 www Exp $
+# $Id: lonuserstate.pm,v 1.39 2002/08/31 00:43:13 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -122,7 +122,8 @@
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
} else {
my $embstyle=&Apache::loncommon::fileembstyle($1);
- if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+ if (($embstyle eq 'img') || ($embstyle eq 'emb')
+ || ($turi=~/\/syllabus$/) || ($turi=~/\/aboutme$/)) {
$turi='/adm/wrapper'.$turi;
}
}
--www1030754593--