--- loncom/interface/portfolio.pm	2005/05/02 19:08:16	1.85
+++ loncom/interface/portfolio.pm	2005/12/09 23:49:45	1.89
@@ -43,28 +43,46 @@ my $dirptr=16384;
 sub display_common {
     my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
-    $r->print('<td bgcolor="#ccddaa" align="center">');
-    my $displayOut = '<form method="post" enctype="multipart/form-data">';
-    $displayOut .= '<input name="uploaddoc" type="file" />'.
-        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
-        '<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'.
-        '<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'.
-        '<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'. 
-        '<input type="submit" name="storeupl" value="Upload" />'.
-        '</form>';
-    $r->print($displayOut);
-    $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
-    $displayOut = '<form method="post">';
-    $displayOut .= '<input name="newdir" type="input" />'.
-        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
-        '<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'.
-        '<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'.
-        '<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'. 
-        '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
-        '</form>';
-    $r->print($displayOut);
-    $r->print('</td></tr></table>');
+    my %text=&Apache::lonlocal::texthash('upload' => 'Upload',
+					 'upload_label' =>  
+					 'Upload file to current directory:',
+					 'createdir' => 'Create Subdirectory',
+					 'createdir_label' => 
+					 'Create subdirectory in current directory:');
+    $r->print(<<"TABLE"); 
+<table border="0" cellspacing="2" cellpadding="2">
+  <form method="post" enctype="multipart/form-data">
+    <tr valign="middle">
+      <td bgcolor="#ccddaa" align="right">
+        $text{'upload_label'}
+      </td>
+      <td bgcolor="#ccddaa" align="left">
+        <input name="uploaddoc" type="file" />
+	<input type="hidden" name="currentpath" value="$current_path" />
+	<input type="hidden" name="action" value="$env{"form.action"}" />
+	<input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
+	<input type="hidden" name="mode" value="$env{"form.mode"}" />
+	<input type="submit" name="storeupl" value="$text{'upload'}" />
+      </td>
+    </tr>
+  </form>
+  <form method="post">
+    <tr>
+      <td bgcolor="#ccddaa" align="right">
+        $text{'createdir_label'}
+      </td>
+      <td bgcolor="#ccddaa" align="left">
+        <input name="newdir" type="input" />
+        <input type="hidden" name="currentpath" value="$current_path" />
+        <input type="hidden" name="action" value="$env{"form.action"}" />
+        <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
+        <input type="hidden" name="mode" value="$env{"form.mode"}" />
+        <input type="submit" name="createdir" value="$text{'createdir'}" />
+      </td>
+    </tr>
+  </form>
+</table>
+TABLE
     my @tree = split (/\//,$current_path);
     $r->print('<font size="+2">'.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');
     if (@tree > 1){
@@ -147,9 +165,11 @@ sub display_directory {
                     if (exists $locked_files{$current_path.$filename}){
                         $r->print('<td colspan="2"><a href="portfolio?lockinfo='.$current_path.$filename.'">Locked</a></td>');
                     } else {
+			my $cat='<img alt="'.&mt('Catalog Information').
+			    '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                         $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
                             <a href="/adm/portfolio?rename='.$filename.'&amp;currentpath='.$current_path.'">Rename</a></td>
-                            <td><a href="'.$href_edit_location.$filename.'.meta">Meta</a>
+                            <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
                             </td>');
                     }
                 }
@@ -387,10 +407,13 @@ ENDSMP
 ENDSMP
     $r->print($javascript);
     $r->print("<h1>Select portfolio files</h1>
-                Check as many as you wish in response to the essay problem.<br />");
-    $r->print("<strong>Files selected from other directories:</strong><br />");
-    foreach (&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'})) {
-        $r->print($_."<br />");
+                Check as many as you wish in response to the problem.<br />");
+    my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
+    if (@otherfiles) {
+	$r->print("<strong>Files selected from other directories:</strong><br />");
+	foreach my $file (@otherfiles) {
+	    $r->print($file."<br />");
+	}
     }
 }
 sub upload {
@@ -418,8 +441,8 @@ sub upload {
         }
     }
     my $current_disk_usage = &Apache::lonnet::diskusage($env{'user.domain'}, $env{'user.name'},$portfolio_root);
-    if ((($current_disk_usage/1000) + $filesize) > $disk_quota){
-        $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
+    if (($current_disk_usage + $filesize) > $disk_quota){
+        $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
         $r->print(&done('Back'));
     } 
@@ -529,7 +552,7 @@ sub handler {
         $r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
     }
     $r->rflush();
-	if (($env{'form.storeupl'} eq 'Upload') & (!$env{'form.uploaddoc.filename'})){
+	if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
    	    $r->print('<font color="red"> No file was selected to upload.'.
    	            'To upload a file, click <strong>Browse...</strong>'.
    	            ', select a file, then click <strong>Upload</strong>,</font>');