[interchange-cvs] interchange - racke modified 2 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2003-09-04 16:10:49 GMT
Modified:  code/UserTag history_scan.tag
Modified:  dist/foundation/templates/components category_vert_toggle
Log:
after an Interchange upgrade the category_vert_toggle component was broken
in the case that history-scan has no cgi parameters
added form parameter to history-scan usertag and fixed component

Revision  Changes    Path
1.11      +2 -0      interchange/code/UserTag/history_scan.tag


rev 1.11, prev_rev 1.10
Index: history_scan.tag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UserTag/history_scan.tag,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- history_scan.tag	3 Feb 2003 13:36:51 -0000	1.10
+++ history_scan.tag	4 Sep 2003 16:10:49 -0000	1.11
@@ -14,6 +14,7 @@
 
 	default=      Page to return if nothing else matches
 	exclude=      A RegEx of page names to skip
+	form=         Additional form parameters
 	pageonly=1    Return just the name of a page, not a link to it.
 	count=#N      Skip the #N most recently visited pages
 	var_exclude   A list of parameters that should NOT be included in the
@@ -102,6 +103,7 @@
 		$form .= "\n$_=";
 		$form .= join("\n$_=", split /\0/, $cgi->{$_});
 	}
+	$form .= "\n$opt->{form}" if $opt->{form};
 	return $Tag->area( { href => $href, form => $form} );
 }
 EOR



1.7       +4 -4      interchange/dist/foundation/templates/components/category_vert_toggle


rev 1.7, prev_rev 1.6
Index: category_vert_toggle
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/foundation/templates/components/category_vert_toggle,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- category_vert_toggle	19 Feb 2003 13:59:41 -0000	1.6
+++ category_vert_toggle	4 Sep 2003 16:10:49 -0000	1.7
@@ -105,13 +105,13 @@
 
 <tr>
     <td valign="top" align="right" colspan=3>
-	<a href="[history-scan]&expandall=1">
+	<a href="[history-scan form="expandall=1"]">
 	[scratch showtoggleon]
 	<font class="categorybar"><b>[L]Show All Subcategories[/L]</b></a>
 </tr>
 <tr>
     <td valign="top" align="right" colspan=3>
-	<a href="[history-scan]&collapseall=1">
+	<a href="[history-scan form="collapseall=1"]">
 	[scratch showtoggleoff]
 	<font class="categorybar">
 	<b>[L]Collapse All Categories[/L]</b></a>
@@ -149,9 +149,9 @@
 	    [condition] 
 		return($Scratch->{expandarea}{"[box-code]"});
 	    [/condition] 
-		<a href="[history-scan]&collapse=[box-code]">[scratch showtoggleoff]</a>
+		<a href="[history-scan form="collapse=[box-code]"]">[scratch showtoggleoff]</a>
     	[else]
-		<a href="[history-scan]&expand=[box-code]">[scratch showtoggleon]</a>
+		<a href="[history-scan form="expand=[box-code]"]">[scratch showtoggleon]</a>
 	[/else]
 	[/if]
     </td>