--- loncom/interface/londocs.pm 2003/09/17 21:20:15 1.80 +++ loncom/interface/londocs.pm 2004/02/27 19:11:08 1.109 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.80 2003/09/17 21:20:15 albertel Exp $ +# $Id: londocs.pm,v 1.109 2004/02/27 19:11:08 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,7 @@ use Apache::lonxml; use Apache::loncreatecourse; use HTML::Entities; use GDBM_File; +use Apache::lonlocal; my $iconpath; @@ -67,10 +68,13 @@ sub mapread { sub storemap { my ($coursenum,$coursedom,$map)=@_; - $hadchanges=1; - return + my ($outtext,$errtext)= &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. $map,1); + if ($errtext) { return ($errtext,2); } + + $hadchanges=1; + return ($errtext,0); } # ----------------------------------------- Return hash with valid author names @@ -93,13 +97,15 @@ sub authorhosts { } else { ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/); } - if (&Apache::lonnet::homeserver($ca,$cd) eq - $Apache::lonnet::perlvar{'lonHostID'}) { + my $allowed=0; + my $myhome=&Apache::lonnet::homeserver($ca,$cd); + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; } } + if ($allowed) { $home++; $outhash{'home_'.$ca.'@'.$cd}=1; } else { - $outhash{'otherhome_'.$ca.'@'.$cd}= - &Apache::lonnet::homeserver($ca,$cd); + $outhash{'otherhome_'.$ca.'@'.$cd}=$myhome; $other++; } } @@ -114,10 +120,11 @@ sub dumpbutton { my $output='</td><td bgcolor="#DDDDCC">'; if ($home) { return '</td><td bgcolor="#DDDDCC">'. - '<input type="submit" name="dumpcourse" value="Dump Course DOCS to Construction Space" />'; + '<input type="submit" name="dumpcourse" value="'. + &mt('Dump Course DOCS to Construction Space').'" />'; } else { return'</td><td bgcolor="#DDDDCC">'. - 'Dump Course DOCS to Construction Space: available on other servers'; + &mt('Dump Course DOCS to Construction Space: available on other servers'); } } @@ -136,7 +143,7 @@ sub dumpcourse { # Do the dumping unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; } my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'}); - $r->print('<h3>Copying Files</h3>'); + $r->print('<h3>'.&mt('Copying Files').'</h3>'); my $title=$ENV{'form.authorfolder'}; $title=~s/[^\w\/]+/\_/g; my %replacehash=(); @@ -185,7 +192,7 @@ sub dumpcourse { # Input form unless ($home==1) { $r->print( - '<h3>Select the Construction Space</h3><select name="authorspace">'); + '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">'); } foreach (sort keys %outhash) { if ($_=~/^home_(.+)$/) { @@ -203,9 +210,9 @@ sub dumpcourse { my $title=$origcrsdata{'description'}; $title=~s/\s+/\_/gs; $title=~s/\W//gs; - $r->print('<h3>Folder in Construction Space</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />'); + $r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />'); &tiehash(); - $r->print('<h3>Filenames in Construction Space</h3><table border="2"><tr><th>Internal Filename</th><th>Title</th><th>Save as ...</th></tr>'); + $r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>'); foreach (&Apache::loncreatecourse::crsdirlist($origcrsid,'userfiles')) { $r->print('<tr><td>'.$_.'</td>'); my ($ext)=($_=~/\.(\w+)$/); @@ -223,7 +230,7 @@ sub dumpcourse { $r->print("</table>\n"); &untiehash(); $r->print( - '<p><input type="submit" name="dumpcourse" value="Dump Course DOCS" /></p></form>'); + '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump Course DOCS').'" /></p></form>'); } } @@ -248,7 +255,7 @@ sub group_import { join ':', ($name, $url, $ext, 'normal', 'res'); } } - &storemap($coursenum, $coursedom, $folder.'.sequence'); + return &storemap($coursenum, $coursedom, $folder.'.sequence'); } sub editor { @@ -293,7 +300,12 @@ sub editor { $comment.':'.$url.':'.$ext.':normal:res'; $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= $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'}) { @@ -333,7 +345,12 @@ sub editor { } # 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 if ($ENV{'form.importdetail'}) { @@ -347,21 +364,30 @@ sub editor { } } # 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 if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { - foreach -(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { + foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { my $idx=$#Apache::lonratedt::resources; $idx++; $Apache::lonratedt::resources[$idx]=$_; $Apache::lonratedt::order - [$#Apache::lonratedt::order+1]=$idx; - } + [$#Apache::lonratedt::order+1]=$idx; + } # 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 @@ -371,7 +397,7 @@ sub editor { foreach (@Apache::lonratedt::order) { my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]); 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,$_)); $idx++; } @@ -385,48 +411,53 @@ sub entryline { my ($index,$title,$url,$folder,$allowed,$residx)=@_; $title=~s/\&colon\;/\:/g; $title=&HTML::Entities::encode(&HTML::Entities::decode( - &Apache::lonnet::unescape($title)),'\"\<\>\&\''); + &Apache::lonnet::unescape($title)),'"<>&\''); my $renametitle=$title; my $foldertitle=$title; - if ($title=~ - /^(\d+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(.*)$/ - ) { - $foldertitle=&Apache::lontexconvert::msgtexconverted($4); - $renametitle=$4; - $title='<i>'.localtime($1).'</i> '. - &Apache::loncommon::plainname($2,$3).': <br>'. - $foldertitle; - } + if ($title=~ /^(\d+)___&&&___(\w+)___&&&___(\w+)___&&&___(.*)$/ ) { + $foldertitle=&Apache::lontexconvert::msgtexconverted($4); + $renametitle=$4; + $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '. + &Apache::loncommon::plainname($2,$3).': <br />'. + $foldertitle; + } $renametitle=~s/\"\;/\\\"/g; my $line='<tr>'; # Edit commands if ($allowed) { - $line.=(<<END); + my %lt=('up' => 'Move Up', + 'dw' => 'Move Down', + 'rm' => 'Remove', + 'rn' => 'Rename'); + my ($foldername,$htmlfoldername); + if ($ENV{'form.foldername'}) { + $foldername='&foldername='. + &Apache::lonnet::escape($ENV{'form.foldername'}); + $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'}); + } + $line.=(<<END); <td><table border='0' cellspacing='2' cellpadding='0'> <tr><td bgcolor="#DDDDDD"> -<a href='/adm/coursedocs?folder=$folder&cmd=up_$index'> -<img src="${iconpath}move_up.gif" alt='UP' border='0' /></a></td></tr> +<a href='/adm/coursedocs?folder=$folder&cmd=up_$index$foldername'> +<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr> <tr><td bgcolor="#DDDDDD"> -<a href='/adm/coursedocs?folder=$folder&cmd=down_$index'> -<img src="${iconpath}move_down.gif" alt='DOWN' border='0' /></a></td></tr> +<a href='/adm/coursedocs?folder=$folder&cmd=down_$index$foldername'> +<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr> </table></td><td bgcolor="#DDDDDD"> -<a href='javascript:removeres("$folder","$index","$renametitle");'> -<font size="-2" color="#990000">Remove</font></a> -<a href='javascript:changename("$folder","$index","$renametitle");'> -<font size="-2" color="#009900">Rename</font></a></td> +<a href='javascript:removeres("$folder","$index","$renametitle","$htmlfoldername");'> +<font size="-2" color="#990000">$lt{'rm'}</font></a> +<a href='javascript:changename("$folder","$index","$renametitle","$htmlfoldername");'> +<font size="-2" color="#009900">$lt{'rn'}</font></a></td> END } # Figure out what kind of a resource this is my ($extension)=($url=~/\.(\w+)$/); my $uploaded=($url=~/^\/*uploaded\//); - my $icon='unknown'; - if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") { - $icon=$extension; - } + my $icon=&Apache::loncommon::icon($url); my $isfolder=0; if ($uploaded) { if ($extension eq 'sequence') { - $icon='folder_closed'; + $icon=$iconpath.'/folder_closed.gif'; $url=~/\/(\w+)\.sequence/; $url='/adm/coursedocs?folder='.$1; $isfolder=1; @@ -448,8 +479,7 @@ END if ($isfolder) { $url.='&foldername='. &Apache::lonnet::escape($foldertitle); } $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder. -'"><img src="/adm/lonIcons/'. - $icon.'.gif" border="0"></a></td>'. + '"><img src="'.$icon.'" border="0"></a></td>'. "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>"; return $line; } @@ -478,7 +508,7 @@ sub checkonthis { $alreadyseen{$url}=1; $r->rflush(); if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { - $r->print('<br />'); + $r->print("\n<br />"); for (my $i=0;$i<=$level*5;$i++) { $r->print(' '); } @@ -488,7 +518,7 @@ sub checkonthis { my $result=&Apache::lonnet::repcopy( &Apache::lonnet::filelocation('',$url)); if ($result==OK) { - $r->print('<font color="green">ok</font>'); + $r->print('<font color="green">'.&mt('ok').'</font>'); $r->rflush(); &Apache::lonnet::countacc($url); $url=~/\.(\w+)$/; @@ -498,25 +528,28 @@ sub checkonthis { for (my $i=0;$i<=$level*5;$i++) { $r->print(' '); } - $r->print('- Rendering: '); + $r->print('- '.&mt('Rendering').': '); my $oldpath=$ENV{'request.filename'}; $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url); &Apache::lonxml::xmlparse($r,'web', &Apache::lonnet::getfile( &Apache::lonnet::filelocation('',$url))); + undef($Apache::lonhomework::parsing_a_problem); $ENV{'request.filename'}=$oldpath; if (($Apache::lonxml::errorcount) || ($Apache::lonxml::warningcount)) { if ($Apache::lonxml::errorcount) { - $r->print('<font color="red"><b>'. - $Apache::lonxml::errorcount.' error(s)</b></font> '); + $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'. + $Apache::lonxml::errorcount.' '. + &mt('error(s)').'</b></font> '); } if ($Apache::lonxml::warningcount) { $r->print('<font color="blue">'. - $Apache::lonxml::warningcount.' warning(s)</font>'); + $Apache::lonxml::warningcount.' '. + &mt('warning(s)').'</font>'); } } else { - $r->print('<font color="green">ok</font>'); + $r->print('<font color="green">'.&mt('ok').'</font>'); } $r->rflush(); } @@ -528,11 +561,15 @@ sub checkonthis { } } } elsif ($result==HTTP_SERVICE_UNAVAILABLE) { - $r->print('<font color="red"><b>connection down</b></font>'); + $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>'); } elsif ($result==HTTP_NOT_FOUND) { - $r->print('<font color="red"><b>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 { - $r->print('<font color="red"><b>access denied</b></font>'); + $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>'); } } } @@ -559,110 +596,268 @@ sub verifycontent { } } &untiehash(); - $r->print('<h1>Done.</h1>'); + $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'. + &mt('Return to DOCS').'</a>'); } # -------------------------------------------------------------- Check Versions sub checkversions { my $r=shift; - $r->print('<html><head><title>Check Versions</title></head>'. + $r->print('<html><head><title>Check Versions</title></head>'. &Apache::loncommon::bodytag('Check Course Document Versions')); - $hashtied=0; - &tiehash(); - my %changes=&Apache::lonnet::dump - ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - my $firstkey=(keys %changes)[0]; - unless ($firstkey=~/^error\:/) { - unless ($ENV{'form.timerange'}) { - $ENV{'form.timerange'}=604800; - } - my $seltext='during the last '.$ENV{'form.timerange'}.' seconds'; - my $startsel=''; - my $monthsel=''; - my $weeksel=''; - my $daysel=''; - if ($ENV{'form.timerange'}==-1) { - $seltext='since start of course'; - $startsel='selected'; - $ENV{'form.timerange'}=time; - } - my $starttime=time-$ENV{'form.timerange'}; - if ($ENV{'form.timerange'}==2592000) { - $seltext='during the last month ('.localtime($starttime).')'; - $monthsel='selected'; - } elsif ($ENV{'form.timerange'}==604800) { - $seltext='during the last week ('.localtime($starttime).')'; - $weeksel='selected'; - } elsif ($ENV{'form.timerange'}==86400) { - $seltext='since yesterday ('.localtime($starttime).')'; - $daysel='selected'; - } + my $header=''; + my $startsel=''; + my $monthsel=''; + my $weeksel=''; + my $daysel=''; + my $allsel=''; + my %changes=(); + my $starttime=0; + my $haschanged=0; + my %setversions=&Apache::lonnet::dump('resourceversions', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - $r->print(<<ENDHEADERS); + $hashtied=0; + &tiehash(); + my %newsetversions=(); + if ($ENV{'form.setmostrecent'}) { + $haschanged=1; + foreach (keys %hash) { + if ($_=~/^ids\_(\/res\/.+)$/) { + $newsetversions{$1}='mostrecent'; + } + } + } elsif ($ENV{'form.setcurrent'}) { + $haschanged=1; + foreach (keys %hash) { + if ($_=~/^ids\_(\/res\/.+)$/) { + my $getvers=&Apache::lonnet::getversion($1); + if ($getvers>0) { + $newsetversions{$1}=$getvers; + } + } + } + } elsif ($ENV{'form.setversions'}) { + $haschanged=1; + foreach (keys %ENV) { + if ($_=~/^form\.set_version_(.+)$/) { + my $src=$1; + &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_}); + if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) { + $newsetversions{$src}=$ENV{$_}; + } + } + } + } + if ($haschanged) { + if (&Apache::lonnet::put('resourceversions',\%newsetversions, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') { + $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>'); + } else { + $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>'); + } + &changewarning($r,''); + } + if ($ENV{'form.timerange'} eq 'all') { +# show all documents + $header=&mt('All Documents in Course'); + $allsel=1; + foreach (keys %hash) { + if ($_=~/^ids\_(\/res\/.+)$/) { + my $src=$1; + $changes{$src}=1; + } + } + } else { +# show documents which changed + %changes=&Apache::lonnet::dump + ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $firstkey=(keys %changes)[0]; + unless ($firstkey=~/^error\:/) { + unless ($ENV{'form.timerange'}) { + $ENV{'form.timerange'}=604800; + } + my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' ' + .&mt('seconds'); + if ($ENV{'form.timerange'}==-1) { + $seltext='since start of course'; + $startsel='selected'; + $ENV{'form.timerange'}=time; + } + $starttime=time-$ENV{'form.timerange'}; + if ($ENV{'form.timerange'}==2592000) { + $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; + $monthsel='selected'; + } elsif ($ENV{'form.timerange'}==604800) { + $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; + $weeksel='selected'; + } elsif ($ENV{'form.timerange'}==86400) { + $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; + $daysel='selected'; + } + $header=&mt('Content changed').' '.$seltext; + } else { + $header=&mt('No content modifications yet.'); + } + } + %setversions=&Apache::lonnet::dump('resourceversions', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my %lt=&Apache::lonlocal::texthash + ('st' => 'Version changes since start of Course', + 'lm' => 'Version changes since last Month', + 'lw' => 'Version changes since last Week', + 'sy' => 'Version changes since Yesterday', + 'al' => 'All Resources (possibly large output)', + 'sd' => 'Display', + 'fi' => 'File', + 'md' => 'Modification Date', + 'mr' => 'Most recently published Version', + 've' => 'Version used in Course', + 'vu' => 'Set Version to be used in Course', +'sv' => 'Set Versions to be used in Course according to Selections below', +'sm' => 'Keep all Resources up-to-date with most recent Versions (default)', +'sc' => 'Set all Resource Versions to current Version (Fix Versions)', + 'di' => 'Differences'); + $r->print(<<ENDHEADERS); <form action="/adm/coursedocs" method="post"> +<input type="hidden" name="versions" value="1" /> +<input type="submit" name="setmostrecent" value="$lt{'sm'}" /> +<input type="submit" name="setcurrent" value="$lt{'sc'}" /><hr /> <select name="timerange"> -<option value="-1" $startsel>Since Start of Course</option> -<option value="2592000" $monthsel>Last Month</option> -<option value="604800" $weeksel>Last Week</option> -<option value="86400" $daysel>Since Yesterday</option> +<option value='all' $allsel>$lt{'al'}</option> +<option value="-1" $startsel>$lt{'st'}</option> +<option value="2592000" $monthsel>$lt{'lm'}</option> +<option value="604800" $weeksel>$lt{'lw'}</option> +<option value="86400" $daysel>$lt{'sy'}</option> </select> -<input type="submit" name="versions" value="Display" /> -</form> -<h3>Content changed $seltext</h3> -<table border="2"> -<tr> -<th>File</th><th>Modification Date</th> -<th>Version</th><th>Differences</th></tr> +<input type="submit" name="display" value="$lt{'sd'}" /> +<h3>$header</h3> +<input type="submit" name="setversions" value="$lt{'sv'}" /> +<table border="0"> ENDHEADERS - foreach (keys %changes) { - if ($changes{$_}>$starttime) { - my ($root,$extension)=($_=~/^(.*)\.(\w+)$/); - my $currentversion=&Apache::lonnet::getversion($_); - my $linkurl=&Apache::lonnet::clutter($_); - $r->print( - '<tr><td><a href="'.$linkurl.'" target="cat">'.$linkurl. - '</a></td><td>'. - localtime($changes{$_}).'</td><td>'.$currentversion.'</td>'. - '<td>'); - my $lastold=1; - for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { - my $url=$root.'.'.$prevvers.'.'.$extension; - if (&Apache::lonnet::metadata($url,'lastrevisiondate')< - $starttime) { - $lastold=$prevvers; - } - } + foreach (sort keys %changes) { + if ($changes{$_}>$starttime) { + my ($root,$extension)=($_=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($_); + if ($currentversion<0) { + $currentversion=&mt('Could not be determined.'); + } + my $linkurl=&Apache::lonnet::clutter($_); + $r->print( + '<tr><td colspan="5"><br /><br /><font size="+1"><b>'. + &Apache::lonnet::gettitle($linkurl). + '</b></font></td></tr>'. + '<tr><td> </td>'. + '<td colspan="4">'. + '<a href="'.$linkurl.'" target="cat">'.$linkurl. + '</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 + my $usedversion=$hash{'version_'.$linkurl}; + if (($usedversion) && ($usedversion ne 'mostrecent')) { + $r->print($usedversion); + } else { + $r->print($currentversion); + } + $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'. + '<nobr>Use: '); +# Set version + $r->print(&Apache::loncommon::select_form($setversions{$linkurl}, + 'set_version_'.$linkurl, + ('' => '', + 'mostrecent' => 'most recent', + map {$_,$_} (1..$currentversion)))); + $r->print('</nobr></td></tr><tr><td></td>'); + my $lastold=1; + for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + if (&Apache::lonnet::metadata($url,'lastrevisiondate')< + $starttime) { + $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++) { - my $url=$root.'.'.$prevvers.'.'.$extension; - $r->print('<a href="'.&Apache::lonnet::clutter($url). - '">Version '.$prevvers.' ('. - localtime(&Apache::lonnet::metadata($url,'lastrevisiondate')). - ')</a>'); - if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { + my $url=$root.'.'.$prevvers.'.'.$extension; + $r->print('<nobr><a href="'.&Apache::lonnet::clutter($url). + '">'.&mt('Version').' '.$prevvers.'</a> ('. + &Apache::lonlocal::locallocaltime( + &Apache::lonnet::metadata($url, + 'lastrevisiondate') + ). + ')'); + if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { $r->print(' <a href="/adm/diff?filename='. - &Apache::lonnet::clutter($root.'.'.$extension). - '&versionone='.$prevvers. - '">Diffs</a>'); - } - $r->print('<br />'); - } - $r->print('</td></tr>'); - } - } - $r->print('</table>'); - $r->print('<h1>Done.</h1>'); - } else { - $r->print('<p>No content modifications yet.</p>'); - } - &untiehash(); + &Apache::lonnet::clutter($root.'.'.$extension). + '&versionone='.$prevvers. + '">'.&mt('Diffs').'</a>'); + } + $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++; + } + } + } + while($cols_output++ < 4) { + $r->print('</font></td><td><font>') + } + $r->print('</font></td></tr>'."\n"); + } + } + $r->print('</table></form>'); + $r->print('<h1>'.&mt('Done').'.</h1>'); + + &untiehash(); +} + +sub changewarning { + my ($r,$postexec)=@_; + $r->print( +'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. +'<form method="post" action="/adm/roles" target="loncapaclient">'. +'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. +&mt('Changes will become active for your current session after'). +' <input type="hidden" name="'. +$ENV{'request.role'}.'" value="1" /><input type="button" value="'. +&mt('re-initializing course').'" onClick="reinit(this.form)"/>'.&mt(', or the next time you log in.'). +$help{'Caching'}.'</font></h3></form>'); } # ================================================================ Main Handler sub handler { my $r = shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -679,6 +874,8 @@ sub handler { 'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); $help{'Simple Page'} = &Apache::loncommon::help_open_topic( 'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); + $help{'Simple Problem'} = &Apache::loncommon::help_open_topic( + 'Option_Response_Simple'); $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic( 'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages'); $help{'My Personal Info'} = &Apache::loncommon::help_open_topic( @@ -801,6 +998,21 @@ 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() { var title=this.document.forms.extimport.title.value; var url=this.document.forms.extimport.url.value; @@ -810,20 +1022,22 @@ function finishpick() { '";this.document.forms.'+form+'.submit();'); } -function changename(folder,index,oldtitle) { +function changename(folder,index,oldtitle,foldername) { var title=prompt('New Title',oldtitle); if (title) { this.document.forms.renameform.title.value=title; this.document.forms.renameform.cmd.value='rename_'+index; this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.foldername.value=foldername; this.document.forms.renameform.submit(); } } -function removeres(folder,index,oldtitle) { - if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) { +function removeres(folder,index,oldtitle,foldername) { + if (confirm('Remove "'+oldtitle+'"?')) { this.document.forms.renameform.cmd.value='del_'+index; this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.foldername.value=foldername; this.document.forms.renameform.submit(); } } @@ -834,37 +1048,72 @@ ENDNEWSCRIPT # -------------------------------------------------------------------- Body tag $r->print('</head>'. &Apache::loncommon::bodytag('Course Documents','',$events, - '','',$showdoc)); + '','',$showdoc). + &Apache::loncommon::help_open_faq(273). + &Apache::loncommon::help_open_bug('RAT')); unless ($showdoc) { +# ----------------------------------------------------------------------------- + my %lt=&Apache::lonlocal::texthash( + 'uplm' => 'Upload a new main course document', + 'upls' => 'Upload a new supplemental course document', + 'impp' => 'Import a published document', + 'spec' => 'Special documents', + 'upld' => 'Upload Document', + 'srch' => 'Search', + 'impo' => 'Import', + 'selm' => 'Select Map', + 'load' => 'Load Map', + 'newf' => 'New Folder', + 'extr' => 'External Resource', + 'syll' => 'Syllabus', + 'navc' => 'Navigate Contents', + 'sipa' => 'Simple Page', + 'sipr' => 'Simple Problem', + 'scuf' => 'Score Upload Form', + 'bull' => 'Bulletin Board', + 'mypi' => 'My Personal Info', + 'abou' => 'About User', + 'file' => 'File', + 'title' => 'Title', + 'comment' => 'Comment' + ); +# ----------------------------------------------------------------------------- if ($allowed) { my $dumpbut=&dumpbutton(); + my %lt=&Apache::lonlocal::texthash( + 'vc' => 'Verify Content', + 'cv' => 'Check/Set Resource Versions', + ); $r->print(<<ENDCOURSEVERIFY); <form name="renameform" method="post" action="/adm/coursedocs"> <input type="hidden" name="title" /> <input type="hidden" name="cmd" /> <input type="hidden" name="folder" /> +<input type="hidden" name="foldername" /> </form> <form name="simpleedit" method="post" action="/adm/coursedocs"> <input type=hidden name="importdetail" value=""> <input type="hidden" name="folder" /> +<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> </form> <form action="/adm/coursedocs" method="post" name="courseverify"> <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4"> <tr><td bgcolor="#DDDDCC"> -<input type="submit" name="verify" value="Verify Content" /> +<input type="submit" name="verify" value="$lt{'vc'}" /> </td><td bgcolor="#DDDDCC"> -<input type="submit" name="versions" value="Check Resource Versions" /> +<input type="submit" name="versions" value="$lt{'cv'}" /> $dumpbut </td></tr></table> </form> ENDCOURSEVERIFY $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', - 'Editing the Table of Contents for your Course')); + &mt('Editing the Table of Contents for your Course'))); } # --------------------------------------------------------- Standard documents + my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'}); $r->print('<table border=2 cellspacing=4 cellpadding=4>'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('<tr><td bgcolor="#BBBBBB"><h2>Main Course Documents'. + $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents'). ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); my $folder=$ENV{'form.folder'}; unless ($folder=~/^default/) { $folder='default'; } @@ -877,33 +1126,27 @@ ENDCOURSEVERIFY $hadchanges=0; &editor($r,$coursenum,$coursedom,$folder,$allowed); if ($hadchanges) { - $r->print( -'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. -'<form method="post" action="/adm/roles" target="loncapaclient">'. -'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'. -$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.'. -$help{'Caching'}.'</font></h3></form>'); + &changewarning($r,$postexec); } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; - $r->print(<<ENDFORM); <table cellspacing=4 cellpadding=4><tr> -<th bgcolor="#DDDDDD">Upload a new main course document</th> -<th bgcolor="#DDDDDD">Import a published document</th> -<th bgcolor="#DDDDDD">Special documents</th> +<th bgcolor="#DDDDDD">$lt{'uplm'}</th> +<th bgcolor="#DDDDDD">$lt{'impp'}</th> +<th bgcolor="#DDDDDD">$lt{'spec'}</th> </tr> <tr><td bgcolor="#DDDDDD"> -File:<br /> +$lt{'file'}:<br /> <form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> <input type="file" name="uploaddoc" size="40"> <br /> -Title:<br /> +$lt{'title'}:<br /> <input type="text" size="50" name="comment"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type="hidden" name="cmd" value="upload_default"> -<input type="submit" value="Upload Document"> +<input type="submit" value="$lt{'upld'}"> <nobr> $help{'Uploading_From_Harddrive'} </nobr> @@ -912,12 +1155,12 @@ Title:<br /> <td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" name="simpleeditdefault"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=button onClick= -"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}"> <nobr> <input type=button onClick= -"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}"> $help{'Importing_LON-CAPA_Resource'} </nobr> <p> @@ -925,98 +1168,107 @@ $help{'Importing_LON-CAPA_Resource'} <input type="text" size="20" name="importmap"><br /> <nobr><input type=button onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')" -value="Select Map"> <input type="submit" name="loadmap" value="Load Map"> +value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}"> $help{'Load_Map'}</nobr> </p> </form> </td><td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" name="newfolder"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value=""> <nobr> <input name="newfolder" type="button" onClick="javascript:makenewfolder(this.form,'$folderseq');" -value="New Folder" />$help{'Adding_Folders'} +value="$lt{'newf'}" />$help{'Adding_Folders'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newext"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value=""> <nobr> <input name="newext" type="button" onClick="javascript:makenewext('newext');" -value="External Resource" /> $help{'Adding_External_Resource'} +value="$lt{'extr'}" /> $help{'Adding_External_Resource'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newsyl"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus"> <nobr> -<input name="newsyl" type="submit" value="Syllabus" /> +<input name="newsyl" type="submit" value="$lt{'syll'}" /> $help{'Syllabus'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newnav"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value="Navigate Content=/adm/navmaps"> <nobr> -<input name="newnav" type="submit" value="Navigate Content" /> +<input name="newnav" type="submit" value="$lt{'navc'}" /> $help{'Navigate_Content'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newsmppg"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value=""> <nobr> -<input name="newsmppg" type="button" value="Simple Page" +<input name="newsmppg" type="button" value="$lt{'sipa'}" onClick="javascript:makesmppage();" /> $help{'Simple Page'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newsmpproblem"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value=""> <nobr> -<input name="newsmpproblem" type="button" value="Simple Problem" +<input name="newsmpproblem" type="button" value="$lt{'sipr'}" onClick="javascript:makesmpproblem();" />$help{'Simple Problem'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newexamupload"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value=""> <nobr> -<input name="newexamupload" type="button" value="Score Upload Form" +<input name="newexamupload" type="button" value="$lt{'scuf'}" onClick="javascript:makeexamupload();" /> $help{'Score_Upload_Form'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newbul"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value=""> <nobr> -<input name="newbulletin" type="button" value="Bulletin Board" +<input name="newbulletin" type="button" value="$lt{'bull'}" onClick="javascript:makebulboard();" /> $help{'Bulletin Board'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="newaboutme"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme"> <nobr> -<input name="newaboutme" type="submit" value="My Personal Info" /> +<input name="newaboutme" type="submit" value="$lt{'mypi'}" /> $help{'My Personal Info'} </nobr> </form> +<form action="/adm/coursedocs" method="post" name="newaboutsomeone"> +<input type="hidden" name="folder" value="$folder"> +<input type="hidden" name="foldername" value="$htmlfoldername"> +<input type=hidden name="importdetail" value=""> +<nobr> +<input name="newaboutsomeone" type="button" value="$lt{'abou'}" +onClick="javascript:makeabout();" /> +</nobr> +</form> </td></tr> </table> ENDFORM @@ -1025,7 +1277,7 @@ ENDFORM # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { $r->print( - '<tr><td bgcolor="#BBBBBB"><h2>Supplemental Course Documents'. + '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents'). ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); my $folder=$ENV{'form.folder'}; unless ($folder=~/supplemental/) { $folder='supplemental'; } @@ -1037,80 +1289,62 @@ ENDFORM $r->print(<<ENDSUPFORM); <table cellspacing=4 cellpadding=4><tr> -<th bgcolor="#DDDDDD">Upload a new supplemental course document</th> -<th bgcolor="#DDDDDD">Import a published document</th> -<th bgcolor="#DDDDDD">Special documents</th> +<th bgcolor="#DDDDDD">$lt{'upls'}</th> +<th bgcolor="#DDDDDD">$lt{'spec'}</th> </tr> <tr><td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> <input type="file" name="uploaddoc" size="40"> -<br />Comment:<br /> +<br />$lt{'comment'}:<br /> <textarea cols=50 rows=4 name='comment'> </textarea> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type="hidden" name="cmd" value="upload_supplemental"> <nobr> -<input type="submit" value="Upload Document"> +<input type="submit" value="$lt{'upld'}"> $help{'Uploading_From_Harddrive'} </nobr> </form> </td> <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="Search"> -<input type=button onClick= -"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$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="Select Map"><input type="submit" name="loadmap" value="Load Map"> -</p> -</form> -</td><td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" name="supnewfolder"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value=""> <nobr> <input name="newfolder" type="button" onClick="javascript:makenewfolder(this.form,'$folderseq');" -value="New Folder" /> $help{'Adding_Folders'} +value="$lt{'newf'}" /> $help{'Adding_Folders'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="supnewext"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value=""> <nobr> <input name="newext" type="button" onClick="javascript:makenewext('supnewext');" -value="External Resource" /> $help{'Adding_External_Resource'} +value="$lt{'extr'}" /> $help{'Adding_External_Resource'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="supnewsyl"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus"> <nobr> -<input name="newsyl" type="submit" value="Syllabus" /> +<input name="newsyl" type="submit" value="$lt{'syll'}" /> $help{'Syllabus'} </nobr> </form> <form action="/adm/coursedocs" method="post" name="subnewaboutme"> <input type="hidden" name="folder" value="$folder"> -<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type="hidden" name="foldername" value="$htmlfoldername"> <input type=hidden name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme"> <nobr> -<input name="newaboutme" type="submit" value="My Personal Info" /> +<input name="newaboutme" type="submit" value="$lt{'mypi'}" /> $help{'My Personal Info'} </nobr> </form> @@ -1125,8 +1359,9 @@ ENDSUPFORM $r->print('</table>'); } else { # -------------------------------------------------------- This is showdoc mode - $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>". - &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'</table></p>'); + $r->print("<h1>".&mt('Uploaded Document').'</h1><p>'. +&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>". + &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>'); } } $r->print('</body></html>');