[interchange-cvs] interchange - docelic modified lib/Vend/Form.pm

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Thu Jun 9 14:15:28 EDT 2005


User:      docelic
Date:      2005-06-09 18:15:28 GMT
Modified:  lib/Vend Form.pm
Log:
- XHTML-compliance:

  - lowercased some HTML tags (all containers, so no ">" vs. "/>" issues)

  - removed double <small> tag ( <small><small>...text...</small></small> )

Revision  Changes    Path
2.61      +30 -30    interchange/lib/Vend/Form.pm


rev 2.61, prev_rev 2.60
Index: Form.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Form.pm,v
retrieving revision 2.60
retrieving revision 2.61
diff -u -r2.60 -r2.61
--- Form.pm	3 May 2005 06:03:26 -0000	2.60
+++ Form.pm	9 Jun 2005 18:15:28 -0000	2.61
@@ -1,6 +1,6 @@
 # Vend::Form - Generate Form widgets
 # 
-# $Id: Form.pm,v 2.60 2005/05/03 06:03:26 mheins Exp $
+# $Id: Form.pm,v 2.61 2005/06/09 18:15:28 docelic Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -39,7 +39,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.60 $, 10);
+$VERSION = substr(q$Revision: 2.61 $, 10);
 
 @EXPORT = qw (
 	display
@@ -226,7 +226,7 @@
 		qq(</td>)
 		,
 	boxgroup =>
-		qq(</tr><tr><td{TD_GROUP?} {TD_GROUP}{/TD_GROUP?} COLSPAN=2>)
+		qq(</tr><tr><td{TD_GROUP?} {TD_GROUP}{/TD_GROUP?} colspan="2">)
 		.
 		qq(<b>{TVALUE}</b>)
 		.
@@ -312,11 +312,11 @@
 	$opt->{extra} = " $opt->{extra}" if $opt->{extra};
 
 	my $template = $opt->{template} || <<EOF;
-<A HREF="{URL}"{EXTRA}>{SELECTED <B>}{LABEL}{SELECTED </B>}</A>
+<a href="{URL}"{EXTRA}>{SELECTED <b>}{LABEL}{SELECTED </b>}</a>
 EOF
 
 	my $o_template = $opt->{o_template} || <<EOF;
-<B>{TVALUE}</B>
+<b>{TVALUE}</b>
 EOF
 
 	my $href = $opt->{href} || $Global::Variable->{MV_PAGE};
@@ -467,36 +467,36 @@
 		$val = POSIX::strftime("%Y%m%d%H00", @t);
 	}
 	my $sel = 0;
-	my $out = qq{<SELECT NAME="$name"$sel_extra>};
+	my $out = qq{<select name="$name"$sel_extra>};
 	my $o;
 	if ($opt->{blank}) {
-		$out .= '<OPTION VALUE="0"$opt_extra>------</OPTION>';
+		$out .= '<option value="0"$opt_extra>------</option>';
 	}
 	for(@Months) {
-		$o = qq{<OPTION VALUE="$_->[0]"$opt_extra>} . errmsg($_->[1]) . '</OPTION>';
+		$o = qq{<option value="$_->[0]"$opt_extra>} . errmsg($_->[1]) . '</option>';
 		($out .= $o, next) unless ! $sel and $val;
 		$o =~ s/>/ SELECTED>/ && $sel++
 			if substr($val, 4, 2) eq $_->[0];
 		$out .= $o;
 	}
 	$sel = 0;
-	$out .= qq{</SELECT>};
-	$out .= qq{<INPUT TYPE=hidden NAME="$name" VALUE="/">};
-	$out .= qq{<SELECT NAME="$name"$sel_extra>};
+	$out .= qq{</select>};
+	$out .= qq{<input type="hidden" name="$name" value="/">};
+	$out .= qq{<select name="$name"$sel_extra>};
 	if ($opt->{blank}) {
-		$out .= '<OPTION VALUE="0"$opt_extra>--</OPTION>';
+		$out .= '<option value="0"$opt_extra>--</option>';
 	}
 	for(@Days) {
-		$o = qq{<OPTION VALUE="$_->[0]"$opt_extra>$_->[1]} . '</OPTION>';
+		$o = qq{<option value="$_->[0]"$opt_extra>$_->[1]} . '</option>';
 		($out .= $o, next) unless ! $sel and $val;
 		$o =~ s/>/ SELECTED>/ && $sel++
 			if substr($val, 6, 2) eq $_->[0];
 		$out .= $o;
 	}
 	$sel = 0;
-	$out .= qq{</SELECT>};
-	$out .= qq{<INPUT TYPE=hidden NAME="$name" VALUE="/">};
-	$out .= qq{<SELECT NAME="$name"$sel_extra>};
+	$out .= qq{</select>};
+	$out .= qq{<input type="hidden" name="$name" value="/">};
+	$out .= qq{<select name="$name"$sel_extra>};
 	if(my $by = $opt->{year_begin} || $::Variable->{UI_DATE_BEGIN}) {
 		my $cy = $t[5] + 1900;
 		my $ey = $opt->{year_end}  || $::Variable->{UI_DATE_END} || ($cy + 10);
@@ -509,25 +509,25 @@
 		@Years = ($by .. $ey);
 	}
 	if ($opt->{blank}) {
-		$out .= '<OPTION VALUE="0000"$opt_extra>----</OPTION>';
+		$out .= '<option value="0000"$opt_extra>----</option>';
 	}
 	for(@Years) {
-		$o = qq{<OPTION$opt_extra>$_} . '</OPTION>';
+		$o = qq{<option$opt_extra>$_} . '</option>';
 		($out .= $o, next) unless ! $sel and $val;
 		$o =~ s/>/ SELECTED>/ && $sel++
 			if substr($val, 0, 4) eq $_;
 		$out .= $o;
 	}
-	$out .= qq{</SELECT>};
+	$out .= qq{</select>};
 	return $out unless $opt->{time};
 
 	$val =~ s/^\d{8}//;
 	$val =~ s/\D+//g;
 	$val = round_to_fifteen($val);
-	$out .= qq{<INPUT TYPE=hidden NAME="$name" VALUE=":">};
-	$out .= qq{<SELECT NAME="$name"$sel_extra>};
+	$out .= qq{<input type="hidden" name="$name" value=":">};
+	$out .= qq{<select name="$name"$sel_extra>};
 	if ($opt->{blank}) {
-		$out .= '<OPTION VALUE="0"$opt_extra>--:--</OPTION>';
+		$out .= '<option value="0"$opt_extra>--:--</option>';
 	}
 	
 	my $ampm = defined $opt->{ampm} ? $opt->{ampm} : 1;
@@ -591,7 +591,7 @@
 				$disp_hour = sprintf("%02d:%02d", $hr, $min);
 			}
 			my $time = sprintf "%02d%02d", $hr, $min;
-			$o = sprintf qq{<OPTION VALUE="%s"$opt_extra>%s}, $time, $disp_hour;
+			$o = sprintf qq{<option value="%s"$opt_extra>%s}, $time, $disp_hour;
 			($out .= $o, next) unless ! $sel and $val;
 #::logDebug("prospect=$time actual=$val");
 			$o =~ s/>/ SELECTED>/ && $sel++
@@ -599,7 +599,7 @@
 			$out .= $o;
 		}
 	}
-	$out .= "</SELECT>";
+	$out .= "</select>";
 	return $out;
 }
 
@@ -610,7 +610,7 @@
 	$val =~ s/"/&quot;/g;
 	$lab =~ s/"/&quot;/g;
 	$width = 10 if ! $width;
-	return qq{<tr><td><small><input type="text" name="$name" value="$val" size="$half"></small></td><td><small><input type="text" name="$name" value="$lab" size=$width></small></td><td><small><small><select name="$name"><option value="0">no<option value="1"$sel>default*</select></small></small></td></tr>};
+	return qq{<tr><td><small><input type="text" name="$name" value="$val" size="$half"></small></td><td><small><input type="text" name="$name" value="$lab" size="$width"></small></td><td><small><select name="$name"><option value="0">no<option value="1"$sel>default*</select></small></td></tr>};
 }
 
 sub option_widget {
@@ -672,7 +672,7 @@
 			$template .= q( cols="{COLS|20}" name="{NAME}">{ENCODED}</textarea>);
 		}
 		else {
-			$template .= qq(<input TYPE="text" size="{COLS||40}");
+			$template .= qq(<input type="text" size="{COLS||40}");
 			$template .= qq( name="{NAME}" value="{ENCODED}">);
 		}
 	}
@@ -697,7 +697,7 @@
 				$template .= q(</textarea>);
 			}
 			else {
-				$template .= qq(<input TYPE="text" size="{COLS|40}");
+				$template .= qq(<input type="text" size="{COLS|40}");
 				$template .= qq( name="{NAME}" value=");
 				$template .= '{ENCODED}'
 					unless $opt->{conditional_text} and length($opt->{value}) < 3;
@@ -707,8 +707,8 @@
 		$addl = attr_list($template, $opt);
 	}
 	else {
-		$addl = qq|<INPUT TYPE=text NAME="$opt->{name}"|;
-		$addl   .= qq| SIZE="$opt->{cols}" VALUE="">|;
+		$addl = qq|<input type="text" name="$opt->{name}"|;
+		$addl   .= qq| size="$opt->{cols}" value="">|;
 	}
 	if($opt->{reverse}) {
 		$opt->{append} = length($opt->{append}) ? "$addl$opt->{append}" : $addl;
@@ -1348,7 +1348,7 @@
 	if(my $c = $opt->{check}) {
 		$c = "$opt->{name}=$c" unless $c =~ /=/;
 		HTML::Entities::encode($c);
-		$opt->{append} .= qq{<input type=hidden name="mv_individual_profile" value="$c">};
+		$opt->{append} .= qq{<input type="hidden" name="mv_individual_profile" value="$c">};
 	}
 
 	if($opt->{js}) {








More information about the interchange-cvs mailing list