[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm
banghart
lon-capa-cvs@mail.lon-capa.org
Tue, 08 Aug 2006 21:29:15 -0000
banghart Tue Aug 8 17:29:15 2006 EDT
Modified files:
/loncom/interface portfolio.pm
Log:
Clear up some stupidity.
Use sub make_anchor.
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.149 loncom/interface/portfolio.pm:1.150
--- loncom/interface/portfolio.pm:1.149 Tue Aug 8 15:36:54 2006
+++ loncom/interface/portfolio.pm Tue Aug 8 17:29:15 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.149 2006/08/08 19:36:54 banghart Exp $
+# $Id: portfolio.pm,v 1.150 2006/08/08 21:29:15 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -132,8 +132,7 @@
TABLE
}
my @tree = split (/\//,$current_path);
- my %anchor_fields = ();
- %anchor_fields = (
+ my %anchor_fields = (
'selectfile' => $port_path,
'currentpath' => '/',
'mode' => $env{"form.mode"},
@@ -145,8 +144,7 @@
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
$newCurrentPath .= $tree[$i].'/';
- my %anchor_fields = ();
- %anchor_fields = (
+ my %anchor_fields = (
'selectfile' => $tree[$i],
'currentpath' => '/',
'mode' => $env{"form.mode"},
@@ -169,20 +167,23 @@
my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,
$line, $access_controls, $curr_access, $now, $version_flag,
$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
+ my %anchor_fields;
# my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
$r->print('<tr class="'.$css_class.'">');
$r->print($line);
$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
- $r->print('<td>'.$$version_flag{$filename}.'</td><td><a href="'.$href_location.$filename.'">'.
- $filename.'</a></td>');
+ $r->print('<td>'.$$version_flag{$filename}.'</td><td>');
+ $r->print(&make_anchor($href_location.$filename,undef,$filename).'</td>');
$r->print('<td>'.$size.'</td>');
$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
if ($select_mode ne 'true') {
$r->print('<td><span style="white-space: nowrap">'.
&mt($curr_access).' ');
- $r->print('<a href="'.$url.'?access='.$filename.
- '&currentpath='.$current_path.&group_args().
- '">'.$access_admin_text.'</a></span></td>');
+ %anchor_fields = (
+ 'access' => $filename,
+ 'currentpath' => $current_path
+ );
+ $r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
}
$r->print('</tr>'.$/);
}
@@ -191,6 +192,7 @@
my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
$can_modify,$can_delete,$can_setacl)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ my %anchor_fields;
my $display_out;
my $select_mode;
my $checked_files;
@@ -268,10 +270,18 @@
$show_versions = 'true';
}
if (exists($versioned{$filename})) {
+ %anchor_fields = (
+ 'selectfile' => $filename,
+ 'continue' => 'false',
+ 'currentpath' => $current_path,
+ );
if ($show_versions) {
- $version_flag{$filename} = '<a href="portfolio?selectfile='.$filename.'&continue=false&currentpath='.$current_path.'"><img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
+ $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+ '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
} else {
- $version_flag{$filename} = '<a href="portfolio?selectfile='.$filename.'&continue=false&currentpath='.$current_path.'&showversions='.$filename.'"><img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+ $anchor_fields{'showversions'} = $filename;
+ $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+ '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
}
} else {
$version_flag{$filename} = ' ';
@@ -283,7 +293,6 @@
}
$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>');
- my %anchor_fields = ();
%anchor_fields = (
'selectfile' => $filename.'/',
'currentpath' => $current_path.$filename.'/',
@@ -306,7 +315,10 @@
$line.=' /></td>';
} else {
if (exists $locked_files{$fullpath}) {
- $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.&group_args().'">Locked</a></td>';
+ %anchor_fields = (
+ 'lockinfo' => $current_path.$filename
+ );
+ $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
$css_class= 'LC_browser_file_locked';
} else {
if (!$can_modify) {
@@ -320,8 +332,13 @@
if ($can_modify) {
my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').
'" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
- $line .= '<a href="'.$url.'?rename='.$filename.'&currentpath='.$current_path.&group_args().'">Rename</a>';
- $line .= '</td><td>'.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
+ %anchor_fields = (
+ 'rename' => $filename,
+ currentpath => $current_path
+ );
+ $line .= &make_anchor($url,\%anchor_fields,'Rename');
+ $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);
+ # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
}
$line .= '</td>';
}