--- loncom/interface/londocs.pm	2003/09/22 03:02:05	1.83
+++ loncom/interface/londocs.pm	2003/10/22 21:41:11	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.83 2003/09/22 03:02:05 www Exp $
+# $Id: londocs.pm,v 1.88 2003/10/22 21:41:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,7 +138,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=();
@@ -395,8 +395,8 @@ sub entryline {
 	) { 
             $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
             $renametitle=$4;
-            $title='<i>'.localtime($1).'</i> '.
-                &Apache::loncommon::plainname($2,$3).': <br>'.
+            $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
+                &Apache::loncommon::plainname($2,$3).': <br />'.
 		$foldertitle;
 	}
     $renametitle=~s/\&quot\;/\\\"/g;
@@ -490,7 +490,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+)$/;
@@ -500,7 +500,7 @@ sub checkonthis {
                  for (my $i=0;$i<=$level*5;$i++) {
                      $r->print('&nbsp;');
                  }
-                 $r->print('- Rendering: ');
+                 $r->print('- '.&mt('Rendering').': ');
                  my $oldpath=$ENV{'request.filename'};
                  $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url);
                  &Apache::lonxml::xmlparse($r,'web',
@@ -511,14 +511,16 @@ sub checkonthis {
                      ($Apache::lonxml::warningcount)) {
 		     if ($Apache::lonxml::errorcount) {
                         $r->print('<font color="red"><b>'.
-			  $Apache::lonxml::errorcount.' error(s)</b></font> ');
+			  $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();
              }
@@ -530,11 +532,11 @@ 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>');
+             $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
           } else {
-             $r->print('<font color="red"><b>access denied</b></font>');
+             $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
           }
       }
    }
@@ -580,11 +582,13 @@ sub checkversions {
        unless ($ENV{'form.timerange'}) {
 	   $ENV{'form.timerange'}=604800;
        }
-       my $seltext='during the last '.$ENV{'form.timerange'}.' seconds';
+       my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' '
+	   .&mt('seconds');
        my $startsel='';
        my $monthsel='';
        my $weeksel='';
        my $daysel='';
+       my $allsel='';
        if ($ENV{'form.timerange'}==-1) {
 	   $seltext='since start of course';
            $startsel='selected';
@@ -592,31 +596,47 @@ sub checkversions {
        }
        my $starttime=time-$ENV{'form.timerange'};
        if ($ENV{'form.timerange'}==2592000) {
-           $seltext='during the last month ('.localtime($starttime).')';
+           $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
            $monthsel='selected';
        } elsif ($ENV{'form.timerange'}==604800) {
-           $seltext='during the last week ('.localtime($starttime).')';
+           $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
            $weeksel='selected';
        } elsif ($ENV{'form.timerange'}==86400) {
-           $seltext='since yesterday ('.localtime($starttime).')';
+           $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
            $daysel='selected';
+       } elsif ($ENV{'form.timerange'} eq 'all') {
+	   $allsel='all';
        }
-
+       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',
+	       'sd' => 'Display',
+               'cc' => 'Content changed',
+	       'fi' => 'File',
+	       'md' => 'Modification Date',
+               'mr' => 'Most recently published Version',
+	       've' => 'Version used in Course',
+               'vu' => 'Set Version to be used in Course', 
+	       'di' => 'Differences');
        $r->print(<<ENDHEADERS);
 <form action="/adm/coursedocs" method="post">
 <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" />
+<input type="submit" name="versions" value="$lt{'sd'}" />
 </form>
-<h3>Content changed $seltext</h3>
+<h3>$lt{'cc'} $seltext</h3>
 <table border="2">
 <tr>
-<th>File</th><th>Modification Date</th>
-<th>Version</th><th>Differences</th></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) {
 	  if ($changes{$_}>$starttime) {
@@ -626,8 +646,24 @@ ENDHEADERS
              $r->print(
                  '<tr><td><a href="'.$linkurl.'" target="cat">'.$linkurl.
                  '</a></td><td>'.
-                 localtime($changes{$_}).'</td><td>'.$currentversion.'</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) {
+		 $r->print($usedversion);
+	     } else {
+		 $r->print($currentversion);
+	     }
+	     $r->print('</font></td><td>');
+# Set version
+	     $r->print(&Apache::loncommon::select_form($usedversion,
+						       'set_version_'.$linkurl,
+                               ('' => '',
+                              'current' => 'current',
+                               map {$_,$_} (1..$currentversion))));
+	     $r->print('</td><td>');
              my $lastold=1;
              for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
                  my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -639,14 +675,14 @@ ENDHEADERS
             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')).
+                   '">'.&mt('Version').' '.$prevvers.' ('.
+                 &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.
-			     '">Diffs</a>');
+			     '">'.&mt('Diffs').'</a>');
                  }
                  $r->print('<br />');
              }
@@ -682,6 +718,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(
@@ -863,6 +901,10 @@ ENDNEWSCRIPT
 # -----------------------------------------------------------------------------
     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" />
@@ -876,9 +918,9 @@ ENDNEWSCRIPT
 <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>