[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4d2179dc437dbfc945bce6e38cad8af7ef5a0963
Evergreen Git
git at git.evergreen-ils.org
Fri Feb 26 22:21:38 EST 2016
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 4d2179dc437dbfc945bce6e38cad8af7ef5a0963 (commit)
via cf04dbaa67db5d61cc822f59b0ca91b3d10998ab (commit)
via 041a23b488b92120e17200d53d95f8735f5356ba (commit)
from 1c9605039f08e016974046941ee192a0e7b767b6 (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 4d2179dc437dbfc945bce6e38cad8af7ef5a0963
Author: Kathy Lussier <klussier at masslnc.org>
Date: Fri Feb 26 17:03:03 2016 -0500
LP#122975 Add year to copyright statement
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/xul/staff_client/server/skin/media/images/licenses.txt b/Open-ILS/xul/staff_client/server/skin/media/images/licenses.txt
index 5ffda38..1362dfe 100644
--- a/Open-ILS/xul/staff_client/server/skin/media/images/licenses.txt
+++ b/Open-ILS/xul/staff_client/server/skin/media/images/licenses.txt
@@ -3,8 +3,8 @@ http://www.iconfinder.com/icondetails/1227/128/alarm_bell_icon
GLPL
holdshelf.png, reserve.png and transit.png were created by Christine Morgan
-at the North Of Boston Library Exchange. Copyright © North of Boston Library
-Exchange, all rights reserved. Permission is granted to copy, distribute
+at the North Of Boston Library Exchange. Copyright © 2016 North of Boston
+Library Exchange, all rights reserved. Permission is granted to copy, distribute
and/or modify this document under the terms of the GNU Free Documentation
License, Version 1.2 or any later version published by the Free Software
Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
commit cf04dbaa67db5d61cc822f59b0ca91b3d10998ab
Author: Kathy Lussier <klussier at masslnc.org>
Date: Thu Feb 25 17:01:11 2016 -0500
lp122975-add-licensing-text
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/xul/staff_client/server/skin/media/images/licenses.txt b/Open-ILS/xul/staff_client/server/skin/media/images/licenses.txt
index df3dbc5..5ffda38 100644
--- a/Open-ILS/xul/staff_client/server/skin/media/images/licenses.txt
+++ b/Open-ILS/xul/staff_client/server/skin/media/images/licenses.txt
@@ -1,3 +1,12 @@
bell.png and bell_bw.png derived from:
http://www.iconfinder.com/icondetails/1227/128/alarm_bell_icon
GLPL
+
+holdshelf.png, reserve.png and transit.png were created by Christine Morgan
+at the North Of Boston Library Exchange. Copyright © North of Boston Library
+Exchange, all rights reserved. Permission is granted to copy, distribute
+and/or modify this document under the terms of the GNU Free Documentation
+License, Version 1.2 or any later version published by the Free Software
+Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+Texts. A copy of the license is included in the section entitled "GNU Free
+Documentation License".
commit 041a23b488b92120e17200d53d95f8735f5356ba
Author: Martha Driscoll <driscoll at noblenet.org>
Date: Mon Feb 22 15:34:15 2016 -0500
LP1229757 - Distinct images for holds, reserves, transits
This commit changes the references to turtle.gif to three new images
holdshelf.png, reserve.png, and transit.png. When checking in a copy
that needs to go on the hold shelf, on the reservation shelf, or
in transit, a distinct image will show in the pop-up window.
Signed-off-by: Martha Driscoll <driscoll at noblenet.org>
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index d2db606..b725e7c 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -3111,7 +3111,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
document.getElementById('circStrings').getString('staff.circ.utils.hold_slip.print.no'),
null,
document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
- '/xul/server/skin/media/images/turtle.gif'
+ '/xul/server/skin/media/images/holdshelf.png'
);
} else {
if (suppress_popups && !no_print_prompting) {
@@ -3265,7 +3265,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
document.getElementById('circStrings').getString('staff.circ.utils.reservation_slip.print.no'),
null,
document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
- '/xul/server/skin/media/images/turtle.gif'
+ '/xul/server/skin/media/images/reserve.png'
);
}
if (rv == 0) {
@@ -3540,7 +3540,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
document.getElementById('circStrings').getString('staff.circ.utils.transit_slip.print.no'),
null,
document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
- '/xul/server/skin/media/images/turtle.gif'
+ '/xul/server/skin/media/images/transit.png'
);
} else {
if (suppress_popups && !no_print_prompting) {
diff --git a/Open-ILS/xul/staff_client/server/skin/media/images/holdshelf.png b/Open-ILS/xul/staff_client/server/skin/media/images/holdshelf.png
new file mode 100644
index 0000000..0d04142
Binary files /dev/null and b/Open-ILS/xul/staff_client/server/skin/media/images/holdshelf.png differ
diff --git a/Open-ILS/xul/staff_client/server/skin/media/images/reserve.png b/Open-ILS/xul/staff_client/server/skin/media/images/reserve.png
new file mode 100644
index 0000000..e3f4266
Binary files /dev/null and b/Open-ILS/xul/staff_client/server/skin/media/images/reserve.png differ
diff --git a/Open-ILS/xul/staff_client/server/skin/media/images/transit.png b/Open-ILS/xul/staff_client/server/skin/media/images/transit.png
new file mode 100644
index 0000000..6c57f72
Binary files /dev/null and b/Open-ILS/xul/staff_client/server/skin/media/images/transit.png differ
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/xul/staff_client/server/circ/util.js | 6 +++---
.../server/skin/media/images/holdshelf.png | Bin 0 -> 8149 bytes
.../server/skin/media/images/licenses.txt | 9 +++++++++
.../server/skin/media/images/reserve.png | Bin 0 -> 5981 bytes
.../server/skin/media/images/transit.png | Bin 0 -> 7573 bytes
5 files changed, 12 insertions(+), 3 deletions(-)
create mode 100644 Open-ILS/xul/staff_client/server/skin/media/images/holdshelf.png
create mode 100644 Open-ILS/xul/staff_client/server/skin/media/images/reserve.png
create mode 100644 Open-ILS/xul/staff_client/server/skin/media/images/transit.png
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list