projects / evergreen / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3699196)
Serials: improve routing slips per Dan Wells' suggestions on LP #1229349
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 28 Oct 2013 18:28:37 +0000 (14:28 -0400)
committerDan Wells <dbw2@calvin.edu>
Tue, 21 Jan 2014 20:52:45 +0000 (15:52 -0500)
  - 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@esilibrary.com>
Signed-off-by: Remington Steed <rjs7@calvin.edu>
Open-ILS/src/templates/serial/print_routing_list_users.tt2 patch | blob | history
Open-ILS/web/css/skin/default/serial.css patch | blob | history
Open-ILS/web/js/ui/default/serial/print_routing_list_users.js patch | blob | history

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 (file)
--- 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 (file)
--- 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 (file)
--- 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();
Evergreen working repo (MassLNC)