[interchange-cvs] interchange - jon modified code/UserTag/button.tag

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Thu Sep 21 12:59:07 EDT 2006


User:      jon
Date:      2006-09-21 16:59:07 GMT
Modified:  code/UserTag button.tag
Log:
Add XHTML self-closing slash if wanted.
Remove spurious </b> tag that doesn't seem to apply to an image button.

Revision  Changes    Path
1.18      +6 -7      interchange/code/UserTag/button.tag


rev 1.18, prev_rev 1.17
Index: button.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/button.tag,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- button.tag	21 Sep 2006 16:35:01 -0000	1.17
+++ button.tag	21 Sep 2006 16:59:07 -0000	1.18
@@ -1,12 +1,12 @@
 # Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: button.tag,v 1.17 2006/09/21 16:35:01 jon Exp $
+# $Id: button.tag,v 1.18 2006/09/21 16:59:07 jon Exp $
 
 UserTag button Order     name src text
 UserTag button addAttr
 UserTag button attrAlias value text
 UserTag button hasEndTag
-UserTag button Version   $Revision: 1.17 $
+UserTag button Version   $Revision: 1.18 $
 UserTag button Routine   <<EOR
 sub {
 	my ($name, $src, $text, $opt, $action) = @_;
@@ -92,7 +92,7 @@
 	if(! $onclick and $confirm) {
 		$onclick = qq{ onclick="return $confirm"};
 	}
-	$out = qq{<input type="submit" name="$name" value="$text"$onclick>};
+	$out = qq{<input type="submit" name="$name" value="$text"$onclick$Vend::Xtrailer>};
 	if (@js) {
 		$out =~ s/ /join "\n", '', @js, ''/e;
 	}
@@ -120,7 +120,7 @@
 		}
 
 		my $out = $opt->{bold} ? '<b>' : '';
-		$out .= qq{<input$opt->{extra} type="submit" name="$name" value="$text"$onclick>};
+		$out .= qq{<input$opt->{extra} type="submit" name="$name" value="$text"$onclick$Vend::Xtrailer>};
 		$out .= '</b>' if $opt->{bold};
 		if(@js) {
 			$out =~ s/ /join "\n", '', @js, ''/e;
@@ -137,16 +137,15 @@
 	$wstatus =~ s/'/\\'/g;
 
 	my $clickname = $name;
-	$out .= '</b>' if $opt->{bold};
 	my $clickvar = $name;
 	if($image and $name eq 'mv_click') {
 		$clickvar = $text;
 		$clickvar =~ s/\W/_/g;
 		$clickname = "mv_click_$clickvar";
-		$out = qq{<input type='hidden' name='mv_click_map' value='$clickvar'>};
+		$out = qq{<input type='hidden' name='mv_click_map' value='$clickvar'$Vend::Xtrailer>};
 	}
 	
-	$out .= qq{<input type='hidden' name='$clickname' value=''>} if $image; 
+	$out .= qq{<input type='hidden' name='$clickname' value=''$Vend::Xtrailer>} if $image; 
 
 	my $formname;
 	$opt->{form} = 'forms[0]'








More information about the interchange-cvs mailing list