--- loncom/interface/londocs.pm	2004/01/15 03:18:19	1.99
+++ loncom/interface/londocs.pm	2004/02/05 15:19:41	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.99 2004/01/15 03:18:19 www Exp $
+# $Id: londocs.pm,v 1.103 2004/02/05 15:19:41 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -535,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>');
           }
@@ -705,10 +709,7 @@ sub checkversions {
 <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>
+<table border="0">
 ENDHEADERS
     foreach (sort keys %changes) {
 	if ($changes{$_}>$starttime) {
@@ -719,13 +720,25 @@ ENDHEADERS
 	    }
 	    my $linkurl=&Apache::lonnet::clutter($_);
 	    $r->print(
-		      '<tr><td><b>'.
+		      '<tr><td colspan="5"><br /><br /><font size="+1"><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">');
+                      '</b></font></td></tr>'.
+                      '<tr><td>&nbsp;&nbsp;&nbsp;</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')) {
@@ -733,14 +746,15 @@ ENDHEADERS
 	    } else {
 		$r->print($currentversion);
 	    }
-	    $r->print('</font></td><td>');
+	    $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('</td><td><font size="1"><ul>');
+	    $r->print('</nobr></td></tr><tr><td></td>');
 	    my $lastold=1;
 	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
 		my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -749,11 +763,27 @@ ENDHEADERS
 		    $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('<li><a href="'.&Apache::lonnet::clutter($url).
+		$r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
 			  '">'.&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') {
                     $r->print(' <a href="/adm/diff?filename='.
@@ -761,9 +791,19 @@ ENDHEADERS
 			      '&versionone='.$prevvers.
 			      '">'.&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>');
@@ -929,6 +969,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;
@@ -986,6 +1041,7 @@ ENDNEWSCRIPT
                 'scuf' => 'Score Upload Form',
                 'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info',
+		'abou' => 'About User',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment' 
@@ -1170,6 +1226,15 @@ value="$plainname=/adm/$udom/$uname/abou
 $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="$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>
 </table>
 ENDFORM