From 63d300191efb3207b7ebb95b98db0d86ca371f16 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 19 Aug 2011 10:23:58 -0400
Subject: [PATCH] Follow-up fix for Bug 6753, Markup corrections and
 improvements for label export window

Making the same changes to the patron card export window.
Now that all references are removed, the old icons and CSS
have been removed as well.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
---
 .../prog/en/css/staff-global.css              |  57 -------
 .../en/modules/patroncards/members-search.tt  |   2 +-
 .../prog/en/modules/patroncards/print.tt      | 144 +++++++-----------
 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif | Bin 1315 -> 0 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif | Bin 1239 -> 0 bytes
 .../intranet-tmpl/prog/img/pdficon_large.gif  | Bin 434 -> 0 bytes
 6 files changed, 54 insertions(+), 149 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 817f9ed9f6..36cef19b15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1851,63 +1851,6 @@ span.permissiondesc {
     cursor: pointer;
 }
 
-h1#pdf {
-        background:transparent url(../../img/pdficon_large.gif) no-repeat scroll 0%;
-        border: 0;
-        margin:0.75em .3em 0.75em .7em;
-        padding:0;
-}
-
-h1#pdf a {
-	border:0;
-	cursor:pointer;
-	display:block;
-	height:0px !important;
-	margin:0;
-	overflow:hidden;
-	padding:44px 0 0;
-	text-decoration:none;
-	width:35px;
-}
-
-h1#csv {
-        background:transparent url(../../img/csv_icon.gif) no-repeat scroll 0%;
-        border: 0;
-        margin:0.75em .3em 0.75em .7em;
-        padding:0;
-}
-
-h1#csv a {
-	border:0;
-	cursor:pointer;
-	display:block;
-	height:0px !important;
-	margin:0;
-	overflow:hidden;
-	padding:44px 0 0;
-	text-decoration:none;
-	width:35px;
-}
-
-h1#xml {
-        background:transparent url(../../img/icon_xml.gif) no-repeat scroll 0%;
-        border: 0;
-        margin:0.75em .3em 0.75em .7em;
-        padding:0;
-}
-
-h1#xml a {
-	border:0;
-	cursor:pointer;
-	display:block;
-	height:0px !important;
-	margin:0;
-	overflow:hidden;
-	padding:44px 0 0;
-	text-decoration:none;
-	width:35px;
-}
-
 #cartDetails {
 	background-color : #FFF;
 	border: 1px solid #739acf;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
index a67c080560..4d651b75db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
@@ -133,4 +133,4 @@ No results found
 
 </div>
 </div>
-[% INCLUDE 'intranet-bottom.inc' %]
+[% INCLUDE 'popup-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
index 495039d05f..e7ca17a606 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
@@ -1,7 +1,7 @@
     [% INCLUDE 'doc-head-open.inc' %]
     <title>Koha &rsaquo; Tools &rsaquo; Patron Cards &rsaquo; Patron Card Printing/Exporting</title>
     [% INCLUDE 'doc-head-close.inc' %]
-    <script type="text/JavaScript" language="JavaScript">
+    <script type="text/javascript">
         //<![CDATA[
             function Done() {
                 window.location = "[% referer %]";
@@ -9,72 +9,48 @@
         //]]>
     </script>
     <style type="text/css">#custom-doc {width:47.23em; *width:46.04em; min-width:610px; margin:auto; margin-top:0.4em;}</style>
-    <style type="text/css">table {border-collapse: separate; border-spacing: 0; border: hidden none;} .header {cursor: auto; background-position: center center; background-repeat: repeat;} .tr {border-collapse: separate;}</style>
 </head>
 <body>
     <div id="custom-doc" class="yui-t2">
         <div id="bd">
             [% IF ( batches ) %]
             <form>
-                <div align="center">
-                    <div class="message">
-                        <b>Click on the following link(s) to download the exported batch(es).</b>
-                    </div>
-                </div>
-                <fieldset class="rows">
-                    <table class="borderless">
-                        [% FOREACH batche IN batches %]
-                        <tr>
-                            [% IF ( batche.label_ids ) %]
-                            <td class="borderless">
-                                [% batche.card_count %] Single Patron Cards
-                            </td>
-                            <td class="borderless">
-                                <h1 id="pdf">
-                                    <a href="/cgi-bin/koha/patroncards/[% batche.create_script %]?batch_id=[% batche.batch_id %]&amp;template_id=[% batche.template_id %]&amp;layout_id=[% batche.layout_id %]&amp;start_card=[% batche.start_card %][% batche.label_ids %]">label_single_[% batche.card_count %].pdf</a>
-                                </h1>
-                            </td>
-                            [% ELSIF ( batche.borrower_numbers ) %]
-                            <td class="borderless">
-                                [% batche.card_count %] Single Patron Cards
-                            </td>
-                            <td class="borderless">
-                                <h1 id="pdf">
-                                    <a href="/cgi-bin/koha/patroncards/[% batche.create_script %]?template_id=[% batche.template_id %]&amp;layout_id=[% batche.layout_id %]&amp;start_card=[% batche.start_card %][% batche.borrower_numbers %]">label_single_[% batche.card_count %].pdf</a>
-                                </h1>
-                            </td>
-                            [% ELSE %]
-                            <td class="borderless">
-                                Card Batch Number [% batche.batch_id %]
-                            </td>
-                            <td class="borderless">
-                                <h1 id="pdf">
-                                    <a href="/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=[% batche.batch_id %]&amp;template_id=[% batche.template_id %]&amp;layout_id=[% batche.layout_id %]&amp;start_card=[% batche.start_card %]">label_batch_[% batche.batch_id %].pdf</a>
-                                </h1>
-                            </td>
-                            [% END %]
-                        </tr>
+                <h3>Click on the following link(s) to download the exported batch(es).</h3>
+                    <fieldset>
+                    [% FOREACH batche IN batches %]
+                        [% IF ( batche.label_ids ) %]
+                        <legend>[% batche.card_count %] Single Patron Cards</legend>
+                        <p>
+                                <a class="document pdf" href="/cgi-bin/koha/patroncards/[% batche.create_script %]?batch_id=[% batche.batch_id %]&amp;template_id=[% batche.template_id %]&amp;layout_id=[% batche.layout_id %]&amp;start_card=[% batche.start_card %][% batche.label_ids %]">label_single_[% batche.card_count %].pdf</a>
+                        </p>
+                        [% ELSIF ( batche.borrower_numbers ) %]
+                        <legend>[% batche.card_count %] Single Patron Cards</legend>
+                        <p>
+                                <a class="document pdf" href="/cgi-bin/koha/patroncards/[% batche.create_script %]?template_id=[% batche.template_id %]&amp;layout_id=[% batche.layout_id %]&amp;start_card=[% batche.start_card %][% batche.borrower_numbers %]">label_single_[% batche.card_count %].pdf</a>
+                        </p>
+                        [% ELSE %]
+                        <legend>Card Batch Number [% batche.batch_id %]</legend>
+                        <p>
+                                <a class="document pdf" href="/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=[% batche.batch_id %]&amp;template_id=[% batche.template_id %]&amp;layout_id=[% batche.layout_id %]&amp;start_card=[% batche.start_card %]">label_batch_[% batche.batch_id %].pdf</a>
+                        </p>
                         [% END %]
-                    </table>
-                </fieldset>
+                    [% END %]
+                    </fieldset>
+
                 <fieldset class="action">
-                    <div style="margin: 10px 10px 10px 0px;">
-                        <span class="yui-button yui-link-button"><span class="first-child"><input type="button" id="done" onclick="parent.parent.GB_hide();" value="Done"></span></span>
-                    </div>
+                    <input type="button" class="submit" id="done" onclick="parent.parent.GB_hide();" value="Done" />
                 </fieldset>
             </form>
             [% ELSE %]
-            <div align="center">
-                <div class="message">
+            <h3>
                     [% IF ( label_ids ) %]
-                    <b>Exporting [% card_count %] patroncard(s).</b>
+                        [% IF ( card_count == 1 ) %]Exporting [% card_count %] patroncard[% ELSE %]Exporting [% card_count %] patroncards[% END %]
                     [% ELSIF ( borrower_numbers ) %]
-                    <b>Exporting [% borrower_count %] patroncard(s).</b>
+                        [% IF ( borrower_count == 1 ) %]Exporting [% borrower_count %] patroncard[% ELSE %]Exporting [% borrower_count %] patroncards[% END %]
                     [% ELSE %]
-                    <b>[% multi_batch_count %] batch(es) to export.</b>
+                        [% IF ( multi_batch_count == 1 ) %][% multi_batch_count %] batch to export[% ELSE %][% multi_batch_count %] batches to export[% END %]
                     [% END %]
-                </div>
-            </div>
+            </h3>
             <form name="exporting" method="post" action="/cgi-bin/koha/patroncards/print.pl">
                 <input type="hidden" name="op" value="export" />
                 <input type="hidden" name="referer" value="[% referer %]" />
@@ -88,48 +64,34 @@
                     <input type="hidden" name="borrower_number" value="[% borrower_number.borrower_number %]" />
                 [% END %]
                 <fieldset class="rows">
-                    <table class="borderless">
-                        <tr>
-                            <td class="borderless">
-                                <label for="template">Select a template to be applied: </label>
-                            </td>
-                            <td class="borderless">
-                                <select name="template_id">
-                                    [% FOREACH template IN templates %]
-                                    <option value="[% template.template_id %]">[% template.template_code %]</option>
-                                    [% END %]
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="borderless">
-                                <label for="layout">Select a layout to be applied: </label>
-                            </td>
-                            <td class="borderless">
-                                <select name="layout_id">
-                                    [% FOREACH layout IN layouts %]
-                                    <option value="[% layout.layout_id %]">[% layout.layout_name %]</option>
-                                    [% END %]
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="borderless">
-                                <label for="start_card">Enter starting card number: </label>
-                            </td>
-                            <td class="borderless">
-                                <input type="text" size="5" id="start_card" name="start_card" class="focus" title="Starting card number" value="1"/>
-                            </td>
-                        </tr>
-                    </table>
+                    <ol>
+                        <li>
+                            <label style="width:9em" for="template_id">Select a template to be applied: </label>
+                            <select name="template_id" id="template_id">
+                                [% FOREACH template IN templates %]
+                                <option value="[% template.template_id %]">[% template.template_code %]</option>
+                                [% END %]
+                            </select>
+                        </li>
+                        <li>
+                            <label style="width:9em" for="layout_id">Select a layout to be applied: </label>
+                            <select name="layout_id" id="layout_id">
+                                [% FOREACH layout IN layouts %]
+                                <option value="[% layout.layout_id %]">[% layout.layout_name %]</option>
+                                [% END %]
+                            </select>
+                        </li>
+                        <li>
+                            <label style="width:9em" for="start_card">Enter starting card number: </label>
+                            <input type="text" size="5" id="start_card" name="start_card" class="focus" title="Starting card number" value="1" />
+                        </li>
+                    </ol>
                 </fieldset>
                 <fieldset class="action">
-                    <div style="margin: 10px 10px 10px 0px;">
-                        <span class="yui-button yui-link-button"><span class="first-child"><input type="submit" value="Export" /></span></span>
-                        <span class="yui-button yui-link-button"><span class="first-child"><input type="button" id="done" onclick="parent.parent.GB_hide();" value="Cancel"></span></span>
-                    </div>
+                    <input type="submit" class="submit" value="Export" />
+                    <a href="#" class="cancel" id="done" onclick="parent.parent.GB_hide();">Cancel</a>
                 </fieldset>
             </form>
             [% END %]
         </div>
-    [% INCLUDE 'intranet-bottom.inc' %]
+    [% INCLUDE 'popup-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif b/koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif
deleted file mode 100644
index ec17116e0ae0b4ff2a2453b9c5029cb6e10da1d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1315
zcmeH`i!<8?0DymqM4}>I5u{3zc~`S2U72-)O^s_;<tnq;xYpxtEn#$>4*4kwT89X2
zRxBPVs=>sgr5@cHuVxx8Q7S(Xk!YGN(e-5AU1j<g>>t?oAAH~4cl@)+px_iDKm;^i
zz#fX#WuZ`LEIU?EP>>$%JXM({kw_*l_{+Pi^tu-TE>=7qZ}q-_Pxl@j9Thj18;wS_
zat#DQJO){vo1$*ck;!BeT@3{(pT|=iYGd8yzi^gD+7*|NYUGO>v-eUW16R1IKbPc;
zq*KrcxM_%OGMS!BX9WTQ?L8Z@SiIbI%}^4;jwY!ZFGy-LwPNA+CM0Y6K{ecDstn&$
z$a|6x4h#&)=Vwg3GkU$gr=FD+M<Y96bb^b9&ivCs-mA^|(y_kHe(vL(0BCYZT^PJA
z5rrLeF>%9f_nB7|egABb|D2a8o9GK6S{vljo%Wom>ht<76&e6EOA?YDdafaVd%RIA
zoBm^c<ymV{TcXc!8bt>!{;gB(=|hE~JM3d`Dnexqd0OU&ShShG<I?Jc5P~4JTK#f}
zOC>qVrtT{Se}W|A3%P-6@xW|VhL7VuO*h*(Cz7_Y-g2V94I#*S>Tbk&8ufbd=%^8r
zz1FG}Pahp7+PARtbS0rL=0?DCu^N7M#35H_ta<-gzqOg+rz5wOV5n~L4xNh6jt^UF
z%>HMBw|tA$^|i0G>a1b$H)w!c9z&kLd2wU@;Y;b*+YZK~CZ?u1bT9J%{AU5u8w3mo
zm;k?bC%k(CK<@%33zw)~{(~!M<e&7`$lpsXQDj&8wgLpq;bix~jx=`h5zK*)OQQUd
zR~!gOv0sT=Q)5^*Ufq1}<d#{G@?9~)Cx<+3=9sBom=Ud)IvgTF*Qg7r^DGo1k}e`=
zgx@;x4J&txp#)LpCcycsn!PN_cuY9_S}DHi;Q0XC|D=;8AG!3GR!Bk~ufQRUWCo*c
zl1Zt>IQqDFVWA!-N-K{b&G6v99CuKO1{(1I@DXdjQ%^<sv1kDP337r{l)hU@H@t5H
zv4f)5kOqCUl@-z(;3Sc!$BCp@t7F83WGH|+cNhJ{Gs?ov!~uXnICEpfI$?Kf@XIzt
zU6E70lPLi_*|L=MD*Ql}BaBH)*a=Fs%K)zve9P*uBkbrNQp{zK4oBy6TZS4CeuP?9
zjFa`2!`(V-stLBqb&G6EWN!*0Uowxgv|_Z-PTr6*KeZ>5aWq6CgSvpS>gTq`@N`5F
z=I@#di#z}0-AVk3Flh-3ZFMgK{{@Wv@YDxRd{l%*lJs;<gaD=_aHu}2`uO^7fom8c
z7Z!7B(EV3zmV|2NS*@$4#nAn7P_{Pseoq!<RAI|v_Ni(d+=93sQN&?f>6u6m#6pxc
pQYsaYV+l=d7#l@ryM2kT7Qrvn`k3v{>(Ji5Gq|!&gTr7z$iEIw5<&m~

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif b/koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif
deleted file mode 100644
index 779fc58d73ea95a10aa777ec487d96412b5b83b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1239
zcmd_pjZ@Qg90%~<Mz~RMz~OahMW|PD99K|aROBIq3gw+gc`6xFomzL2h!=Jq+5}vM
zkOM&x!`NiIJ+qBHunpV>^S1{!p0~*a_Q=LI9>xaZc<lS@-{^Jk&-?TJ1HPXl`G+$<
z{w@(pgxnCcy}iA)wY9mqxv{aazP`S;w)S#uH53ZH1Xd9*fE7ewbuqZ=UtV4gt^|U?
zU?31!T3VV5&ieiS#l^*ig@t)w4nWGaXq{QG_z-hmpU*iz?e+RRUa!M9Y4=UedOV)l
z*;%*S>U-vLyJuW3=gbTkhtp|yIBa(NglpJtvspo`R=d>-mc?Q*I`mUhQ)71Z<a31C
zY@PtjX5F-0KdmsCOh%JwU{Yo>8VyF{IAAc0jg5iP8{pB=(UFmnp`oF{!6Cg~uLIHP
z1_lO{`X^egR-*yY3~01!wML^>!+=T!KSl5dNlK*>Rx0}t{a`5+eR8>+t!-7vWO5mT
z3Ac93xIMkSJyNN(r-uqRN+eRTSRxT4MNu?$gWcUN7X1f2gd$>Jtw1Og2>@ZolSV!u
z5O4(aE<XREteP#L@VdIXxZHM0J(tI87uWMR2xb?V+sWzd<gnRn7K_D1upSEjWH6a@
zIs*)y!C-)<)2SddI+aSJQmJGz<#7l3F%cj=Xl-q2X?bwJrRCneI|RZlJpNi`Wm$Ro
z`3pauDJ}+|;r}KD0+3sPuv-ucyE8r!hpWcMB}Arji2e8@dkg+Px)fd$7X8*ie+j8Z
zbtm!AVJLvE#?^)0jxW;i$Y11^##Dy-P^bbZ`813g#^54vzV~)oQYMV4x*L6kJ@<p0
zkR1k9eGrrB)?vbTHSf-e!$ifi&wlf2X(mO5!be@<aQmsO=b}pytOh=fO?y8Mo7Lp6
z`rRVKp)A=Ad3Cn0?iQu1pFuYrD#E@G%hLMsQH2d9DL4MOY<-j#ofn&ODkg4ke9Vrr
zg!u0x8Ti{L&ZXBE33BT)C=en2T|@Fo`tF#9O+tm&fL7Jf4%J{UL97e^9K5kk`2~VY
zKbouj_FAcP*E_w$rnc)VO`nlqenAEtO3o)yIts}J=`TEHOhs`<UgK{N^XO=8r8I;w
zU$>kvwOt)A6(v@OBF0Zgp<_pINjr;9KC0r)?<v7XQFD~X-uMKIySODTB-SQ1Q_q$U
zALE|Fn#4)A>ZdkL!e8hKEOa#s-JZWE;%8I%o6TPbG>u;#@HqDq<%*oJSad3c&HViG
yt=G>~cxLVwWu?`GXCHV)u_JZ3-PL+gNIU=9{-opQa>K@da<~2J@*K~GKK&P|Kuq=k

diff --git a/koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif b/koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif
deleted file mode 100644
index 39673df7b48ee551318e9f366010e13f112df78e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 434
zcmZ?wbhEHbRA5kGI3mn&_wHQ=1_mH5FE2MXHvSI;Kr$`u%$YO0ckfP1OA{0n{6BN1
zi;K&D<Fr+)R?VC_^9)eInKM9zK#c@};!hSv1_ogU9gs?poeZr1AE@*NC(O&3HR+86
zLxIlu4@xXcR=rQty|Zq9frrk$8vB^ch>U-;TGc}&Bp7n8EH%*TDB64URjFg#116vJ
z?>9r$*ETfP1i0qU%y}1Jv-<J&tg4U#qdK>CmzvfRn_l%6!%$t-;;B;w1&d84>FS#p
zv9ZrLn4>dqF#{jZilvq-3>L0op1gc98{4KW>v>i!n!i?W{SJnWvp3IO!M^Xv!c+SW
zC~Y-n<JrFO>h(nzR2N@8ZFG;}_9X@(zQZeo9vxq1%)x$T{lqux3R#Zuaeg=C_+9(u
zAcKj*1cvL(^$frMGD+wvGO`K?XeboqGc+>(l4A<E;Be3?R)E9ifX9OQ`|30}_3!OA
z&r@z}R1ck{;~CJ{#4bNkkR_lf>1a0xTh*K!3hCCB>yKGRohoQqx;#L)m4U$;05EW;
AqW}N^

-- 
2.39.5