RT#6226: fckeditor for customer notes

[freeside.git] / httemplate / view / cust_main / notes.html

diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index 4c97c9f..a6378f4 100755 (executable)
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -6,9 +6,14 @@
 
   <TR>
     <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+%   if ( $conf->exists('cust_main_note-display_times') ) {
+      <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+%   }
     <TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
     <TH CLASS="grid" BGCOLOR="#cccccc">Note</TH>
+%   if ($curuser->access_right('Edit customer note') ) {
+    <TH CLASS="grid" BGCOLOR="#cccccc">&nbsp;</TH>
+%   }
   </TR>
 
 % my $bgcolor1 = '#eeeeee';
@@ -32,7 +37,7 @@
 %                                             ";notenum=$notenum",
 %                            'actionlabel' => 'Edit customer note',
 %                            'width'       => 616,
-%                            'height'      => 408,
+%                            'height'      => 580,
 %                            'frame'       => 'top',
 %                        );
 %   my $clickjs = qq!onclick="$onclick"!;
@@ -48,8 +53,11 @@
         &nbsp;<% $note->otaker%>
       </TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-        &nbsp;<%$note->comments%><% $edit %>
+        &nbsp;<%$note->comments%>
       </TD>
+% if($edit) {
+      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $edit %></TD>
+% }
     </TR>
 
 % } #end display notes
@@ -75,7 +83,7 @@ my (@notes) = $cust_main->notes();
 
 sub note_datestr {
   my($note, $conf, $bgcolor) = @_ or return '';
-  my $td = '<TD CLASS="grid" BGCOLOR="$bgcolor" ALIGN="right">';
+  my $td = qq{<TD CLASS="grid" BGCOLOR="$bgcolor" ALIGN="right">};
   my $format = "$td%b&nbsp;%o,&nbsp;%Y</TD>";
   $format .= "$td%l:%M%P</TD>"
     if $conf->exists('cust_main_note-display_times');