projects / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e4601a3)
porting the "top-margin label fix" from 1.2
authorphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 14 Apr 2009 02:48:13 +0000 (02:48 +0000)
committerphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 14 Apr 2009 02:48:13 +0000 (02:48 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@12858 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/xul/staff_client/server/cat/spine_labels.js patch | blob | history
Open-ILS/xul/staff_client/server/skin/print.css [new file with mode: 0644] patch | blob

diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.js b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
index 880d00d..3cd5c6b 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.js
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
@@ -230,8 +230,10 @@
                                        var mm = Number($('mm').value); if (mm == NaN) mm = 2; /* middle margin */
                                        var lw = Number($('lw').value) || 8; var ll = Number($('ll').value) || 9; /* spine label width and length */
                                        var plw = Number($('plw').value) || 28; var pll = Number($('pll').value) || 9; /* pocket label width and length */
-                                       var html = "<html><head><link type='text/css' rel='stylesheet' href='data:text/css,pre{font-size:" + pt;
-                                       html += "pt; page-break-after: always;}'></link><title>Spine Labels</title></head><body>\n";
+                                       var html = "<html><head>";
+                    html += "<link type='text/css' rel='stylesheet' href='/xul/server/skin/print.css'></link>"
+                    html += "<link type='text/css' rel='stylesheet' href='data:text/css,pre{font-size:" + pt + "pt;}'></link>";
+                    html += "<title>Spine Labels</title></head><body>\n";
                                        var nl = document.getElementsByAttribute('name','template');
                                        for (var i = 0; i < nl.length; i++) {
                                                if (typeof idx == 'undefined' || idx == null) { } else {
@@ -241,7 +243,11 @@
 
                                                for (var j = 0; j < volume.copies().length; j++) {
                                                        var copy = volume.copies()[j];
-                                                       html += '<pre>\n';
+                            if (i == 0) {
+                                                       html += '<pre class="first_pre">\n';
+                            } else {
+                                                       html += '<pre class="not_first_pre">\n';
+                            }
                                                        var gb = nl[i].getElementsByTagName('groupbox')[0];
                                                        var nl2 = gb.getElementsByAttribute('name','spine');
                                                        for (var k = 0; k < nl2.length; k++) {
diff --git a/Open-ILS/xul/staff_client/server/skin/print.css b/Open-ILS/xul/staff_client/server/skin/print.css
new file mode 100644 (file)
index 0000000..af654bb
--- /dev/null
+++ b/Open-ILS/xul/staff_client/server/skin/print.css
@@ -0,0 +1,8 @@
+.first_pre {
+    page-break-after: always;
+    margin-top: -0.20cm;
+}
+
+.not_first_pre {
+    page-break-after: always;
+}
Evergreen ILS