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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt (-1 / +1 lines)
Lines 1-7 Link Here
1
[%# duplicates circ-menu.inc but assumes all borrower attributes are in a borrower variable rather than
1
[%# duplicates circ-menu.inc but assumes all borrower attributes are in a borrower variable rather than
2
in the global namespace %]
2
in the global namespace %]
3
[% IF borrower %]
3
[% IF borrower %]
4
<div class="patroninfo"><h5>[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])</h5>
4
<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
5
<!--[if IE 6]>
5
<!--[if IE 6]>
6
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
6
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
7
}</style>
7
}</style>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-6 / +15 lines)
Lines 1-6 Link Here
1
[% IF category_type == 'I' %]
1
[% IF ( borrower.borrowernumber ) %]
2
    [% surname %] [% IF othernames %] ([% othernames %]) [% END %]
2
    [% IF borrower.category_type == 'I' %]
3
[% ELSE %]
3
        [% borrower.surname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %]
4
    [% firstname %] [% surname %]
4
    [% ELSE %]
5
[% END %]
5
        [% borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %]
6
([% cardnumber %])
6
    [% END %]
7
    ([% borrower.cardnumber %])
8
[% ELSIF ( borrowernumber ) %]
9
    [% IF category_type == 'I' %]
10
        [% surname %] [% IF othernames %] ([% othernames %]) [% END %]
11
    [% ELSE %]
12
        [% firstname %] [% IF othernames %] ([% othernames %]) [% END %] [% surname %]
13
    [% END %]
14
    ([% cardnumber %])
15
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-2 / +2 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Borrowers &rsaquo; Create manual credit</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; [% INCLUDE 'patron-title.inc' %] &rsaquo; Create manual credit</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
4
<script type="text/javascript">
5
//<![CDATA[
5
//<![CDATA[
Lines 13-19 $(document).ready(function(){ Link Here
13
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'header.inc' %]
14
[% INCLUDE 'patron-search.inc' %]
14
[% INCLUDE 'patron-search.inc' %]
15
15
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Manual credit</div>
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% INCLUDE 'patron-title.inc' %]</a> &rsaquo; Manual credit</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div id="doc3" class="yui-t2">
19
   
19
   
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-3 / +3 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Borrowers &rsaquo; Create manual invoice</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; [% INCLUDE 'patron-title.inc' %] &rsaquo; Create manual invoice</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
4
<script type="text/javascript">
5
//<![CDATA[
5
//<![CDATA[
Lines 13-19 $(document).ready(function(){ Link Here
13
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'header.inc' %]
14
[% INCLUDE 'patron-search.inc' %]
14
[% INCLUDE 'patron-search.inc' %]
15
15
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Manual Invoice</div>
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% INCLUDE 'patron-title.inc' %]</a> &rsaquo; Manual invoice</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div id="doc3" class="yui-t2">
19
   
19
   
Lines 39-45 $(document).ready(function(){ Link Here
39
[% ELSE %]
39
[% ELSE %]
40
<form action="/cgi-bin/koha/members/maninvoice.pl" method="post"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
40
<form action="/cgi-bin/koha/members/maninvoice.pl" method="post"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
41
	<fieldset class="rows">
41
	<fieldset class="rows">
42
	<legend>Manual Invoice</legend>
42
    <legend>Manual invoice</legend>
43
	<ol>
43
	<ol>
44
      <li>
44
      <li>
45
<script type="text/javascript">
45
<script type="text/javascript">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (-3 / +3 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Set privileges for [% surname %], [% firstname %]</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; Set privileges for [% INCLUDE 'patron-title.inc' %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/treeview/jquery.treeview.css"/>
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/treeview/jquery.treeview.css"/>
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.treeview.pack.js"></script>
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.treeview.pack.js"></script>
Lines 72-78 Link Here
72
[% INCLUDE 'header.inc' %]
72
[% INCLUDE 'header.inc' %]
73
[% INCLUDE 'patron-search.inc' %]
73
[% INCLUDE 'patron-search.inc' %]
74
74
75
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set privileges for [% surname %], [% firstname %]</div>
75
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set privileges for [% INCLUDE 'patron-title.inc' %]</div>
76
76
77
<div id="doc3" class="yui-t2">
77
<div id="doc3" class="yui-t2">
78
   
78
   
Lines 84-90 Link Here
84
<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
84
<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
85
    <input type="hidden" name="member" id="borrowernumber" value="[% borrowernumber %]" />
85
    <input type="hidden" name="member" id="borrowernumber" value="[% borrowernumber %]" />
86
    <input type="hidden" name="newflags" value="1" />
86
    <input type="hidden" name="newflags" value="1" />
87
    <h1>Set Privileges for [% surname %], [% firstname %]</h1>
87
    <h1>Set Privileges for [% INCLUDE 'patron-title.inc' %]</h1>
88
    <!-- <ul id="permissionstree"><li class="root">All privileges<ul> -->
88
    <!-- <ul id="permissionstree"><li class="root">All privileges<ul> -->
89
    <ul id="permissionstree" class="treeview-grey">
89
    <ul id="permissionstree" class="treeview-grey">
90
        <!-- <li class="folder-close">One level down<ul> -->
90
        <!-- <li class="folder-close">One level down<ul> -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-3 / +1 lines)
Lines 9-21 Link Here
9
<div id="custom-doc" class="yui-t7">
9
<div id="custom-doc" class="yui-t7">
10
   <div id="bd">
10
   <div id="bd">
11
	<h3>[% UNLESS ( I ) %]
11
	<h3>[% UNLESS ( I ) %]
12
   [% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
12
   [% INCLUDE 'patron-title.inc' %]</h3>
13
<div class="yui-g">
13
<div class="yui-g">
14
<div class="yui-u first">
14
<div class="yui-u first">
15
	<div id="patron-information" style="padding: .5em;">
15
	<div id="patron-information" style="padding: .5em;">
16
16
17
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
18
19
	<p class="address">[% streetnumber %]
17
	<p class="address">[% streetnumber %]
20
        [% IF ( roaddetails ) %]
18
        [% IF ( roaddetails ) %]
21
         [% roaddetails %]
19
         [% roaddetails %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-2 / +2 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
2
<title>Summary for [% INCLUDE 'patron-title.inc' %]</title>
3
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
4
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
5
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
5
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
Lines 16-22 Link Here
16
16
17
<div id="main">
17
<div id="main">
18
18
19
<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
19
<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% INCLUDE 'patron-title.inc' %]</a></h3>
20
20
21
<ul><li>[% address %]<br />[% address2 %]</li><li>[% city %], [% zipcode %]</li>
21
<ul><li>[% address %]<br />[% address2 %]</li><li>[% city %], [% zipcode %]</li>
22
<li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li>
22
<li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt (-1 / +1 lines)
Lines 17-23 Link Here
17
17
18
<h3>[% LibraryName %]</h3>
18
<h3>[% LibraryName %]</h3>
19
[% IF ( branchname ) %][% branchname %]<br />[% END %]
19
[% IF ( branchname ) %][% branchname %]<br />[% END %]
20
Checked out to [% firstname %] [% surname %] <br />
20
Checked out to [% INCLUDE 'patron-title.inc' %] <br />
21
(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">[% cardnumber %]</a>)<br />
21
(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">[% cardnumber %]</a>)<br />
22
22
23
[% todaysdate %]<br />
23
[% todaysdate %]<br />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-3 / +2 lines)
Lines 180-191 function validate1(date) { Link Here
180
    </ul>
180
    </ul>
181
    [% END %]
181
    [% END %]
182
182
183
<h3>[% UNLESS ( I ) %]
183
<h3>[% INCLUDE 'patron-title.inc' %]</h3>
184
   [% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
185
 <div class="yui-u first">
184
 <div class="yui-u first">
186
<div id="patron-information" style="padding : .5em;">
185
<div id="patron-information" style="padding : .5em;">
187
186
188
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
187
     [% UNLESS ( I ) %]
189
188
190
<p class="address">[% streetnumber %]
189
<p class="address">[% streetnumber %]
191
        [% IF ( roaddetails ) %]
190
        [% IF ( roaddetails ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-2 / +2 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% borrower.firstname %] [% borrower.surname %]</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; Pay fines for  [% INCLUDE 'patron-title.inc' %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type= "text/javascript">
4
<script type= "text/javascript">
5
//<![CDATA[
5
//<![CDATA[
Lines 18-24 Link Here
18
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'header.inc' %]
19
[% INCLUDE 'patron-search.inc' %]
19
[% INCLUDE 'patron-search.inc' %]
20
20
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay fines for [% borrower.firstname %] [% borrower.surname %]</div>
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay fines for [% INCLUDE 'patron-title.inc' %]</div>
22
22
23
<div id="doc3" class="yui-t2">
23
<div id="doc3" class="yui-t2">
24
   
24
   
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-2 / +2 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% borrower.firstname %] [% borrower.surname %]</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% INCLUDE 'patron-title.inc' %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type= "text/javascript">
4
<script type= "text/javascript">
5
//<![CDATA[
5
//<![CDATA[
Lines 57-63 function moneyFormat(textObj) { Link Here
57
<body id="pat_paycollect" class="pat">
57
<body id="pat_paycollect" class="pat">
58
[% INCLUDE 'header.inc' %]
58
[% INCLUDE 'header.inc' %]
59
[% INCLUDE 'patron-search.inc' %]
59
[% INCLUDE 'patron-search.inc' %]
60
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Pay fines for [% borrower.firstname %] [% borrower.surname %]</a> &rsaquo; [% IF ( pay_individual ) %]Pay an individual fine[% ELSIF ( writeoff_individual ) %]Write off an individual fine[% ELSE %][% IF ( selected_accts ) %]Pay an amount toward selected fines[% ELSE %]Pay an amount toward all fines[% END %][% END %]</div>
60
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Pay fines for [% INCLUDE 'patron-title.inc' %]</a> &rsaquo; [% IF ( pay_individual ) %]Pay an individual fine[% ELSIF ( writeoff_individual ) %]Write off an individual fine[% ELSE %][% IF ( selected_accts ) %]Pay an amount toward selected fines[% ELSE %]Pay an amount toward all fines[% END %][% END %]</div>
61
61
62
<div id="doc3" class="yui-t2">
62
<div id="doc3" class="yui-t2">
63
63
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-2 / +2 lines)
Lines 1-12 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %]</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
</head>
4
</head>
5
<body>
5
<body>
6
[% INCLUDE 'header.inc' %]
6
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'patron-search.inc' %]
7
[% INCLUDE 'patron-search.inc' %]
8
8
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %]</div>
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</div>
10
10
11
<div id="doc3" class="yui-t2">
11
<div id="doc3" class="yui-t2">
12
    <div id="bd">
12
    <div id="bd">
(-)a/members/mancredit.pl (+1 lines)
Lines 91-96 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
91
        borrowernumber => $borrowernumber,
91
        borrowernumber => $borrowernumber,
92
        firstname => $data->{'firstname'},
92
        firstname => $data->{'firstname'},
93
        surname  => $data->{'surname'},
93
        surname  => $data->{'surname'},
94
        othernames => $data->{'othernames'},
94
		    cardnumber => $data->{'cardnumber'},
95
		    cardnumber => $data->{'cardnumber'},
95
		    categorycode => $data->{'categorycode'},
96
		    categorycode => $data->{'categorycode'},
96
		    category_type => $data->{'category_type'},
97
		    category_type => $data->{'category_type'},
(-)a/members/maninvoice.pl (+1 lines)
Lines 118-123 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
118
                borrowernumber => $borrowernumber,
118
                borrowernumber => $borrowernumber,
119
		firstname => $data->{'firstname'},
119
		firstname => $data->{'firstname'},
120
                surname  => $data->{'surname'},
120
                surname  => $data->{'surname'},
121
        othernames => $data->{'othernames'},
121
		cardnumber => $data->{'cardnumber'},
122
		cardnumber => $data->{'cardnumber'},
122
		categorycode => $data->{'categorycode'},
123
		categorycode => $data->{'categorycode'},
123
		category_type => $data->{'category_type'},
124
		category_type => $data->{'category_type'},
(-)a/members/member-flags.pl (+1 lines)
Lines 176-181 $template->param( Link Here
176
    cardnumber => $bor->{'cardnumber'},
176
    cardnumber => $bor->{'cardnumber'},
177
		surname => $bor->{'surname'},
177
		surname => $bor->{'surname'},
178
		firstname => $bor->{'firstname'},
178
		firstname => $bor->{'firstname'},
179
        othernames => $bor->{'othernames'},
179
		categorycode => $bor->{'categorycode'},
180
		categorycode => $bor->{'categorycode'},
180
		category_type => $bor->{'category_type'},
181
		category_type => $bor->{'category_type'},
181
		categoryname => $bor->{'description'},
182
		categoryname => $bor->{'description'},
(-)a/members/routing-lists.pl (-1 / +1 lines)
Lines 113-118 $template->param( Link Here
113
    branchname        => GetBranchName($borrower->{'branchcode'}),
113
    branchname        => GetBranchName($borrower->{'branchcode'}),
114
    firstname         => $borrower->{'firstname'},
114
    firstname         => $borrower->{'firstname'},
115
    surname           => $borrower->{'surname'},
115
    surname           => $borrower->{'surname'},
116
    othernames        => $borrower->{'othernames'},
116
    categorycode      => $borrower->{'categorycode'},
117
    categorycode      => $borrower->{'categorycode'},
117
    categoryname      => $borrower->{description},
118
    categoryname      => $borrower->{description},
118
    address           => $address,
119
    address           => $address,
119
- 

Return to bug 2930