--- loncom/interface/portfolio.pm	2006/06/22 17:56:06	1.114
+++ loncom/interface/portfolio.pm	2006/06/22 19:11:13	1.117
@@ -99,7 +99,7 @@ sub display_common {
 </table>
 TABLE
     my @tree = split (/\//,$current_path);
-    $r->print('<font size="+2">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
+    $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
@@ -107,7 +107,7 @@ TABLE
             $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
         }
     }
-    $r->print('</font>');
+    $r->print('</span>');
     &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
     $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"});
     if (defined($group)) {
@@ -155,11 +155,11 @@ sub display_directory {
     }
     if ($select_mode eq 'true') {
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');
-        $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+        $r->print('<table class="LC_browser">'.
             '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {
         $r->print('<form method="post" action="'.$url.'">');
-        $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+        $r->print('<table class="LC_browser">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
     }
     if (defined($group)) {
@@ -190,16 +190,17 @@ sub display_directory {
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
             if ($dirptr&$testdir) {
+		my $colspan='colspan="2"';
                 if ($select_mode eq 'true'){
-                    $r->print('<tr bgcolor="#FFAA99"><td><img alt="'.&mt('open folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
-                } else {
-                    $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
+		    undef($colspan);
                 }
+		$r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>'); 
                 $r->print('</tr>'); 
             } else {
-                $r->print('<tr bgcolor="#CCCCFF">');
+		my $css_class = 'LC_browser_file';
+		my $line;
                 my $version_flag;
                 if (exists($versioned{$fname})) {
                    $version_flag = "*";
@@ -209,22 +210,25 @@ sub display_directory {
                my $fullpath = $current_path.$filename;
                 $fullpath = &prepend_group($fullpath,$group);
                 if ($select_mode eq 'true'){
-                    $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"');
-                    if ($$checked_files{$filename} eq 'selected') {
-                        $r->print("CHECKED");
+                    $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
+		    if ($$checked_files{$filename} eq 'selected') {
+                        $line.=" checked ";
                     }
-                    $r->print('></td>');
+		    $line.=' /></td>';
                 } else {
                     if (exists $locked_files{$fullpath}) {
-                        $r->print('<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>');
+                        $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>';
+			$css_class= 'LC_browser_file_locked';
                     } 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.'" />
+                        $line.='<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
                             <a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a></td>
                             <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
-                            </td>');
+                            </td>';
                     }
+		    $r->print('<tr class="'.$css_class.'">');
+		    $r->print($line);
                 }
                 my $curr_access;
                 my $pub_access = 0;
@@ -332,16 +336,20 @@ sub close_form {
 sub display_file {
     my ($path,$filename)=@_;
     my $display_file_text;
+    my $file_start='<span class="LC_filename">';
+    my $file_end='</span>';
     if (!defined($path)) { $path=$env{'form.currentpath'}; }
     if (!defined($filename)) { 
         $filename=$env{'form.selectfile'};
-        $display_file_text = '<tt>'.$path.$filename.'</tt>';
+        $display_file_text = $file_start.$path.$filename.$file_end;
     } elsif (ref($filename) eq "ARRAY") {
-        foreach (@$filename) {
-            $display_file_text .= '<tt>'.$path.$_.'</tt><br />';
+        foreach my $file (@$filename) {
+            $display_file_text .= $file_start.$path.$file.$file_end.'<br />';
         }
     } elsif (ref($filename) eq "SCALAR") {
-        $display_file_text = '<tt>'.$path.$filename.'</tt>';        
+        $display_file_text = $file_start.$path.$$filename.$file_end;
+    } else {
+	$display_file_text = $file_start.$path.$filename.$file_end;
     }
     return $display_file_text;
 }
@@ -395,8 +403,8 @@ sub delete_confirmed {
 					       $env{'form.currentpath'}.
 					       $delete_file);
         if ($result ne 'ok') {
-	$r->print('<font color="red"> An error occured ('.$result.
-		  ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');
+	$r->print('<span class="LC_error"> An error occured ('.$result.
+		  ') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');
         }
     }
     $r->print(&done(undef,$url,$group));
@@ -420,8 +428,8 @@ sub delete_dir_confirmed {
 					       $directory_name);
 					       
     if ($result ne 'ok') {
-	$r->print('<font color="red"> An error occured (dir) ('.$result.
-		  ') while trying to delete '.$directory_name.'</font><br />');
+	$r->print('<span class="LC_error"> An error occured (dir) ('.$result.
+		  ') while trying to delete '.$directory_name.'</span><br />');
     } else {
         # now remove from recent
 #        $r->print('<br /> removing '.$directory_name.'<br /');
@@ -460,9 +468,9 @@ sub rename_confirmed {
     my ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path($group);
     if ($filenewname eq '') {
-	$r->print('<font color="red">'.
+	$r->print('<span class="LC_error">'.
 		  &mt("Error: no valid filename was provided to rename to.").
-		  '</font><br />');
+		  '</span><br />');
 	$r->print(&done(undef,$url,$group));
 	return;
     } 
@@ -471,12 +479,15 @@ sub rename_confirmed {
             $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
             $port_path.$env{'form.currentpath'}.$filenewname);
     if ($result ne 'ok') {
-	$r->print('<font color="red"> An errror occured ('.$result.
-		  ') while trying to rename '.&display_file().' to '.
-		  &display_file(undef,$filenewname).'</font><br />');
+	$r->print('<span class="LC_error">'.
+		  &mt('An errror occured ([_1]) while trying to rename [_2]'
+		      .' to [_3]',$result,&display_file(),
+		      &display_file('',$filenewname)).'</span><br />');
     }
     if ($filenewname ne $env{'form.filenewname'}) {
-        $r->print("The new file name was changed from:<br /><strong>".$env{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
+        $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",
+		      '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
+		      '<strong>'.&display_file('',$filenewname).'</strong>'));
     }
     $r->print(&done(undef,$url,$group));
 }
@@ -557,7 +568,9 @@ sub update_access {
                 if (@{$processing{$chg}} > 0) {
                     if ($chg eq 'delete') {
                         if (!($deloutcome eq 'ok')) {
-                            $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome);
+                            $errors .='<span class="LC_error">'.
+				&mt('A problem occurred deleting access controls: [_1]',$deloutcome).
+				'</span>';
                             next;
                         }
                     }
@@ -659,7 +672,9 @@ sub update_access {
             $r->print(&Apache::loncommon::end_data_table());
         } else {
             if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
-                $errors .= &mt('A problem occurred storing access control settings: [_1]',$outcome);
+                $errors .= '<span class="LC_error">'.
+		    &mt('A problem occurred storing access control settings: [_1]',$outcome).
+		    '</span>';
             }
         }
         if ($errors) { 
@@ -1012,10 +1027,11 @@ function getIndex(name,value) {
 
 sub course_row {
     my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;
-    my %content;
+    my $content;
     my $defdom = $env{'user.domain'};
     if ($status eq 'old') {
-        $defdom =  $$access_controls{$item}{'domain'}; 
+        $content = $$access_controls{$item}; 
+        $defdom =  $content->{'domain'};
     }
     my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
 	.&course_js();
@@ -1027,9 +1043,9 @@ sub course_row {
                                                     $type);
     $r->print('<td>'.$js.&actionbox($status,$num,$scope).'</td>');
     if ($status eq 'old') {
-        my $cid = $content{'domain'}.'_'.$content{'number'};
+        my $cid = $content->{'domain'}.'_'.$content->{'number'};
         my %course_description = &Apache::lonnet::coursedescription($cid);
-        $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content{'number'}.'" />'.$course_description{'description'}.'</td>');
+        $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');
     } elsif ($status eq 'new') {
         my $uctype = $type;
         $uctype =~ s/^(\w)/uc($1)/e;
@@ -1042,15 +1058,15 @@ sub course_row {
               &mt($crsgrptext).'</th></tr>');
     if ($status eq 'old') {
         my $max_id = 0;
-        foreach my $role_id (sort(keys(%{$content{'roles'}}))) {
+        foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {
             if ($role_id > $max_id) {
                 $max_id = $role_id;
             }
             $max_id ++;
-            my $role_selects = &role_selectors($num,$role_id,$status,$type,\%content,'display');
+            my $role_selects = &role_selectors($num,$role_id,$status,$type,$content,'display');
             $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
         }
-        $r->print('</table><br />'.&mt('Add a roles-based condition').'&nbsp;<input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content{domain}','$content{number}','Course'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');
+        $r->print('</table><br />'.&mt('Add a roles-based condition').'&nbsp;<input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content->{'domain'}','$content->{'number'}','Course'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');
     } elsif ($status eq 'new') {
         my $role_id = 1;
         my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');
@@ -1338,17 +1354,17 @@ sub upload {
     }
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
     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.'.
+        $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
         $r->print(&done('Back',$url,$group));
     } 
     elsif ($found_file){
         if ($locked_file){
-            $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.
+            $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
             $r->print(&done('Back',$url,$group));      
         } else {   
-            $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.
+            $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
             $r->print(&done('Back',$url,$group));
         }
@@ -1356,8 +1372,8 @@ sub upload {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',
 	        	 $port_path.$env{'form.currentpath'});
         if ($result !~ m|^/uploaded/|) {
-            $r->print('<font color="red"> An errror occured ('.$result.
-	              ') while trying to upload '.&display_file().'</font><br />');
+            $r->print('<span class="LC_error">'.'An errror occured ('.$result.
+	              ') while trying to upload '.&display_file().'</span><br />');
 	    $r->print(&done('Back',$url,$group));
         } else {
             $r->print(&done(undef,$url,$group));
@@ -1400,9 +1416,9 @@ sub createdir {
     my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
     if ($newdir eq '') {
-    	$r->print('<font color="red">'.
+    	$r->print('<span class="LC_error">'.
 	    	  &mt("Error: no directory name was provided.").
-		      '</font><br />');
+		      '</span><br />');
 	    $r->print(&done(undef,$url,$group));
 	    return;
     }
@@ -1416,16 +1432,16 @@ sub createdir {
         }
     }
     if ($found_file){
-    	    $r->print('<font color="red"> Unable to create a directory named <strong>'.$newdir.
-    	            ' </strong>a file or directory by that name already exists.</font><br />');
+    	    $r->print('<span class="LC_error">'.'Unable to create a directory named <strong>'.$newdir.
+    	            ' </strong>a file or directory by that name already exists.</span><br />');
     } else {
         my ($uname,$udom) = &get_name_dom($group);
         my $port_path = &get_port_path($group);
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
 	         $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {
-    	    $r->print('<font color="red"> An errror occured ('.$result.
-	    	      ') while trying to create a new directory '.&display_file().'</font><br />');
+    	    $r->print('<span class="LC_error">'.'An errror occured ('.$result.
+	    	      ') while trying to create a new directory '.&display_file().'</span><br />');
         }
     }
     if ($newdir ne $env{'form.newdir'}) {
@@ -1529,7 +1545,7 @@ sub handler {
                                       $env{'request.course.id'}.'/'.$group))) {
                     $portfolio_root = &get_portfolio_root($group);
                 } else {
-                    $r->print('You do not have the privileges required to access the shared files space for this group');
+                    $r->print('You do not have the privileges required to access the shared files space for this group.');
                     $earlyout = 1;
                 }
             } else {
@@ -1563,9 +1579,11 @@ sub handler {
     }
     $r->rflush();
 	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>');
+   	    $r->print('<span class="LC_error">'.
+		      'No file was selected to upload.'.
+		      'To upload a file, click <strong>Browse...</strong>'.
+		      ', select a file, then click <strong>Upload</strong>.'.
+		      '</span>');
 	}
     if ($env{'form.meta'}) {
         &open_form($r,$url);