--- loncom/interface/londocs.pm 2003/10/28 00:31:02 1.89 +++ loncom/interface/londocs.pm 2004/01/29 00:50:44 1.100 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.89 2003/10/28 00:31:02 www Exp $ +# $Id: londocs.pm,v 1.100 2004/01/29 00:50:44 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -402,33 +402,34 @@ sub entryline { $renametitle=~s/\"\;/\\\"/g; my $line='<tr>'; # Edit commands - if ($allowed) { - $line.=(<<END); + if ($allowed) { + my %lt=('up' => 'Move Up', + 'dw' => 'Move Down', + 'rm' => 'Remove', + 'rn' => 'Rename'); + $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> +<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> +<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> +<font size="-2" color="#990000">$lt{'rm'}</font></a> <a href='javascript:changename("$folder","$index","$renametitle");'> -<font size="-2" color="#009900">Rename</font></a></td> +<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; @@ -450,8 +451,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; } @@ -506,11 +506,12 @@ sub checkonthis { &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>'. + $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'. $Apache::lonxml::errorcount.' '. &mt('error(s)').'</b></font> '); } @@ -534,7 +535,11 @@ sub checkonthis { } elsif ($result==HTTP_SERVICE_UNAVAILABLE) { $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>'); } 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 { $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>'); } @@ -572,8 +577,6 @@ sub checkversions { my $r=shift; $r->print('<html><head><title>Check Versions</title></head>'. &Apache::loncommon::bodytag('Check Course Document Versions')); - $hashtied=0; - &tiehash(); my $header=''; my $startsel=''; my $monthsel=''; @@ -582,9 +585,63 @@ sub checkversions { 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'}); + + $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 @@ -618,21 +675,30 @@ sub checkversions { $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', + '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', + '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='all' $allsel>$lt{'al'}</option> <option value="-1" $startsel>$lt{'st'}</option> @@ -640,40 +706,45 @@ sub checkversions { <option value="604800" $weeksel>$lt{'lw'}</option> <option value="86400" $daysel>$lt{'sy'}</option> </select> -<input type="submit" name="versions" value="$lt{'sd'}" /> -</form> +<input type="submit" name="display" value="$lt{'sd'}" /> <h3>$header</h3> +<input type="submit" name="setversions" value="$lt{'sv'}" /> <table border="2"> <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 - foreach (keys %changes) { + 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><a href="'.$linkurl.'" target="cat">'.$linkurl. + '<tr><td><b>'. + &Apache::lonnet::gettitle($linkurl). + '</b><br /><a href="'.$linkurl.'" target="cat">'.$linkurl. '</a></td><td>'. &Apache::lonlocal::locallocaltime($changes{$_}). '</td><td><font size="+2">'. $currentversion.'</font></td><td><font size="+2">'); # Used in course my $usedversion=$hash{'version_'.$linkurl}; - if ($usedversion) { + if (($usedversion) && ($usedversion ne 'mostrecent')) { $r->print($usedversion); } else { $r->print($currentversion); } $r->print('</font></td><td>'); # Set version - $r->print(&Apache::loncommon::select_form($usedversion, + $r->print(&Apache::loncommon::select_form($setversions{$linkurl}, 'set_version_'.$linkurl, ('' => '', - 'current' => 'current', + 'mostrecent' => 'most recent', map {$_,$_} (1..$currentversion)))); - $r->print('</td><td>'); + $r->print('</td><td><font size="1"><ul>'); my $lastold=1; for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { my $url=$root.'.'.$prevvers.'.'.$extension; @@ -684,27 +755,40 @@ ENDHEADERS } for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { my $url=$root.'.'.$prevvers.'.'.$extension; - $r->print('<a href="'.&Apache::lonnet::clutter($url). - '">'.&mt('Version').' '.$prevvers.' ('. + $r->print('<li><a href="'.&Apache::lonnet::clutter($url). + '">'.&mt('Version').' '.$prevvers.'</a> ('. &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($url,'lastrevisiondate')). - ')</a>'); + ')'); if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { $r->print(' <a href="/adm/diff?filename='. &Apache::lonnet::clutter($root.'.'.$extension). '&versionone='.$prevvers. '">'.&mt('Diffs').'</a>'); } - $r->print('<br />'); + $r->print('</li>'); } - $r->print('</td></tr>'); + $r->print('</ul></font></td></tr>'); } } - $r->print('</table>'); + $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; @@ -712,7 +796,6 @@ sub handler { $r->send_http_header; return OK if $r->header_only; - &Apache::lonlocal::clearreroutetrans(); # --------------------------------------------- Initialize help topics for this foreach ('Adding_Course_Doc','Main_Course_Documents', 'Adding_External_Resource','Navigate_Content', @@ -883,7 +966,9 @@ 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( @@ -904,7 +989,10 @@ ENDNEWSCRIPT 'sipr' => 'Simple Problem', 'scuf' => 'Score Upload Form', 'bull' => 'Bulletin Board', - 'mypi' => 'My Personal Info' + 'mypi' => 'My Personal Info', + 'file' => 'File', + 'title' => 'Title', + 'comment' => 'Comment' ); # ----------------------------------------------------------------------------- if ($allowed) { @@ -934,7 +1022,7 @@ $dumpbut </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 $r->print('<table border=2 cellspacing=4 cellpadding=4>'); @@ -952,15 +1040,7 @@ 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">'. -&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>'); + &changewarning($r,$postexec); } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; @@ -971,11 +1051,11 @@ $help{'Caching'}.'</font></h3></form>'); <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'}"> @@ -1121,7 +1201,7 @@ ENDFORM <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"> @@ -1207,7 +1287,7 @@ ENDSUPFORM &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>'); } } - $r->print(&Apache::lonlocal::endreroutetrans().'</body></html>'); + $r->print('</body></html>'); return OK; }