X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-fixed.html;h=3e115d69af2ed3ebf127dd3285a5c3ec2fa47a36;hb=01721976fa3324f41a3093cda68bc38a7eec5ff5;hp=095e1bce9dc9addf00c788f8a327eaf8745f712a;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git
diff --git a/httemplate/elements/tr-fixed.html b/httemplate/elements/tr-fixed.html
index 095e1bce9..3e115d69a 100644
--- a/httemplate/elements/tr-fixed.html
+++ b/httemplate/elements/tr-fixed.html
@@ -1,15 +1,32 @@
-<% include('tr-td-label.html', @_ ) %>
+<& tr-td-label.html, @_ &>
-
><% $opt{'formatted_value'} || $opt{'curr_value'} || $opt{'value'} |h %> |
+ <% $colspan %>><% $value %> |
-<% include('hidden.html', %opt ) %>
+<& hidden.html, %opt &>
<%init>
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)
+ }
+}
%init>