X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Ftr-fixed.html;h=dad8da03fc16565ef41c701ed7fcbc2ca6c63140;hp=ac0dc8db68620d81fea420c26456395a2123ee32;hb=9aee669886202be7035e6c6049fc71bc99dd3013;hpb=eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd diff --git a/httemplate/elements/tr-fixed.html b/httemplate/elements/tr-fixed.html index ac0dc8db6..dad8da03f 100644 --- a/httemplate/elements/tr-fixed.html +++ b/httemplate/elements/tr-fixed.html @@ -1,6 +1,6 @@ <% include('tr-td-label.html', @_ ) %> - ><% $opt{'value'} %> + <% $colspan %>><% $value %> @@ -10,6 +10,23 @@ my %opt = @_; -my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : ''; +my $style = $opt{'cell_style'} + ? ' STYLE="'. $opt{'cell_style'}. '" ' + : ' STYLE="color:#666666" '; + +my $colspan = $opt{'colspan'} ? ' COLSPAN="'. $opt{'colspan'}. '" ' : ''; + +my $value = $opt{'formatted_value'} || $opt{'curr_value'} || $opt{'value'}; +$value = $opt{'prefix'} . $value if defined($opt{'prefix'}); + +unless ( $opt{'noescape'} ) { + #compatibility with select-table and friends + if ( $opt{'multiple'} ) { + $value = [ split(/\s*,\s*/, $value) ] if !ref $value; + $value = join('
', map {encode_entities($_)} @$value); + } else { + $value = encode_entities($value) + } +}