[interchange-cvs] interchange - heins modified code/UI_Tag/file_navigator.coretag

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Mon Jan 13 19:12:00 2003


User:      heins
Date:      2003-01-14 00:11:12 GMT
Modified:  code/UI_Tag file_navigator.coretag
Log:
* Permit "sandbox" file-navigator with no up-directory link. Add some enhancements
  to target of edit link.

Revision  Changes    Path
1.8       +17 -8     interchange/code/UI_Tag/file_navigator.coretag


rev 1.8, prev_rev 1.7
Index: file_navigator.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/file_navigator.coretag,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- file_navigator.coretag	14 Nov 2002 19:54:23 -0000	1.7
+++ file_navigator.coretag	14 Jan 2003 00:11:12 -0000	1.8
@@ -176,10 +176,17 @@
 	my $del_img = qq{<img src="delete.gif" align=center border=0 height=20 width=20 title="DELETE ~FN~">};
 	my $sp_img = qq{<img src="bg.gif" align=center border=0 height=20 width=20>};
 
-	if(defined $CGI->{details}) {
-		$Session->{ui_file_details} = $CGI->{details};
+	my $do_perms;
+	$opt->{details} = $CGI->{details} unless defined $opt->{details};
+	if(defined $opt->{details}) {
+		$do_perms = $opt->{details};
+	}
+	elsif (defined $CGI->{details}) {
+		$do_perms = $Session->{ui_file_details} = $CGI->{details};
+	}
+	else {
+		$do_perms = $Session->{ui_file_details};
 	}
-	my $do_perms = $Session->{ui_file_details};
 
 	my $del_string = '';
 	$Tag->if_mm('advanced', 'delete_files')
@@ -288,13 +295,15 @@
 		}
 	}
 
+	$opt->{top_of_tree} ||= '.';
 	my $nd = $curdir;
-	if($nd ne '.' and ! $opt->{no_up}) {
+	if($nd ne $opt->{top_of_tree} and ! $opt->{no_up}) {
 		$nd =~ s:/[^/]*$::
-		  or $nd = '.';
-		my $msg = $nd eq '.'
-				? "<large><b>..</b></large>"
-				: "<large><b>..</b></large>";
+		  or $nd = $opt->{top_of_tree};
+		my $msg = errmsg(
+					"<large><b>..</b></large> &#91;%s&#93",
+					$opt->{parent_directory_nessage} || 'parent directory',
+					);
 		unshift @dir, [ $nd, $msg, $dtmpl ];
 	}