--- loncom/interface/londocs.pm	2003/10/29 21:21:55	1.92
+++ 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.92 2003/10/29 21:21:55 www Exp $
+# $Id: londocs.pm,v 1.100 2004/01/29 00:50:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -425,14 +425,11 @@ 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;
@@ -454,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;
 }
@@ -510,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> ');
                      }
@@ -538,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>');
           }
@@ -596,14 +597,17 @@ sub checkversions {
 	$haschanged=1;
 	foreach (keys %hash) {
 	    if ($_=~/^ids\_(\/res\/.+)$/) {
-		my $src=$1;
+		$newsetversions{$1}='mostrecent';
 	    }
 	}
     } elsif ($ENV{'form.setcurrent'}) {
 	$haschanged=1;
 	foreach (keys %hash) {
 	    if ($_=~/^ids\_(\/res\/.+)$/) {
-		my $src=$1;
+		my $getvers=&Apache::lonnet::getversion($1);
+		if ($getvers>0) {
+		    $newsetversions{$1}=$getvers;
+		}
 	    }
 	}
     } elsif ($ENV{'form.setversions'}) {
@@ -714,6 +718,9 @@ ENDHEADERS
 	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><b>'.
@@ -725,7 +732,7 @@ ENDHEADERS
 		      $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);
@@ -735,7 +742,7 @@ ENDHEADERS
 	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
 						      'set_version_'.$linkurl,
 						      ('' => '',
-						       'current' => 'most recent',
+						       'mostrecent' => 'most recent',
 						       map {$_,$_} (1..$currentversion))));
 	    $r->print('</td><td><font size="1"><ul>');
 	    my $lastold=1;
@@ -789,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',
@@ -960,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(
@@ -981,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) {
@@ -1011,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>');
@@ -1040,11 +1051,11 @@ ENDCOURSEVERIFY
 <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'}">
@@ -1190,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">
@@ -1276,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;
 }