diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-01-28 19:28:13 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-01-28 19:28:13 -0600 |
| commit | 92a327b2bc09344a7e0db93f40e34b71547bf075 (patch) | |
| tree | 5dd0ea80b997a3a1b003e0dac52463aa20ac96d5 /httemplate/view | |
| parent | 730a14abf09f1ed8854cfded6f432fee832ea7d8 (diff) | |
| parent | 3ed9d0fa90662f037f3fb2f50632ccb34066a979 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/view')
3 files changed, 14 insertions, 8 deletions
diff --git a/httemplate/view/cust_main/notes/notes.html b/httemplate/view/cust_main/notes/notes.html index 6a7a06a02..fa45a68f2 100644 --- 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"!; @@ -103,21 +107,23 @@ % $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 %>"> <% $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> diff --git a/httemplate/view/cust_main/payment_history/voided_invoice.html b/httemplate/view/cust_main/payment_history/voided_invoice.html index f9ff3079a..ba51b3bca 100644 --- a/httemplate/view/cust_main/payment_history/voided_invoice.html +++ b/httemplate/view/cust_main/payment_history/voided_invoice.html @@ -1,5 +1,5 @@ <DEL><% $link %><% $invoice %><% $link ? '</A>' : '' %></DEL> -<I><% mt("voided [_1]", time2str($date_format, $cust_bill_void->void_date) ) |h %> +<I><% mt("voided ([_1]) [_2]", $cust_bill_void->reason, time2str($date_format, $cust_bill_void->void_date) ) |h %> % my $void_user = $cust_bill_void->void_access_user; % if ($void_user) { by <% $void_user->username %></I> diff --git a/httemplate/view/cust_main/payment_history/voided_payment.html b/httemplate/view/cust_main/payment_history/voided_payment.html index a8194a75f..207ab9cdd 100644 --- a/httemplate/view/cust_main/payment_history/voided_payment.html +++ b/httemplate/view/cust_main/payment_history/voided_payment.html @@ -1,5 +1,5 @@ <DEL><% mt("Payment [_1] by [_2]", $info, $cust_pay_void->otaker ) |h %></DEL> -<I><% mt("voided [_1]", time2str($date_format, $cust_pay_void->void_date) ) |h %> +<I><% mt("voided ([_1]) [_2]", $cust_pay_void->reason, time2str($date_format, $cust_pay_void->void_date) ) |h %> % my $void_user = $cust_pay_void->void_access_user; % if ($void_user) { by <% $void_user->username %></I> |