From: Kathy Lussier <klussier@masslnc.org> Date: Fri, 1 Jun 2018 13:51:07 +0000 (-0400) Subject: LP#1635386: Restore to xul colors and remove colors from class names X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d191c7e5a7ec4f7dfe07db241747db66dc5c6dbb;p=evergreen%2Fequinox.git LP#1635386: Restore to xul colors and remove colors from class names This commit restores the xul display where overdue items were highlighted in red and long overdue items were highlighted in orange. Also removes the colors from the class names since people may decide to use totally different colors or style the rows in different ways. Signed-off-by: Kathy Lussier <klussier@masslnc.org> Signed-off-by: Dan Wells <dbw2@calvin.edu> --- diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index 94e4e860e6..ff61b4a317 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -346,29 +346,29 @@ table.list tr.selected td { /* deprecated? */ } /* patron bill row-highlighting */ -.red-row-highlight { +.overdue-row { color: #FFF; background-color: #EB0000 !important; } -.red-row-highlight a:link, .dark-red-row-highlight a:link { +.overdue-row a:link, .lost-row a:link { color: #B8ECFF; } -.orange-row-highlight { +.longoverdue-row { color: #000; background-color: #FFE1A8 !important; } -.dark-red-row-highlight { +.lost-row { color: #FFF; background-color: #800000 !important; } -.eg-grid-row-selected.red-row-highlight { +.eg-grid-row-selected.overdue-row { background-color: #CF0000 !important; } -.eg-grid-row-selected.orange-row-highlight { +.eg-grid-row-selected.longoverdue-row { background-color: #FFCF75 !important; } -.eg-grid-row-selected.dark-red-row-highlight { +.eg-grid-row-selected.lost-row { background-color: #5C0000 !important; } diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js index bd1e9bed9f..63a7121172 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js @@ -225,11 +225,11 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location, apply: function(item) { if (!item['circulation.checkin_time']) { if (item['circulation.stop_fines'] == 'LOST') { - return 'dark-red-row-highlight'; + return 'lost-row'; } else if (item['circulation.stop_fines'] == 'LONGOVERDUE') { - return 'red-row-highlight'; + return 'longoverdue-row'; } else { - return 'orange-row-highlight'; + return 'overdue-row'; } } }