[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm

banghart lon-capa-cvs@mail.lon-capa.org
Wed, 05 Jul 2006 22:52:54 -0000


banghart		Wed Jul  5 18:52:54 2006 EDT

  Modified files:              
    /loncom/interface	portfolio.pm 
  Log:
  	Saving work in progress. Closer to showing versioned files.
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.130 loncom/interface/portfolio.pm:1.131
--- loncom/interface/portfolio.pm:1.130	Wed Jul  5 18:29:05 2006
+++ loncom/interface/portfolio.pm	Wed Jul  5 18:52:53 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.130 2006/07/05 22:29:05 banghart Exp $
+# $Id: portfolio.pm,v 1.131 2006/07/05 22:52:53 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -183,6 +183,7 @@
     my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     my @dir_lines;
+    my @version_lines;
     my %versioned;
     foreach my $line (sort 
 		      { 
@@ -196,17 +197,23 @@
     	$filename =~ s/\s+$//;
     	my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if ($version) {
+    	    push(@version_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     	    $versioned{$fname.'.'.$extension} .= $version.",";
+    	} else {
+    	    push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     	}
-        push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     }
     foreach my $line (@dir_lines) {
         my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
     	    my %version_flag;
+    	    my $show_versions;
+    	    if ($env{'form.showversions'} eq $filename) {
+    	        $show_versions = 'true';
+    	    }
     	    if (exists($versioned{$filename})) {
-    	        $version_flag{$filename} = '<a href="portfolio?open_version='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+    	        $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
     	    } else {
     	        $version_flag{$filename} = '';
     	    }
@@ -1674,7 +1681,7 @@
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',
 	  'fieldname','mode','rename','continue','group','access','setnum',
-          'cnum','cdom','type','setroles']);
+          'cnum','cdom','type','setroles','showversions']);
     my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;