version 1.96, 2003/12/09 19:48:51
|
version 1.106, 2004/02/13 14:59:48
|
Line 68 sub mapread {
|
Line 68 sub mapread {
|
|
|
sub storemap { |
sub storemap { |
my ($coursenum,$coursedom,$map)=@_; |
my ($coursenum,$coursedom,$map)=@_; |
$hadchanges=1; |
my ($outtext,$errtext)= |
return |
|
&Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. |
&Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. |
$map,1); |
$map,1); |
|
if ($errtext) { return ($errtext,2); } |
|
|
|
$hadchanges=1; |
|
return ($errtext,0); |
} |
} |
|
|
# ----------------------------------------- Return hash with valid author names |
# ----------------------------------------- Return hash with valid author names |
Line 250 sub group_import {
|
Line 253 sub group_import {
|
join ':', ($name, $url, $ext, 'normal', 'res'); |
join ':', ($name, $url, $ext, 'normal', 'res'); |
} |
} |
} |
} |
&storemap($coursenum, $coursedom, $folder.'.sequence'); |
return &storemap($coursenum, $coursedom, $folder.'.sequence'); |
} |
} |
|
|
sub editor { |
sub editor { |
Line 295 sub editor {
|
Line 298 sub editor {
|
$comment.':'.$url.':'.$ext.':normal:res'; |
$comment.':'.$url.':'.$ext.':normal:res'; |
$Apache::lonratedt::order[$#Apache::lonratedt::order+1]= |
$Apache::lonratedt::order[$#Apache::lonratedt::order+1]= |
$newidx; |
$newidx; |
&storemap($coursenum,$coursedom,$folder.'.sequence'); |
|
|
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence'); |
|
if ($fatal) { |
|
$r->print('<p><font color="red">'.$errtext.'</font></p>'); |
|
return; |
|
} |
} |
} |
} |
} |
if ($ENV{'form.cmd'}) { |
if ($ENV{'form.cmd'}) { |
Line 335 sub editor {
|
Line 343 sub editor {
|
|
|
} |
} |
# Store the changed version |
# Store the changed version |
&storemap($coursenum,$coursedom,$folder.'.sequence'); |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
|
$folder.'.sequence'); |
|
if ($fatal) { |
|
$r->print('<p><font color="red">'.$errtext.'</font></p>'); |
|
return; |
|
} |
} |
} |
# Group import/search |
# Group import/search |
if ($ENV{'form.importdetail'}) { |
if ($ENV{'form.importdetail'}) { |
Line 349 sub editor {
|
Line 362 sub editor {
|
} |
} |
} |
} |
# Store the changed version |
# Store the changed version |
group_import($coursenum, $coursedom, $folder, @imports); |
($errtext,$fatal)=group_import($coursenum, $coursedom, $folder, |
|
@imports); |
|
if ($fatal) { |
|
$r->print('<p><font color="red">'.$errtext.'</font></p>'); |
|
return; |
|
} |
} |
} |
# Loading a complete map |
# Loading a complete map |
if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { |
if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { |
foreach |
foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { |
(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { |
|
my $idx=$#Apache::lonratedt::resources; |
my $idx=$#Apache::lonratedt::resources; |
$idx++; |
$idx++; |
$Apache::lonratedt::resources[$idx]=$_; |
$Apache::lonratedt::resources[$idx]=$_; |
$Apache::lonratedt::order |
$Apache::lonratedt::order |
[$#Apache::lonratedt::order+1]=$idx; |
[$#Apache::lonratedt::order+1]=$idx; |
} |
} |
|
|
# Store the changed version |
# Store the changed version |
&storemap($coursenum,$coursedom,$folder.'.sequence'); |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
|
$folder.'.sequence'); |
|
if ($fatal) { |
|
$r->print('<p><font color="red">'.$errtext.'</font></p>'); |
|
return; |
|
} |
} |
} |
} |
} |
# ---------------------------------------------------------------- End commands |
# ---------------------------------------------------------------- End commands |
Line 373 sub editor {
|
Line 395 sub editor {
|
foreach (@Apache::lonratedt::order) { |
foreach (@Apache::lonratedt::order) { |
my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]); |
my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]); |
unless ($name) { $name=(split(/\//,$url))[-1]; } |
unless ($name) { $name=(split(/\//,$url))[-1]; } |
unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; } |
unless ($name) { next; } |
$r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); |
$r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); |
$idx++; |
$idx++; |
} |
} |
Line 425 END
|
Line 447 END
|
# Figure out what kind of a resource this is |
# Figure out what kind of a resource this is |
my ($extension)=($url=~/\.(\w+)$/); |
my ($extension)=($url=~/\.(\w+)$/); |
my $uploaded=($url=~/^\/*uploaded\//); |
my $uploaded=($url=~/^\/*uploaded\//); |
my $icon='unknown'; |
my $icon=&Apache::loncommon::icon($url); |
if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") { |
|
$icon=$extension; |
|
} |
|
my $isfolder=0; |
my $isfolder=0; |
if ($uploaded) { |
if ($uploaded) { |
if ($extension eq 'sequence') { |
if ($extension eq 'sequence') { |
$icon='folder_closed'; |
$icon=$iconpath.'/folder_closed.gif'; |
$url=~/\/(\w+)\.sequence/; |
$url=~/\/(\w+)\.sequence/; |
$url='/adm/coursedocs?folder='.$1; |
$url='/adm/coursedocs?folder='.$1; |
$isfolder=1; |
$isfolder=1; |
Line 454 END
|
Line 473 END
|
if ($isfolder) { $url.='&foldername='. |
if ($isfolder) { $url.='&foldername='. |
&Apache::lonnet::escape($foldertitle); } |
&Apache::lonnet::escape($foldertitle); } |
$line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder. |
$line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder. |
'"><img src="/adm/lonIcons/'. |
'"><img src="'.$icon.'" border="0"></a></td>'. |
$icon.'.gif" border="0"></a></td>'. |
|
"<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>"; |
"<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>"; |
return $line; |
return $line; |
} |
} |
Line 515 sub checkonthis {
|
Line 533 sub checkonthis {
|
if (($Apache::lonxml::errorcount) || |
if (($Apache::lonxml::errorcount) || |
($Apache::lonxml::warningcount)) { |
($Apache::lonxml::warningcount)) { |
if ($Apache::lonxml::errorcount) { |
if ($Apache::lonxml::errorcount) { |
$r->print('<font color="red"><b>'. |
$r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'. |
$Apache::lonxml::errorcount.' '. |
$Apache::lonxml::errorcount.' '. |
&mt('error(s)').'</b></font> '); |
&mt('error(s)').'</b></font> '); |
} |
} |
Line 539 sub checkonthis {
|
Line 557 sub checkonthis {
|
} elsif ($result==HTTP_SERVICE_UNAVAILABLE) { |
} elsif ($result==HTTP_SERVICE_UNAVAILABLE) { |
$r->print('<font color="red"><b>'.&mt('connection down').'</b></font>'); |
$r->print('<font color="red"><b>'.&mt('connection down').'</b></font>'); |
} elsif ($result==HTTP_NOT_FOUND) { |
} elsif ($result==HTTP_NOT_FOUND) { |
$r->print('<font color="red"><b>'.&mt('not found').'</b></font>'); |
unless ($url=~/\$/) { |
|
$r->print('<font color="red"><b>'.&mt('not found').'</b></font>'); |
|
} else { |
|
$r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>'); |
|
} |
} else { |
} else { |
$r->print('<font color="red"><b>'.&mt('access denied').'</b></font>'); |
$r->print('<font color="red"><b>'.&mt('access denied').'</b></font>'); |
} |
} |
Line 709 sub checkversions {
|
Line 731 sub checkversions {
|
<input type="submit" name="display" value="$lt{'sd'}" /> |
<input type="submit" name="display" value="$lt{'sd'}" /> |
<h3>$header</h3> |
<h3>$header</h3> |
<input type="submit" name="setversions" value="$lt{'sv'}" /> |
<input type="submit" name="setversions" value="$lt{'sv'}" /> |
<table border="2"> |
<table border="0"> |
<tr> |
|
<th>$lt{'fi'}</th><th>$lt{'md'}</th><th>$lt{'mr'}</th> |
|
<th>$lt{'ve'}</th><th>$lt{'vu'}</th><th>$lt{'di'}</th></tr> |
|
ENDHEADERS |
ENDHEADERS |
foreach (sort keys %changes) { |
foreach (sort keys %changes) { |
if ($changes{$_}>$starttime) { |
if ($changes{$_}>$starttime) { |
Line 723 ENDHEADERS
|
Line 742 ENDHEADERS
|
} |
} |
my $linkurl=&Apache::lonnet::clutter($_); |
my $linkurl=&Apache::lonnet::clutter($_); |
$r->print( |
$r->print( |
'<tr><td><b>'. |
'<tr><td colspan="5"><br /><br /><font size="+1"><b>'. |
&Apache::lonnet::gettitle($linkurl). |
&Apache::lonnet::gettitle($linkurl). |
'</b><br /><a href="'.$linkurl.'" target="cat">'.$linkurl. |
'</b></font></td></tr>'. |
'</a></td><td>'. |
'<tr><td> </td>'. |
&Apache::lonlocal::locallocaltime($changes{$_}). |
'<td colspan="4">'. |
'</td><td><font size="+2">'. |
'<a href="'.$linkurl.'" target="cat">'.$linkurl. |
$currentversion.'</font></td><td><font size="+2">'); |
'</a></td></tr>'. |
|
'<tr><td></td>'. |
|
'<td title="'.$lt{'md'}.'">'. |
|
&Apache::lonlocal::locallocaltime( |
|
&Apache::lonnet::metadata($root.'.'.$extension, |
|
'lastrevisiondate') |
|
). |
|
'</td>'. |
|
'<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '. |
|
'<font size="+1">'.$currentversion.'</font>'. |
|
'</nobr></td>'. |
|
'<td title="'.$lt{'ve'}.'"><nobr>In Course: '. |
|
'<font size="+1">'); |
# Used in course |
# Used in course |
my $usedversion=$hash{'version_'.$linkurl}; |
my $usedversion=$hash{'version_'.$linkurl}; |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
Line 737 ENDHEADERS
|
Line 768 ENDHEADERS
|
} else { |
} else { |
$r->print($currentversion); |
$r->print($currentversion); |
} |
} |
$r->print('</font></td><td>'); |
$r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'. |
|
'<nobr>Use: '); |
# Set version |
# Set version |
$r->print(&Apache::loncommon::select_form($setversions{$linkurl}, |
$r->print(&Apache::loncommon::select_form($setversions{$linkurl}, |
'set_version_'.$linkurl, |
'set_version_'.$linkurl, |
('' => '', |
('' => '', |
'mostrecent' => 'most recent', |
'mostrecent' => 'most recent', |
map {$_,$_} (1..$currentversion)))); |
map {$_,$_} (1..$currentversion)))); |
$r->print('</td><td><font size="1"><ul>'); |
$r->print('</nobr></td></tr><tr><td></td>'); |
my $lastold=1; |
my $lastold=1; |
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
my $url=$root.'.'.$prevvers.'.'.$extension; |
my $url=$root.'.'.$prevvers.'.'.$extension; |
Line 753 ENDHEADERS
|
Line 785 ENDHEADERS
|
$lastold=$prevvers; |
$lastold=$prevvers; |
} |
} |
} |
} |
|
# |
|
# Code to figure out how many version entries should go in |
|
# each of the four columns |
|
my $entries_per_col = 0; |
|
my $num_entries = ($currentversion-$lastold); |
|
if ($num_entries % 4 == 0) { |
|
$entries_per_col = $num_entries/4; |
|
} else { |
|
$entries_per_col = $num_entries/4 + 1; |
|
} |
|
my $entries_count = 0; |
|
$r->print('<td valign="top"><font size="-2">'); |
|
my $cols_output = 1; |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
my $url=$root.'.'.$prevvers.'.'.$extension; |
my $url=$root.'.'.$prevvers.'.'.$extension; |
$r->print('<li><a href="'.&Apache::lonnet::clutter($url). |
$r->print('<nobr><a href="'.&Apache::lonnet::clutter($url). |
'">'.&mt('Version').' '.$prevvers.'</a> ('. |
'">'.&mt('Version').' '.$prevvers.'</a> ('. |
&Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($url,'lastrevisiondate')). |
&Apache::lonlocal::locallocaltime( |
|
&Apache::lonnet::metadata($url, |
|
'lastrevisiondate') |
|
). |
')'); |
')'); |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
$r->print(' <a href="/adm/diff?filename='. |
$r->print(' <a href="/adm/diff?filename='. |
Line 765 ENDHEADERS
|
Line 813 ENDHEADERS
|
'&versionone='.$prevvers. |
'&versionone='.$prevvers. |
'">'.&mt('Diffs').'</a>'); |
'">'.&mt('Diffs').'</a>'); |
} |
} |
$r->print('</li>'); |
$r->print('</nobr><br />'); |
|
if (++$entries_count % $entries_per_col == 0) { |
|
$r->print('</font></td>'); |
|
if ($cols_output != 4) { |
|
$r->print('<td valign="top"><font size="-2">'); |
|
$cols_output++; |
|
} |
|
} |
} |
} |
$r->print('</ul></font></td></tr>'); |
while($cols_output++ < 4) { |
|
$r->print('</font></td><td><font>') |
|
} |
|
$r->print('</font></td></tr>'."\n"); |
} |
} |
} |
} |
$r->print('</table></form>'); |
$r->print('</table></form>'); |
Line 933 function makebulboard() {
|
Line 991 function makebulboard() {
|
} |
} |
} |
} |
|
|
|
function makeabout() { |
|
var user=prompt("Enter user\@domain for User's 'About Me' Page"); |
|
if (user) { |
|
var comp=new Array(); |
|
comp=user.split('\@'); |
|
if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) { |
|
if ((comp[0]) && (comp[1])) { |
|
this.document.forms.newaboutsomeone.importdetail.value= |
|
'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; |
|
this.document.forms.newaboutsomeone.submit(); |
|
} |
|
} |
|
} |
|
} |
|
|
function finishpick() { |
function finishpick() { |
var title=this.document.forms.extimport.title.value; |
var title=this.document.forms.extimport.title.value; |
var url=this.document.forms.extimport.url.value; |
var url=this.document.forms.extimport.url.value; |
Line 953 function changename(folder,index,oldtitl
|
Line 1026 function changename(folder,index,oldtitl
|
} |
} |
|
|
function removeres(folder,index,oldtitle) { |
function removeres(folder,index,oldtitle) { |
if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) { |
if (confirm('Remove "'+oldtitle+'"?')) { |
this.document.forms.renameform.cmd.value='del_'+index; |
this.document.forms.renameform.cmd.value='del_'+index; |
this.document.forms.renameform.folder.value=folder; |
this.document.forms.renameform.folder.value=folder; |
this.document.forms.renameform.submit(); |
this.document.forms.renameform.submit(); |
Line 966 ENDNEWSCRIPT
|
Line 1039 ENDNEWSCRIPT
|
# -------------------------------------------------------------------- Body tag |
# -------------------------------------------------------------------- Body tag |
$r->print('</head>'. |
$r->print('</head>'. |
&Apache::loncommon::bodytag('Course Documents','',$events, |
&Apache::loncommon::bodytag('Course Documents','',$events, |
'','',$showdoc)); |
'','',$showdoc). |
|
&Apache::loncommon::help_open_faq(273). |
|
&Apache::loncommon::help_open_bug('RAT')); |
unless ($showdoc) { |
unless ($showdoc) { |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
Line 988 ENDNEWSCRIPT
|
Line 1063 ENDNEWSCRIPT
|
'scuf' => 'Score Upload Form', |
'scuf' => 'Score Upload Form', |
'bull' => 'Bulletin Board', |
'bull' => 'Bulletin Board', |
'mypi' => 'My Personal Info', |
'mypi' => 'My Personal Info', |
|
'abou' => 'About User', |
'file' => 'File', |
'file' => 'File', |
'title' => 'Title', |
'title' => 'Title', |
'comment' => 'Comment' |
'comment' => 'Comment' |
Line 1172 value="$plainname=/adm/$udom/$uname/abou
|
Line 1248 value="$plainname=/adm/$udom/$uname/abou
|
$help{'My Personal Info'} |
$help{'My Personal Info'} |
</nobr> |
</nobr> |
</form> |
</form> |
|
<form action="/adm/coursedocs" method="post" name="newaboutsomeone"> |
|
<input type="hidden" name="folder" value="$folder"> |
|
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> |
|
<input type=hidden name="importdetail" value=""> |
|
<nobr> |
|
<input name="newaboutsomeone" type="button" value="$lt{'abou'}" |
|
onClick="javascript:makeabout();" /> |
|
</nobr> |
|
</form> |
</td></tr> |
</td></tr> |
</table> |
</table> |
ENDFORM |
ENDFORM |
Line 1193 ENDFORM
|
Line 1278 ENDFORM
|
$r->print(<<ENDSUPFORM); |
$r->print(<<ENDSUPFORM); |
<table cellspacing=4 cellpadding=4><tr> |
<table cellspacing=4 cellpadding=4><tr> |
<th bgcolor="#DDDDDD">$lt{'upls'}</th> |
<th bgcolor="#DDDDDD">$lt{'upls'}</th> |
<th bgcolor="#DDDDDD">$lt{'impp'}</th> |
|
<th bgcolor="#DDDDDD">$lt{'spec'}</th> |
<th bgcolor="#DDDDDD">$lt{'spec'}</th> |
</tr> |
</tr> |
<tr><td bgcolor="#DDDDDD"> |
<tr><td bgcolor="#DDDDDD"> |
Line 1212 ENDFORM
|
Line 1296 ENDFORM
|
</form> |
</form> |
</td> |
</td> |
<td bgcolor="#DDDDDD"> |
<td bgcolor="#DDDDDD"> |
<form action="/adm/coursedocs" method="post" name="simpleeditsupplement"> |
|
<input type="hidden" name="folder" value="$folder"> |
|
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> |
|
<input type=hidden name="importdetail" value=""> |
|
<input type=button onClick= |
|
"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}"> |
|
<input type=button onClick= |
|
"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'} |
|
<p> |
|
<hr /> |
|
<input type="text" size="20" name="importmap"> |
|
<input type=button |
|
onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')" |
|
value="$lt{'selm'}"><input type="submit" name="loadmap" value="$lt{'load'}">$help{'Load_Map'} |
|
</p> |
|
</form> |
|
</td><td bgcolor="#DDDDDD"> |
|
<form action="/adm/coursedocs" method="post" name="supnewfolder"> |
<form action="/adm/coursedocs" method="post" name="supnewfolder"> |
<input type="hidden" name="folder" value="$folder"> |
<input type="hidden" name="folder" value="$folder"> |
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> |
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> |