Attachment #6380 for bug #2847

View | Details | Raw Unified | Return to bug 2847
Collapse All | Expand All

Lines 11-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc (-1 / +1 lines)
11	<p class="tip">Search orders:</p>	11	<p class="tip">Search orders:</p>
12		12
13	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">	13	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
14	<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="[% title %]" /> <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name %]" />	14	<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="[% title %]" /> <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name\|html %]" />
15	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>	15	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
16	</form>	16	</form>
17	</div>	17	</div>




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title>
[% INCLUDE 'doc-head-close.inc' %]
[% UNLESS ( closedate ) %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>

            }
        });
    });

</script>
<script type="text/javascript">
//<![CDATA[
            function confirm_close() {
                var is_confirmed = confirm(_('Are you sure you want to close this basket?'));
                if (is_confirmed) {
                    window.location = "[% script_name %]?op=close&basketno=[% basketno %]";
                }
            }

        </script>
<script type="text/javascript">
//<![CDATA[
            function confirm_deletion() {
                var is_confirmed = confirm(_('Are you sure you want to delete this basket?'));
                if (is_confirmed) {

[% INCLUDE 'acquisitions-search.inc' %]


<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name|html %]</a> &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</div>

<div id="doc3" class="yui-t2">


            <h3>Basket deleted</h3>
            <META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl">
        [% ELSE %]
        <h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for <a href="supplier.pl?supplierid=[% booksellerid %]">[% name|html %]</a></h1>
        [% IF ( delete_confirm ) %]
            <h2>
            <span class="yui-button yui-link-button">

                    </p>
                </form>
                [% ELSE %]
                    <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basketgroups %]&amp;basketgroupid=[% id %]">[% name|html %]</a>
                [% END %]
                [% END %]
            </div>

        <div id="closebasket_needsconfirmation" class="dialog alert">

        <form action="/cgi-bin/koha/acqui/basket.pl" class="confirm">
            <h1>Are you sure you want to close basket [% basketname|html %]?</h1>
            <p>
            <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
            <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
- 

Return to bug 2847

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-14 / +7 lines)
1	[% INCLUDE 'doc-head-open.inc' %]	1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]</title>	2	<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname\|html %] ([% basketno %]) for [% name\|html %]</title>
3	[% INCLUDE 'doc-head-close.inc' %]	3	[% INCLUDE 'doc-head-close.inc' %]
4	[% UNLESS ( closedate ) %]	4	[% UNLESS ( closedate ) %]
5	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>	5	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
Lines 13-32 Link Here
13	}	13	}
14	});	14	});
15	});	15	});
16	//]]>	16
17	</script>
18	<script type="text/javascript">
19	//<![CDATA[
20	function confirm_close() {	17	function confirm_close() {
21	var is_confirmed = confirm(_('Are you sure you want to close this basket?'));	18	var is_confirmed = confirm(_('Are you sure you want to close this basket?'));
22	if (is_confirmed) {	19	if (is_confirmed) {
23	window.location = "[% script_name %]?op=close&basketno=[% basketno %]";	20	window.location = "[% script_name %]?op=close&basketno=[% basketno %]";
24	}	21	}
25	}	22	}
26	//]]>	23
27	</script>
28	<script type="text/javascript">
29	//<![CDATA[
30	function confirm_deletion() {	24	function confirm_deletion() {
31	var is_confirmed = confirm(_('Are you sure you want to delete this basket?'));	25	var is_confirmed = confirm(_('Are you sure you want to delete this basket?'));
32	if (is_confirmed) {	26	if (is_confirmed) {
Lines 65-71 Link Here
65	[% INCLUDE 'acquisitions-search.inc' %]	59	[% INCLUDE 'acquisitions-search.inc' %]
66		60
67		61
68	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]</div>	62	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name\|html %]</a> &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname\|html %] ([% basketno %]) for [% name\|html %]</div>
69		63
70	<div id="doc3" class="yui-t2">	64	<div id="doc3" class="yui-t2">
71		65
Lines 141-147 Link Here
141	<h3>Basket deleted</h3>	135	<h3>Basket deleted</h3>
142	<META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl">	136	<META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl">
143	[% ELSE %]	137	[% ELSE %]
144	<h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for <a href="supplier.pl?supplierid=[% booksellerid %]">[% name %]</a></h1>	138	<h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname\|html %] ([% basketno %]) for <a href="supplier.pl?supplierid=[% booksellerid %]">[% name\|html %]</a></h1>
145	[% IF ( delete_confirm ) %]	139	[% IF ( delete_confirm ) %]
146	<h2>	140	<h2>
147	<span class="yui-button yui-link-button">	141	<span class="yui-button yui-link-button">
Lines 186-192 Link Here
186	</p>	180	</p>
187	</form>	181	</form>
188	[% ELSE %]	182	[% ELSE %]
189	<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroups %]&basketgroupid=[% id %]">[% name %]</a>	183	<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroups %]&basketgroupid=[% id %]">[% name\|html %]</a>
190	[% END %]	184	[% END %]
191	[% END %]	185	[% END %]
192	</div>	186	</div>
Lines 305-311 Link Here
305	<div id="closebasket_needsconfirmation" class="dialog alert">	299	<div id="closebasket_needsconfirmation" class="dialog alert">
306		300
307	<form action="/cgi-bin/koha/acqui/basket.pl" class="confirm">	301	<form action="/cgi-bin/koha/acqui/basket.pl" class="confirm">
308	<h1>Are you sure you want to close basket [% basketname %]?</h1>	302	<h1>Are you sure you want to close basket [% basketname\|html %]?</h1>
309	<p>	303	<p>
310	<label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>	304	<label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
311	<input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>	305	<input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
312	-