[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 1fcd8174a57399e12313c0174f0738d756a9d9a2

[Evergreen Git]

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, rel_2_12 has been updated
       via  1fcd8174a57399e12313c0174f0738d756a9d9a2 (commit)
      from  b5fdef2bf039dd48a3c435415676569eaca8f365 (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 1fcd8174a57399e12313c0174f0738d756a9d9a2
Author: Michele Morgan <mmorgan at noblenet.org>
Date:   Mon Jul 17 15:36:06 2017 -0400

    LP#1683555 - Bad barcode image missing from dialog.
    
    Copies the existing bad_barcode.png image to web/images. Also tweaks
    wording and style of the dialog box for clarity.
    
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/share/t_bad_barcode_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_bad_barcode_dialog.tt2
index c304416..56c56e1 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_bad_barcode_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_bad_barcode_dialog.tt2
@@ -8,7 +8,9 @@
     <img src="[% ctx.media_prefix %]/images/bad_barcode.png"/>
     <div>
 [% |l('{{barcode}}') %]
-Bad check digit, possibly due to a bad scan.  Use this barcode ("[_1]") anyway?
+Invalid barcode: <div class="strong-text-4">[_1]</div>
+Your entry has a bad check digit, possibly due to a bad scan.<br/>
+Choose Cancel to try again, or Accept to use barcode <b>[_1]</b> anyway.
 [% END %]
     </div>
   </div>
diff --git a/Open-ILS/web/images/bad_barcode.png b/Open-ILS/web/images/bad_barcode.png
new file mode 100644
index 0000000..a78d3db
Binary files /dev/null and b/Open-ILS/web/images/bad_barcode.png differ

-----------------------------------------------------------------------

Summary of changes:
 .../staff/circ/share/t_bad_barcode_dialog.tt2      |    4 +++-
 .../skin/media => web}/images/bad_barcode.png      |  Bin 7499 -> 7499 bytes
 2 files changed, 3 insertions(+), 1 deletions(-)
 copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/bad_barcode.png (100%)


hooks/post-receive
-- 
Evergreen ILS