[open-ils-commits] [GIT] Evergreen ILS branch master updated. 7758ff50c14ae46724f41895dcaa184581755ae6
Evergreen Git
git at git.evergreen-ils.org
Fri Apr 13 11:04:19 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 7758ff50c14ae46724f41895dcaa184581755ae6 (commit)
via 98d2995b1091cbaf982fd8e63ba53424512fddd5 (commit)
from 5f09921d98443a50c7aba9417e6d37c4588fe150 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7758ff50c14ae46724f41895dcaa184581755ae6
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Fri Apr 13 10:07:17 2012 -0400
More patron display css tweaks
To help prevent some "jumpy" interfaces due to borders and text appearing
and disappearing with selections and updates.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/server/skin/patron_display.css b/Open-ILS/xul/staff_client/server/skin/patron_display.css
index 52cf928..9fa7520 100644
--- a/Open-ILS/xul/staff_client/server/skin/patron_display.css
+++ b/Open-ILS/xul/staff_client/server/skin/patron_display.css
@@ -11,39 +11,50 @@ deck#patron_deck { border-left: solid thin black; }
row#row_billing_first { padding-top: 10px; }
row#row_billing_zip { padding-bottom: 10px; }
-.NO_PENALTIES .patronNameLarge { border: solid thick lime; padding: 10px; }
+
+/* To keep the size consistent. Other CSS rules for this need only change border-color.
+ This helps keep things like patron search from being "jumpy" */
+.patronNameLarge { border: solid thick transparent; padding: 10px; }
+
+/* This also helps keep things from being "jumpy" by ensuring that the expired/alert/whatever
+ notice area always takes up space, even when empty. Otherwise things popping into and out of
+ existence when you select/update patrons can cause it to come and go, bouncing other parts
+ of the screen up and down. */
+#pdm2hb1a { min-height: 1.5em; }
+
+.NO_PENALTIES .patronNameLarge { border-color: lime; }
/*
.ONE_PENALTY .patronNameLarge { background-color: fuchsia; }
.MULTIPLE_PENALTIES .patronNameLarge { background-color: #CC3300; }
*/
-.PATRON_HAS_STAFF_ALERT .patronNameLarge { border: solid thick blue; padding: 10px; }
+.PATRON_HAS_STAFF_ALERT .patronNameLarge { border-color: blue; }
-.PATRON_HAS_BILLS .patronNameLarge { border: solid thick #FFC266; padding: 10px; }
+.PATRON_HAS_BILLS .patronNameLarge { border-color: #FFC266; }
.PATRON_HAS_BILLS label.bill { color: #AA4400; }
/* .PATRON_HAS_BILLS label.bill.label { text-decoration: underline; } */
.PATRON_HAS_BILLS label.bill.value { }
.PATRON_HAS_BILLS label.bills_indicator { display: inline; color: #AA4400; }
-.PATRON_HAS_OVERDUES .patronNameLarge { border: solid thick #FFC266; padding: 10px; }
+.PATRON_HAS_OVERDUES .patronNameLarge { border-color: #FFC266; }
.PATRON_HAS_OVERDUES label.items_overdue { color: #AA4400; }
/* .PATRON_HAS_OVERDUES label.items_overdue.label { text-decoration: underline; } */
.PATRON_HAS_OVERDUES label.items_overdue.value { }
.PATRON_HAS_OVERDUES label.overdues_indicator { display: inline; color: #AA4400; }
.PATRON_HAS_OVERDUES label#under_items { color: red; }
-.PATRON_EXCEEDS_CHECKOUT_COUNT .patronNameLarge { border: solid thick #C99DFF; padding: 10px; }
+.PATRON_EXCEEDS_CHECKOUT_COUNT .patronNameLarge { border-color: #C99DFF; }
.PATRON_EXCEEDS_CHECKOUT_COUNT label.items_out { color: purple; }
/* .PATRON_EXCEEDS_CHECKOUT_COUNT label.items_out.label { text-decoration: underline; } */
.PATRON_EXCEEDS_CHECKOUT_COUNT label.items_out.value { }
-.PATRON_EXCEEDS_OVERDUE_COUNT .patronNameLarge { border: solid thick #C99DFF; padding: 10px; }
+.PATRON_EXCEEDS_OVERDUE_COUNT .patronNameLarge { border-color: #C99DFF; }
.PATRON_EXCEEDS_OVERDUE_COUNT label.items_overdue { color: purple; }
/* .PATRON_EXCEEDS_OVERDUE_COUNT label.items_overdue.label { text-decoration: underline; } */
.PATRON_EXCEEDS_OVERDUE_COUNT label.items_overdue.value { }
.PATRON_EXCEEDS_OVERDUE_COUNT label.max_overdues_indicator { display: inline; color: purple; }
-.PATRON_EXCEEDS_FINES .patronNameLarge { border: solid thick #C99DFF; padding: 10px; }
+.PATRON_EXCEEDS_FINES .patronNameLarge { border-color: #C99DFF; }
.PATRON_EXCEEDS_FINES label.bill { color: purple; }
/* .PATRON_EXCEEDS_FINES label.bill.label { text-decoration: underline; } */
.PATRON_EXCEEDS_FINES label.bill.value { }
@@ -60,21 +71,21 @@ row#row_billing_zip { padding-bottom: 10px; }
.INVALID_PATRON_EVENING_PHONE label.invalid_phone_indicator { display: inline; color: #003399 }
.INVALID_PATRON_OTHER_PHONE label.invalid_phone_indicator { display: inline; color: #003399 }
-.PATRON_HAS_ALERT .patronNameLarge { border: solid thick yellow; padding: 10px }
+.PATRON_HAS_ALERT .patronNameLarge { border-color: yellow; }
.PATRON_HAS_ALERT groupbox.alert { background-color: yellow; color: black; }
.PATRON_HAS_ALERT [id^=patron_alert] { background: yellow; color: black; }
.PATRON_HAS_ALERT label.alert_indicator { display: inline; color: #AA4400 }
.PATRON_HAS_NOTES label.note_indicator { display: inline; color: #AA4400 }
-.PATRON_INACTIVE .patronNameLarge { border: solid thick #333333; padding: 10px; }
+.PATRON_INACTIVE .patronNameLarge { border-color: #333333; }
.PATRON_INACTIVE label.inactive_indicator { display: inline; color: black; }
-.PATRON_EXPIRED .patronNameLarge { border: solid thick #666666; padding: 10px;}
+.PATRON_EXPIRED .patronNameLarge { border-color: #666666; }
.PATRON_EXPIRED label.expired_indicator { display: inline; color: black; }
.PATRON_EXPIRED label.expire_date { background-color: #666666; color: white }
-.PATRON_BARRED .patronNameLarge { border: solid thick #CC3300; padding: 10px; }
+.PATRON_BARRED .patronNameLarge { border-color: #CC3300; }
.PATRON_BARRED label.barred_indicator { display: inline; color: #CC3300; }
.PATRON_NET_ACCESS_1 .net_access { color: #AA4400; } /* Filtered */
commit 98d2995b1091cbaf982fd8e63ba53424512fddd5
Author: Jason Etheridge <jason at esilibrary.com>
Date: Fri Apr 13 02:54:13 2012 -0400
add more penalty related CSS hooks
PATRON_HAS_CUSTOM_PENALTY (if the penalty is not a stock penalty, based on id)
PATRON_HAS_STAFF_ALERT (if the staff_alert boolean on the penalty is true)
PATRON_HAS_BLOCK (if there's anything in the penalty's block list)
PATRON_HAS_CIRC_BLOCK (if CIRC is in the block list)
PATRON_HAS_RENEW_BLOCK (if RENEW is in the block list)
PATRON_HAS_HOLD_BLOCK (if HOLD is in the block list)
PATRON_HAS_CAPTURE_BLOCK (if CAPTURE is in the block list)
PATRON_HAS_FULFILL_BLOCK (if FULFILL is in the block list)
also adds stock CSS for PATRON_HAS_STAFF_ALERT, a blue border around the patron
name.
In the color hierarchy, this comes after the normal Green/Lime status, but gets
trumped by any other penalty that sets a colored border.
So, for example, if a patron has no penalties, and you go to Messages and add an
"Alert" note, that equates to the penalty ALERT_NOTE, which has a staff_alert
setting of True. On a refresh, the patron will then have a blue border around
their name. If you then create a bill on that patron for $100, triggering the
PATRON_EXCEEDS_FINES penalty, then the patron will gain the normal purple or
lavender border, even though the penalty also has a staff_alert setting of True
and triggers PATRON_HAS_STAFF_ALERT CSS.
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js
index 19aab0f..f6f2cd0 100644
--- a/Open-ILS/xul/staff_client/server/patron/util.js
+++ b/Open-ILS/xul/staff_client/server/patron/util.js
@@ -703,6 +703,32 @@ patron.util.set_penalty_css = function(patron) {
for (var i = 0; i < penalties.length; i++) {
/* this comes from /opac/common/js/utils.js */
addCSSClass(document.documentElement,penalties[i].standing_penalty().name());
+ if (penalties[i].standing_penalty().id() >= 100) {
+ addCSSClass(document.documentElement,'PATRON_HAS_CUSTOM_PENALTY');
+ }
+ if (get_bool( penalties[i].standing_penalty().staff_alert() )) {
+ addCSSClass(document.documentElement,'PATRON_HAS_STAFF_ALERT');
+ }
+ var block_list = penalties[i].standing_penalty().block_list();
+ if (block_list) {
+ addCSSClass(document.documentElement,'PATRON_HAS_BLOCK');
+ // TODO: futureproofing, split and loop on block_list to produce these classnames
+ if (block_list.match('CIRC')) {
+ addCSSClass(document.documentElement,'PATRON_HAS_CIRC_BLOCK');
+ }
+ if (block_list.match('RENEW')) {
+ addCSSClass(document.documentElement,'PATRON_HAS_RENEW_BLOCK');
+ }
+ if (block_list.match('HOLD')) {
+ addCSSClass(document.documentElement,'PATRON_HAS_HOLD_BLOCK');
+ }
+ if (block_list.match('CAPTURE')) {
+ addCSSClass(document.documentElement,'PATRON_HAS_CAPTURE_BLOCK');
+ }
+ if (block_list.match('FULFILL')) {
+ addCSSClass(document.documentElement,'PATRON_HAS_FULFILL_BLOCK');
+ }
+ }
}
switch(penalties.length) {
diff --git a/Open-ILS/xul/staff_client/server/skin/patron_display.css b/Open-ILS/xul/staff_client/server/skin/patron_display.css
index 5a0adbd..52cf928 100644
--- a/Open-ILS/xul/staff_client/server/skin/patron_display.css
+++ b/Open-ILS/xul/staff_client/server/skin/patron_display.css
@@ -17,6 +17,8 @@ row#row_billing_zip { padding-bottom: 10px; }
.MULTIPLE_PENALTIES .patronNameLarge { background-color: #CC3300; }
*/
+.PATRON_HAS_STAFF_ALERT .patronNameLarge { border: solid thick blue; padding: 10px; }
+
.PATRON_HAS_BILLS .patronNameLarge { border: solid thick #FFC266; padding: 10px; }
.PATRON_HAS_BILLS label.bill { color: #AA4400; }
/* .PATRON_HAS_BILLS label.bill.label { text-decoration: underline; } */
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/xul/staff_client/server/patron/util.js | 26 +++++++++++++++
.../staff_client/server/skin/patron_display.css | 33 ++++++++++++++------
2 files changed, 49 insertions(+), 10 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list