Attachment #154495 for bug #34553

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

Lines 62-68 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt (-1 / +1 lines)
62	</div>	62	</div>
63	<a class="btn btn-default" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a>	63	<a class="btn btn-default" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a>
64	<a class="btn btn-default" href="basket.pl" id="empty_cart"><i class="fa fa-trash-can"></i> Empty and close</a>	64	<a class="btn btn-default" href="basket.pl" id="empty_cart"><i class="fa fa-trash-can"></i> Empty and close</a>
65	<a class="btn btn-default close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>	65	<a class="btn btn-default close_window" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>
66	</div>	66	</div>
67		67
68		68




<title>Sending your cart &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="cart_sendbasketform" class="cart">
<div class="container">[% IF ( email_add ) %]

	[% IF ( SENT ) %]
        <h3>Message sent</h3>
        <p>The cart was sent to: [% email_add | html %]</p>
		<p><a class="focus close" href="#">Close window</a></p>
	[% END %]
	[% IF ( error ) %]
	<p>Problem sending the cart...</p>
	[% END %]

    <nav class="navbar navbar-default navbar-fixed-bottom">
        <div class="container-fluid">
            <fieldset class="action">
                <a class="btn btn-default close focus" href="#">Close window</a>
            </fieldset>
        </div>
    </nav>

[% ELSE %]

[% INCLUDE 'blocking_errors.inc' %]

    </li>
    </ol>
    </fieldset>
    <fieldset class="action"> <input type="submit" class="btn btn-primary" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
    <input type="hidden" name="bib_list" value="[% bib_list | html %]" />
    <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />

    <nav class="navbar navbar-default navbar-fixed-bottom">
        <div class="container-fluid">
            <fieldset class="action">
                <input type="submit" class="btn btn-primary" value="Send" />
                <button type="button" class="btn btn-default close_window">Cancel</button>
            </fieldset>
        </div>
    </nav>
</form>

[% END %]</div>




<title>Sending your list &rsaquo; Lists &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="lists_sendshelfform" class="lists">
[% INCLUDE 'blocking_errors.inc' %]
<div class="container-fluid">[% IF ( email ) %]

    [% IF ( SENT ) %]
        <h3>Message sent</h3>

        <p><a class="close focus" href="#">Close window</a></p>
    [% END %]
    [% IF ( error ) %]
        <p>Problem sending the list...</p>
    [% END %]

    <nav class="navbar navbar-default navbar-fixed-bottom">
        <div class="container-fluid">
            <fieldset class="action">
                <a class="btn btn-default close focus" href="#">Close window</a>
            </fieldset>
        </div>
    </nav>

[% ELSE %]

<form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">

    <li>
        <input type="hidden" name="shelfid" value="[% shelfid | html %]" />
    </li></ol></fieldset>

    <nav class="navbar navbar-default navbar-fixed-bottom">
        <div class="container-fluid">
            <fieldset class="action">
                <input type="submit" class="btn btn-primary" value="Send" />
                <button class="btn btn-default close_window">Cancel</button>
            </fieldset>
        </div>
    </nav>
</form>

[% END %]</div>

Lines 942-948 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-1 / +1 lines)
942	[% IF op == 'view' %]	942	[% IF op == 'view' %]
943		943
944	function sendList(){	944	function sendList(){
945	open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=[% shelf.shelfnumber \| html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100');	945	openWindow( CGIBIN + 'virtualshelves/sendshelf.pl?shelfid=[% shelf.shelfnumber \| html %]' );
946	}	946	}
947		947
948	$(document).ready(function() {	948	$(document).ready(function() {

Lines 367-377 function quit() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/basket.js (-4 / +1 lines)
367	function sendBasket() {	367	function sendBasket() {
368	var valCookie = readCookie(nameCookie);	368	var valCookie = readCookie(nameCookie);
369	var strCookie = nameParam + "=" + valCookie;	369	var strCookie = nameParam + "=" + valCookie;
370
371	var loc = CGIBIN + "basket/sendbasket.pl?" + strCookie;	370	var loc = CGIBIN + "basket/sendbasket.pl?" + strCookie;
372		371	openWindow( loc, "win_form" );
373	var optWin="scrollbars=no,resizable=no,height=400,width=650,top=50,left=100";
374	open(loc,"win_form",optWin);
375	}	372	}
376		373
377	function downloadBasket() {	374	function downloadBasket() {

Lines 59-65 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js (-2 / +1 lines)
59	$( e.target.hash ).find("input:text:first").focus();	59	$( e.target.hash ).find("input:text:first").focus();
60	});	60	});
61		61
62	$(".close").click(function(){ window.close(); });	62	$(".close, .close_window").click(function(){ window.close(); });
63		63
64	$("#checkin_search form").preventDoubleFormSubmit();	64	$("#checkin_search form").preventDoubleFormSubmit();
65		65
66	-

Return to bug 34553

Lines 2-19 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt (-4 / +19 lines)
2	<title>Sending your cart &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	2	<title>Sending your cart &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
3	[% INCLUDE 'doc-head-close.inc' %]	3	[% INCLUDE 'doc-head-close.inc' %]
4	</head>	4	</head>
5	<body style="padding: 1em;" id="cart_sendbasketform" class="cart">	5	<body id="cart_sendbasketform" class="cart">
6	<div class="container">[% IF ( email_add ) %]	6	<div class="container">[% IF ( email_add ) %]
7		7
8	[% IF ( SENT ) %]	8	[% IF ( SENT ) %]
9	<h3>Message sent</h3>	9	<h3>Message sent</h3>
10	<p>The cart was sent to: [% email_add \| html %]</p>	10	<p>The cart was sent to: [% email_add \| html %]</p>
11	<p><a class="focus close" href="#">Close window</a></p>
12	[% END %]	11	[% END %]
13	[% IF ( error ) %]	12	[% IF ( error ) %]
14	<p>Problem sending the cart...</p>	13	<p>Problem sending the cart...</p>
15	[% END %]	14	[% END %]
16		15
		16	<nav class="navbar navbar-default navbar-fixed-bottom">
		17	<div class="container-fluid">
		18	<fieldset class="action">
		19	<a class="btn btn-default close focus" href="#">Close window</a>
		20	</fieldset>
		21	</div>
		22	</nav>
		23
17	[% ELSE %]	24	[% ELSE %]
18		25
19	[% INCLUDE 'blocking_errors.inc' %]	26	[% INCLUDE 'blocking_errors.inc' %]
Lines 31-39 Link Here
31	</li>	38	</li>
32	</ol>	39	</ol>
33	</fieldset>	40	</fieldset>
34	<fieldset class="action"> <input type="submit" class="btn btn-primary" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
35	<input type="hidden" name="bib_list" value="[% bib_list \| html %]" />	41	<input type="hidden" name="bib_list" value="[% bib_list \| html %]" />
36	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />	42	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
		43
		44	<nav class="navbar navbar-default navbar-fixed-bottom">
		45	<div class="container-fluid">
		46	<fieldset class="action">
		47	<input type="submit" class="btn btn-primary" value="Send" />
		48	<button type="button" class="btn btn-default close_window">Cancel</button>
		49	</fieldset>
		50	</div>
		51	</nav>
37	</form>	52	</form>
38		53
39	[% END %]</div>	54	[% END %]</div>

Lines 2-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt (-5 / +21 lines)
2	<title>Sending your list &rsaquo; Lists &rsaquo; Koha</title>	2	<title>Sending your list &rsaquo; Lists &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	3	[% INCLUDE 'doc-head-close.inc' %]
4	</head>	4	</head>
5	<body id="lists_sendshelfform" class="lists" style="padding: 1em;">	5	<body id="lists_sendshelfform" class="lists">
6	[% INCLUDE 'blocking_errors.inc' %]	6	[% INCLUDE 'blocking_errors.inc' %]
7	<div class="container">[% IF ( email ) %]	7	<div class="container-fluid">[% IF ( email ) %]
8		8
9	[% IF ( SENT ) %]	9	[% IF ( SENT ) %]
10	<h3>Message sent</h3>	10	<h3>Message sent</h3>
Lines 12-20 Link Here
12	<p><a class="close focus" href="#">Close window</a></p>	12	<p><a class="close focus" href="#">Close window</a></p>
13	[% END %]	13	[% END %]
14	[% IF ( error ) %]	14	[% IF ( error ) %]
15	<p>Problem sending the list...</p>	15	<p>Problem sending the list...</p>
16	[% END %]	16	[% END %]
17		17
		18	<nav class="navbar navbar-default navbar-fixed-bottom">
		19	<div class="container-fluid">
		20	<fieldset class="action">
		21	<a class="btn btn-default close focus" href="#">Close window</a>
		22	</fieldset>
		23	</div>
		24	</nav>
		25
18	[% ELSE %]	26	[% ELSE %]
19		27
20	<form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">	28	<form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">
Lines 32-38 Link Here
32	<li>	40	<li>
33	<input type="hidden" name="shelfid" value="[% shelfid \| html %]" />	41	<input type="hidden" name="shelfid" value="[% shelfid \| html %]" />
34	</li></ol></fieldset>	42	</li></ol></fieldset>
35	<fieldset class="action"> <input type="submit" class="btn btn-primary" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>	43
		44	<nav class="navbar navbar-default navbar-fixed-bottom">
		45	<div class="container-fluid">
		46	<fieldset class="action">
		47	<input type="submit" class="btn btn-primary" value="Send" />
		48	<button class="btn btn-default close_window">Cancel</button>
		49	</fieldset>
		50	</div>
		51	</nav>
36	</form>	52	</form>
37		53
38	[% END %]</div>	54	[% END %]</div>