X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Ftr-fixed.html;h=3e115d69af2ed3ebf127dd3285a5c3ec2fa47a36;hp=f358343dd1c97e196f04b437eeebaf86733810c1;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=307a7d85568a15f5eb0d97c648507484108fcc56

diff --git a/httemplate/elements/tr-fixed.html b/httemplate/elements/tr-fixed.html
index f358343dd..3e115d69a 100644
--- a/httemplate/elements/tr-fixed.html
+++ b/httemplate/elements/tr-fixed.html
@@ -1,25 +1,32 @@
-<% include('tr-td-label.html', @_ ) %>
+<& tr-td-label.html, @_ &>
 
-  <TD BGCOLOR="#dddddd" <% $style %>><% $value %></TD>
+  <TD <% $style %> <% $colspan %>><% $value %></TD>
 
 </TR>
 
-<% 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'};
-#compatibility with select-table and friends
-if ( $opt{'multiple'} ) {
-  $value = [ split(/\s*,\s*/, $value) ] if !ref $value;
-  $value = join('<BR>', map {encode_entities($_)} @$value);
-}
-else {
-  $value = encode_entities($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('<BR>', map {encode_entities($_)} @$value);
+  } else {
+    $value = encode_entities($value)
+  }
 }
 
 </%init>