[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 8d3738251d72f3f7c28c94a2ef87a9cae7fec08c

[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, master has been updated
       via  8d3738251d72f3f7c28c94a2ef87a9cae7fec08c (commit)
      from  3699196475f8bf160232e1e9f2718afb3681e4d5 (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 8d3738251d72f3f7c28c94a2ef87a9cae7fec08c
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Mon Oct 28 14:28:37 2013 -0400

    Serials: improve routing slips per Dan Wells' suggestions on LP #1229349
    
      - Don't repeat the same address for the same user
      - Label mailing vs. billing
      - Border to separate mailing and billing addresses
      - [Also] move some inline styles to a CSS file
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>

diff --git a/Open-ILS/src/templates/serial/print_routing_list_users.tt2 b/Open-ILS/src/templates/serial/print_routing_list_users.tt2
index d37dfc1..4c0371d 100644
--- a/Open-ILS/src/templates/serial/print_routing_list_users.tt2
+++ b/Open-ILS/src/templates/serial/print_routing_list_users.tt2
@@ -21,6 +21,7 @@
                     <!-- XXX i18n?  This template can be customized for
                     other address layouts if needed. -->
                     <div name="mailing_address_container" class="hidden">
+                        [% l('Mailing address:') %]
                         <span name="mailing_address_street1"></span>
                         <span name="mailing_address_street2"></span><br />
                         <span name="mailing_address_city"></span>,
@@ -30,6 +31,7 @@
                         <span name="mailing_address_country"></span>
                     </div>
                     <div name="billing_address_container" class="hidden">
+                        [% l('Billing address:') %]
                         <span name="billing_address_street1"></span>
                         <span name="billing_address_street2"></span><br />
                         <span name="billing_address_city"></span>,
@@ -55,4 +57,5 @@
 <div id="iframe_in_here"></div>
 <script type="text/javascript"
     src="[% ctx.media_prefix %]/js/ui/default/serial/print_routing_list_users.js"></script>
+<link id="serials_stylesheet_link" rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/serial.css" />
 [% END %]
diff --git a/Open-ILS/web/css/skin/default/serial.css b/Open-ILS/web/css/skin/default/serial.css
index b1b486e..d2feeae 100644
--- a/Open-ILS/web/css/skin/default/serial.css
+++ b/Open-ILS/web/css/skin/default/serial.css
@@ -26,3 +26,8 @@
 .serial-holding-code td { border: 0 !important; padding: 3px; margin: 0 !important; }
 .serial-holding-code td[colspan="2"] { text-align:center; }
 input[readonly] { color: #999; }
+.item-title { font-size: 130%; font-weight: bold; }
+.item-issuance-label { font-size: 120%; }
+.item-dist-and-stream { font-size: 110%; }
+div[name='reader_container'] > div { border-bottom: 1px #000 solid; }
+.hidden { display: none; }
diff --git a/Open-ILS/web/js/ui/default/serial/print_routing_list_users.js b/Open-ILS/web/js/ui/default/serial/print_routing_list_users.js
index f7238eb..9d5f852 100644
--- a/Open-ILS/web/js/ui/default/serial/print_routing_list_users.js
+++ b/Open-ILS/web/js/ui/default/serial/print_routing_list_users.js
@@ -49,12 +49,15 @@ function ListRenderer() {
     };
 
     this._render_reader_addresses = function(reader, node) {
+        var used_ids = {};
         ["mailing", "billing"].forEach(
             function(addr_type) {
                 var addr = reader[addr_type + "_address"]();
-                if (!addr || !addr.valid())
+                if (!addr || !addr.valid() || used_ids[addr.id()])
                     return;
 
+                used_ids[addr.id()] = true;
+
                 var prefix = addr_type + "_address_";
                 var container = n(prefix + "container", node);
                 if (container)
@@ -135,11 +138,9 @@ function ListRenderer() {
 
         iframe.contentWindow.document.open();
         iframe.contentWindow.document.write(
-            "<html><head><style type='text/css'>" +
-            ".item-title { font-size: 130%; font-weight: bold; }\n" +
-            ".item-issuance-label { font-size: 120%; }\n" +
-            ".item-dist-and-stream { font-size: 110%; }\n" +
-            ".hidden { display: none; }\n" +
+            "<html><head><link rel='stylesheet' href='" +
+            dojo.byId("serials_stylesheet_link").href +
+            "' type='text/css' />" +
             "</style></head>\n<body></body></html>"
         );
         iframe.contentWindow.document.close();

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

Summary of changes:
 .../templates/serial/print_routing_list_users.tt2  |    3 +++
 Open-ILS/web/css/skin/default/serial.css           |    5 +++++
 .../ui/default/serial/print_routing_list_users.js  |   13 +++++++------
 3 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS