cvs commit: p5ee/P5EEx/Blue/P5EEx/Blue TemplateEngine.pm

[spadkins]

cvsuser     02/04/13 20:52:08

  Modified:    P5EEx/Blue/P5EEx/Blue TemplateEngine.pm
  Log:
  added ability to embed widgets, not just widget values
  
  Revision  Changes    Path
  1.4       +7 -3      p5ee/P5EEx/Blue/P5EEx/Blue/TemplateEngine.pm
  
  Index: TemplateEngine.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/TemplateEngine.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- TemplateEngine.pm 22 Mar 2002 23:09:29 -0000      1.3
  +++ TemplateEngine.pm 14 Apr 2002 03:52:08 -0000      1.4
  @@ -1,6 +1,6 @@
   
   #############################################################################
  -## $Id: TemplateEngine.pm,v 1.3 2002/03/22 23:09:29 spadkins Exp $
  +## $Id: TemplateEngine.pm,v 1.4 2002/04/14 03:52:08 spadkins Exp $
   #############################################################################
   
   package P5EEx::Blue::TemplateEngine;
  @@ -305,9 +305,13 @@
               $template_text =~ s/\[[^\[\]]+\]/$phrase/;
           }
       }
  -    while ( $template_text =~ /\{([^\{\}]+)\}/ ) {  # vars of the form {var}
  +    while ( $template_text =~ /\{([^\{\}]+)\}/ ) {  # vars of the form {var} or 
{%var}
           $var = $1;
  -        if (defined $values->{$var}) {
  +        if ($var =~ s/^%//) {
  +            $value = $context->widget($var)->html();
  +            $template_text =~ s/\{%$var\}/$value/g;
  +        }
  +        elsif (defined $values->{$var}) {
               $value = $values->{$var};
               $template_text =~ s/\{$var\}/$value/g;
           }