Merge remote-tracking branch 'kc/new/bug_6753' into kcmaster

This commit is contained in:
Chris Cormack 2011-08-26 15:12:32 +12:00
commit eac3046dd9
6 changed files with 54 additions and 149 deletions

View file

@ -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;

View file

@ -133,4 +133,4 @@ No results found
</div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]
[% INCLUDE 'popup-bottom.inc' %]

View file

@ -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' %]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 B