Attachment #79004 for bug #18480

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

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt (-1 / +1 lines)
9	"dt_cardnumber":	9	"dt_cardnumber":
10	"[% data.cardnumber \| html %]",	10	"[% data.cardnumber \| html %]",
11	"dt_name":	11	"dt_name":
12	"<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber \| html %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]</a></span>",	12	"<a href=\"#\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber \| html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]</a>",
13	"dt_branch":	13	"dt_branch":
14	"[% data.branchname \| html %]",	14	"[% data.branchname \| html %]",
15	"dt_category":	15	"dt_category":




<title>Koha &rsaquo; Patron search</title>
[% INCLUDE 'doc-head-close.inc' %]
[% Asset.css("css/datatables.css") | $raw %]
<style> .modal-body .close { display: none; } </style>
</head>

<body id="common_patron_search" class="common">


<div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>

<!-- Patron preview modal -->
<div class="modal" id="patronPreview" tabindex="-1" role="dialog" aria-labelledby="patronPreviewLabel">
    <div class="modal-dialog" role="document">
        <div class="modal-content">
            <div class="modal-header">
                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                <h4 class="modal-title" id="patronPreviewLabel"></h4>
            </div>
            <div class="modal-body">
                <div id="loading">
                    <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading
                </div>
                <div id="patronPreviewContent">
                </div>
            </div>
            <div class="modal-footer">
                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
            </div>
        </div>
    </div>
</div>

</div>
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]


                select_user( borrowernumber, JSON.parse(borrower_data) );
            });

            $("body").on("click",".patron_preview", function( e ){
                e.preventDefault();
                var borrowernumber = $(this).data("borrowernumber");
                var page = "/cgi-bin/koha/members/moremember.pl?print=brief&borrowernumber=" + borrowernumber;
                $("#patronPreviewContent").load( page + " div.container-fluid", function() {
                    $("#loading").hide();
                });

                $('#patronPreview').modal({ show:true });
            });

            $("#patronPreview").on('hidden.bs.modal', function (e) {
                $("#patronPreviewContent").html("");
                $("#loading").show();
            });

        });

        function filter() {

Lines 17-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (-1 / +1 lines)
17	"dt_cardnumber":	17	"dt_cardnumber":
18	"[% data.cardnumber \| html %]",	18	"[% data.cardnumber \| html %]",
19	"dt_name":	19	"dt_name":
20	"<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber \| html %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) invert_name = 1 %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email \| html %]'>[% data.email \| html %]</a>[% END %]</span>",	20	"<a href=\"#\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber \| html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) invert_name = 1 %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email \| html %]'>[% data.email \| html %]</a>[% END %]",
21	"dt_dateofbirth":	21	"dt_dateofbirth":
22	"[% data.dateofbirth \| $KohaDates %]",	22	"[% data.dateofbirth \| $KohaDates %]",
23	"dt_category":	23	"dt_category":

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt (-1 / +1 lines)
9	"dt_cardnumber":	9	"dt_cardnumber":
10	"[% data.cardnumber \| html %]",	10	"[% data.cardnumber \| html %]",
11	"dt_name":	11	"dt_name":
12	"<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber \| html %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]</a></span>",	12	"<a href=\"#\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber \| html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]</a>",
13	"dt_category":	13	"dt_category":
14	"[% data.category_description \| html %] ([% data.category_type \| html %])",	14	"[% data.category_description \| html %] ([% data.category_type \| html %])",
15	"dt_branch":	15	"dt_branch":

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt (-2 / +1 lines)
9	"dt_cardnumber":	9	"dt_cardnumber":
10	"[% data.cardnumber \| html %]",	10	"[% data.cardnumber \| html %]",
11	"dt_name":	11	"dt_name":
12	"<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber \| html %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]</a></span>",	12	"<a href=\"#\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber \| html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1 %]</a>",
13	"dt_branch":	13	"dt_branch":
14	"[% data.branchname \| html %]",	14	"[% data.branchname \| html %]",
15	"dt_action":	15	"dt_action":
16	-

Return to bug 18480

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt (+42 lines)
7	<title>Koha &rsaquo; Patron search</title>	7	<title>Koha &rsaquo; Patron search</title>
8	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
9	[% Asset.css("css/datatables.css") \| $raw %]	9	[% Asset.css("css/datatables.css") \| $raw %]
		10	<style> .modal-body .close { display: none; } </style>
10	</head>	11	</head>
11		12
12	<body id="common_patron_search" class="common">	13	<body id="common_patron_search" class="common">
Lines 89-94 Link Here
89		90
90	<div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>	91	<div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>
91		92
		93	<!-- Patron preview modal -->
		94	<div class="modal" id="patronPreview" tabindex="-1" role="dialog" aria-labelledby="patronPreviewLabel">
		95	<div class="modal-dialog" role="document">
		96	<div class="modal-content">
		97	<div class="modal-header">
		98	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
		99	<h4 class="modal-title" id="patronPreviewLabel"></h4>
		100	</div>
		101	<div class="modal-body">
		102	<div id="loading">
		103	<img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading
		104	</div>
		105	<div id="patronPreviewContent">
		106	</div>
		107	</div>
		108	<div class="modal-footer">
		109	<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
		110	</div>
		111	</div>
		112	</div>
		113	</div>
		114
		115	</div>
		116	</div>
		117
92	[% MACRO jsinclude BLOCK %]	118	[% MACRO jsinclude BLOCK %]
93	[% INCLUDE 'datatables.inc' %]	119	[% INCLUDE 'datatables.inc' %]
94		120
Lines 200-205 Link Here
200	select_user( borrowernumber, JSON.parse(borrower_data) );	226	select_user( borrowernumber, JSON.parse(borrower_data) );
201	});	227	});
202		228
		229	$("body").on("click",".patron_preview", function( e ){
		230	e.preventDefault();
		231	var borrowernumber = $(this).data("borrowernumber");
		232	var page = "/cgi-bin/koha/members/moremember.pl?print=brief&borrowernumber=" + borrowernumber;
		233	$("#patronPreviewContent").load( page + " div.container-fluid", function() {
		234	$("#loading").hide();
		235	});
		236
		237	$('#patronPreview').modal({ show:true });
		238	});
		239
		240	$("#patronPreview").on('hidden.bs.modal', function (e) {
		241	$("#patronPreviewContent").html("");
		242	$("#loading").show();
		243	});
		244
203	});	245	});
204		246
205	function filter() {	247	function filter() {