From 2c3e355d82021408d97e6bc87f35bf0b84796db9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 19 Aug 2011 10:23:58 -0400 Subject: [PATCH] [SIGNED-OFF] 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 --- .../intranet-tmpl/prog/en/css/staff-global.css | 57 -------- .../prog/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 koha-tmpl/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 817f9ed..36cef19 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 a67c080..4d651b7 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 -[% 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 495039d..e7ca17a 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' %] Koha › Tools › Patron Cards › Patron Card Printing/Exporting [% INCLUDE 'doc-head-close.inc' %] - -
[% IF ( batches ) %]
-
-
- Click on the following link(s) to download the exported batch(es). -
-
-
- - [% FOREACH batche IN batches %] - - [% IF ( batche.label_ids ) %] - - - [% ELSIF ( batche.borrower_numbers ) %] - - - [% ELSE %] - - - [% END %] - +

Click on the following link(s) to download the exported batch(es).

+
+ [% FOREACH batche IN batches %] + [% IF ( batche.label_ids ) %] + [% batche.card_count %] Single Patron Cards +

+ label_single_[% batche.card_count %].pdf +

+ [% ELSIF ( batche.borrower_numbers ) %] + [% batche.card_count %] Single Patron Cards +

+ label_single_[% batche.card_count %].pdf +

+ [% ELSE %] + Card Batch Number [% batche.batch_id %] +

+ label_batch_[% batche.batch_id %].pdf +

[% END %] -
- [% batche.card_count %] Single Patron Cards - -

- label_single_[% batche.card_count %].pdf -

-
- [% batche.card_count %] Single Patron Cards - -

- label_single_[% batche.card_count %].pdf -

-
- Card Batch Number [% batche.batch_id %] - -

- label_batch_[% batche.batch_id %].pdf -

-
-
+ [% END %] + +
-
- -
+
[% ELSE %] -
-
+

[% IF ( label_ids ) %] - Exporting [% card_count %] patroncard(s). + [% IF ( card_count == 1 ) %]Exporting [% card_count %] patroncard[% ELSE %]Exporting [% card_count %] patroncards[% END %] [% ELSIF ( borrower_numbers ) %] - Exporting [% borrower_count %] patroncard(s). + [% IF ( borrower_count == 1 ) %]Exporting [% borrower_count %] patroncard[% ELSE %]Exporting [% borrower_count %] patroncards[% END %] [% ELSE %] - [% multi_batch_count %] batch(es) to export. + [% IF ( multi_batch_count == 1 ) %][% multi_batch_count %] batch to export[% ELSE %][% multi_batch_count %] batches to export[% END %] [% END %] -

-
+
@@ -88,48 +64,34 @@ [% END %]
- - - - - - - - - - - - - -
- - - -
- - - -
- - - -
+
    +
  1. + + +
  2. +
  3. + + +
  4. +
  5. + + +
  6. +
-
- - -
+ + Cancel
[% END %]
- [% 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_;4*4kwT89X2 zRxBPVs=>sgr5@cHuVxx8Q7S(Xk!YGN(e-5AU1j>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%9f_nB7|egABb|D2a8o9GK6S{vljo%Wom>ht<76&e6EOA?YDdafaVd%RIA zoBm^c!{;gB(=|hE~JM3d`Dnexqd0OU&ShShGqVrtT{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)~{(~!MIQqDFVWA!-N-K{b&G6v99CuKO1{(1I@DXdjQ%^5aWq6CgSvpS>gTq`@N`5F z=I@#di#z}0-AVk3Flh-3ZFMgK{{@Wv@YDxRd{l%*lJs;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%~^S1{!p0~*a_Q=LI9>xaZcU-vLyJuW3=gbTkhtp|yIBa(NglpJtvspo`R=d>-mc?Q*I`mUhQ)71Z8VyF{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(aEkvwOt)A6(v@OBF0Zgp<_pINjr;9KC0r)?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&DU-;TGc}&Bp7n8EH%*TDB64URjFg#116vJ z?>9r$*ETfP1i0qU%y}1Jv-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-nh(nzR2N@8ZFG;}_9X@(zQZeo9vxq1%)x$T{lqux3R#Zuaeg=C_+9(u zAcKj*1cvL(^$frMGD+wvGO`K?XeboqGc+>(l4A1a0xTh*K!3hCCB>yKGRohoQqx;#L)m4U$;05EW; AqW}N^ -- 1.7.2.3