[interchange-cvs] interchange - heins modified 2 files

[interchange-core@icdevgroup.org]

User:      heins
Date:      2002-08-26 02:56:27 GMT
Modified:  code/UI_Tag file_navigator.coretag
Modified:  dist/lib/UI/vars UI_STD_FILE_NAV
Log:
* Put files in 3 columns except when showing details....

Revision  Changes    Path
1.5       +9 -1      interchange/code/UI_Tag/file_navigator.coretag


rev 1.5, prev_rev 1.4
Index: file_navigator.coretag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/code/UI_Tag/file_navigator.coretag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- file_navigator.coretag	7 Jul 2002 03:51:06 -0000	1.4
+++ file_navigator.coretag	26 Aug 2002 02:56:27 -0000	1.5
@@ -309,13 +309,21 @@
 	for(@messages) {
 		$out .=3D "<span class=3Dcmessage>$_</span><br>";
 	}
+	my $template =3D $opt->{template} || '';
 	for (@dir, @plain) {
 		$$pc++;
 		$_->[2] =3D sprintf($_->[2], $_->[3], $_->[1]);
 		$_->[2] =3D~ s/~FN~/$_->[0]/g;
 		$_->[2] =3D~ s/~RN~/$_->[4]/g;
 		$_->[2] =3D~ s/~ID~/mv_session_id=3D$Session->{id}&mv_pc=3D$$pc/g;
-		$out .=3D $_->[2];
+		if($template) {
+			my $t =3D $template;
+			$t =3D~ s/%s/$_->[2]/;
+			$out .=3D $t;
+		}
+		else {
+			$out .=3D $_->[2];
+		}
 	}
=20
 	return $out;



2.4       +25 -2     interchange/dist/lib/UI/vars/UI_STD_FILE_NAV


rev 2.4, prev_rev 2.3
Index: UI_STD_FILE_NAV
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/vars/UI_STD_FILE_NAV,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- UI_STD_FILE_NAV	18 Aug 2002 15:11:32 -0000	2.3
+++ UI_STD_FILE_NAV	26 Aug 2002 02:56:27 -0000	2.4
@@ -44,8 +44,14 @@
 			&nbsp;&nbsp;&nbsp;
 			[if type=3Dexplicit
 				compare=3D`
-					return $CGI->{details} if defined $CGI->{details};
-					return $Session->{ui_file_details};
+					my $status;
+					if(defined $CGI->{details}) {
+						$status =3D $CGI->{details};
+					}
+					else {
+						$status =3D $Session->{ui_file_details};
+					}
+					$Scratch->{details_coming} =3D $status;
 			`]
 			[page href=3D"@_MV_PAGE_@" form=3D"details=3D0"][msg]Hide file details[=
/msg]</A>
 			[else]
@@ -67,6 +73,7 @@
 <tr>
 <td class=3Drnorm>
=20
+[if scratch details_coming]
 	[file-navigator
 		mask=3D"[scratch dir_mask]"
 		include_mask=3D"[scratch include_mask]"
@@ -75,6 +82,22 @@
 		start_open=3D"[scratch start_open]"
 		initial_dir=3D"[cgi initial_dir]"
 	]
+[else]
+<table width=3D"100%">
+[table-organize columns=3D3 columnize=3D1 interpolate=3D1]
+	[file-navigator
+		mask=3D"[scratch dir_mask]"
+		include_mask=3D"[scratch include_mask]"
+		exclude_mask=3D"[scratch exclude_mask]"
+		template=3D|<TD width=3D"33%">%s</TD>|
+		view_link=3D"[scratch view_link]"
+		start_open=3D"[scratch start_open]"
+		initial_dir=3D"[cgi initial_dir]"
+	]
+[/table-organize]
+</table>
+[/else]
+[/if]
=20
 </td>
 </tr>