[interchange-cvs] interchange - racke modified 2 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-11-21 10:40:59 GMT
Modified:  code/UserTag formel.tag
Added:     .        WHATSNEW-5.5
Log:
[formel] calls [display] on unknown types.

Revision  Changes    Path
1.1                  interchange/WHATSNEW-5.5


rev 1.1, prev_rev 1.0
Index: WHATSNEW-5.5
===================================================================
------------------------------------------------------------------------------

                  What's new in each version of Interchange
                       (since the version 5.4 branch)

------------------------------------------------------------------------------


Interchange 5.5.1 released on YYYY-MM-DD.

UserTag
-------

* [formel] calls [display] on unknown types.



1.13      +17 -3     interchange/code/UserTag/formel.tag


rev 1.13, prev_rev 1.12
Index: formel.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/formel.tag,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- formel.tag	6 Oct 2005 08:46:14 -0000	1.12
+++ formel.tag	21 Nov 2005 10:40:59 -0000	1.13
@@ -1,11 +1,11 @@
 # Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
 # Copyright 2002-2005 Stefan Hornburg (racke at linuxia.de)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: formel.tag,v 1.12 2005/10/06 08:46:14 racke Exp $
+# $Id: formel.tag,v 1.13 2005/11/21 10:40:59 racke Exp $
 
 UserTag formel Order   label name type size
 UserTag formel addAttr
-UserTag formel Version $Revision: 1.12 $
+UserTag formel Version $Revision: 1.13 $
 UserTag formel Routine <<EOF
 sub {
 	my ($label, $name, $type, $size, $opt) = @_;
@@ -166,8 +166,22 @@
 		if ($type eq 'textarea') {
 			$elhtml = qq{<textarea name="${name}"$sizestr>$::Values->{$name}</textarea>};
 		}
-		else {
+		elsif ($type eq 'text' || $type !~ /\S/) {
 			$elhtml = qq{<input type="$type" name="$name" value="$::Values->{$name}"$sizestr>};
+		}
+		else {
+			# pass type directly to display tag
+			if ($opt->{order}) {
+				$fmt = sprintf($fmt, '$WIDGET$', '$LABEL$');
+			} else {
+				$fmt = sprintf($fmt, '$LABEL$', '$WIDGET$');
+			}
+
+			return $Tag->display({name => $name,
+						   type => $type,
+						   label => $label,
+						   value => $Values->{$name},
+						   template => $fmt});
 		}
 	}