Merge branch 'master' of git.freeside.biz:/home/git/freeside

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

diff --git a/httemplate/view/cust_main/notes/notes.html b/httemplate/view/cust_main/notes/notes.html
index 6a7a06a..eb421eb 100644 (file)
--- a/httemplate/view/cust_main/notes/notes.html
+++ b/httemplate/view/cust_main/notes/notes.html
@@ -34,6 +34,10 @@
 
 % my $bgcolor1 = '#eeeeee';
 % my $bgcolor2 = '#ffffff';
+% my %sticky_color = ( '#eeeeee' => '#ffff66',
+%                      '#ffffff' => '#ffffb8',
+%                    );
+%
 % my $bgcolor = '';
 % my $last_classnum = -1;
 % my $skipheader = 0;
@@ -56,7 +60,7 @@
 %                                             ";notenum=$notenum",
 %                            'actionlabel' => emt('Edit customer note'),
 %                            'width'       => 616,
-%                            'height'      => 538, #575
+%                            'height'      => 575,
 %                            'frame'       => 'top',
 %                        );
 %   my $clickjs = qq!onclick="$onclick"!;
@@ -85,12 +89,13 @@
                style="display:<% $display %>"
        >
        <& /elements/table-grid.html &>
+        <THEAD>
        <TR>
            <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
 %   if ( $conf->exists('cust_main_note-display_times') ) {
            <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Time') |h %></TH>
 %   }
-           <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Person') |h %></TH>
+           <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Employee') |h %></TH>
 %   if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) {
            <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Class') |h %></TH>
 %   }
@@ -99,25 +104,28 @@
            <TH CLASS="grid" BGCOLOR="#cccccc">&nbsp;</TH>
 %   }
        </TR>
+        </THEAD>
 % $skipheader = (!$conf->exists('note-classes') || $conf->config('note-classes') < 2);
 % $last_classnum = $note->classnum;
 % }
 
+% my $color = $note->sticky ? $sticky_color{$bgcolor} : $bgcolor;
+
     <TR>
-      <% note_datestr($note,$conf,$bgcolor) %>
-      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% note_datestr($note,$conf,$color) %>
+      <TD CLASS="grid" BGCOLOR="<% $color %>">
         &nbsp;<% $note->usernum ? $note->access_user->name : $note->otaker %>
       </TD>
 % if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) {
-      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <TD CLASS="grid" BGCOLOR="<% $color %>">
        <% $note->classname %>   
       </TD>
 % }
-      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <TD CLASS="grid" BGCOLOR="<% $color %>">
         <% $note->comments | defang %>
       </TD>
 % if($edit) {
-      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $edit %></TD>
+      <TD CLASS="grid" BGCOLOR="<% $color %>"><% $edit %></TD>
 % }
     </TR>