[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm portfolio.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 22 Jun 2006 19:01:31 -0000
This is a MIME encoded message
--albertel1151002891
Content-Type: text/plain
albertel Thu Jun 22 15:01:31 2006 EDT
Modified files:
/loncom/interface portfolio.pm loncommon.pm
Log:
- switching file browser to CSS (some of BUG#3925)
- errors now use span class="LC_error">
- filenames now using span class="LC_filename"
--albertel1151002891
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20060622150131.txt"
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.115 loncom/interface/portfolio.pm:1.116
--- loncom/interface/portfolio.pm:1.115 Thu Jun 22 14:33:58 2006
+++ loncom/interface/portfolio.pm Thu Jun 22 15:01:30 2006
@@ -155,11 +155,11 @@
}
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> </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> </th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
}
if (defined($group)) {
@@ -190,16 +190,17 @@
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 @@
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.'&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 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 @@
$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 @@
$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 @@
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 @@
$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 @@
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 @@
$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) {
@@ -1339,17 +1354,17 @@
}
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));
}
@@ -1357,8 +1372,8 @@
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));
@@ -1401,9 +1416,9 @@
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;
}
@@ -1417,16 +1432,16 @@
}
}
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'}) {
@@ -1530,7 +1545,7 @@
$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 {
@@ -1564,9 +1579,11 @@
}
$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);
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.386 loncom/interface/loncommon.pm:1.387
--- loncom/interface/loncommon.pm:1.386 Thu Jun 22 13:56:06 2006
+++ loncom/interface/loncommon.pm Thu Jun 22 15:01:30 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.386 2006/06/22 17:56:06 albertel Exp $
+# $Id: loncommon.pm,v 1.387 2006/06/22 19:01:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3333,6 +3333,18 @@
background: $tabbg;
}
+table.LC_brower {
+}
+table.LC_browser tr.LC_browser_file {
+ background: #CCFF88
+}
+table.LC_browser tr.LC_browser_file_locked {
+ background: #FFAA99
+}
+table.LC_browser tr.LC_browser_folder {
+ background: #CCCCFF
+}
+
END
}
--albertel1151002891--