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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt (-2 / +4 lines)
Lines 5-10 Link Here
5
[%- USE AuthorisedValues -%]
5
[%- USE AuthorisedValues -%]
6
[%- USE Branches -%]
6
[%- USE Branches -%]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
8
[% PROCESS 'accounts.inc' %]
11
[% PROCESS 'accounts.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
10
<title>Details of [% IF type == 'credit' %]credit[% ELSE %]debit[% END %] &rsaquo; [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
13
<title>Details of [% IF type == 'credit' %]credit[% ELSE %]debit[% END %] &rsaquo; [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
Lines 12-19 Link Here
12
</head>
15
</head>
13
16
14
<body id="pat_accountline_details" class="pat">
17
<body id="pat_accountline_details" class="pat">
15
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'header.inc' form=formulaire %]
16
[% INCLUDE 'patron-search-header.inc' %]
17
19
18
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
    <ol>
21
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt (-2 / +4 lines)
Lines 2-14 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Asset %]
3
[% USE Asset %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% formulaire = BLOCK %]
6
    [% INCLUDE 'patron-search-header.inc' %]
7
[% END %]
5
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
6
<title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>
9
<title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>
7
[% INCLUDE 'doc-head-close.inc' %]
10
[% INCLUDE 'doc-head-close.inc' %]
8
</head>
11
</head>
9
<body id="pat_apikeys" class="pat">
12
<body id="pat_apikeys" class="pat">
10
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'header.inc' form=formulaire %]
11
[% INCLUDE 'patron-search-header.inc' %]
12
14
13
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14
    <ol>
16
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-2 / +4 lines)
Lines 9-14 Link Here
9
[% USE Branches %]
9
[% USE Branches %]
10
[% USE Registers %]
10
[% USE Registers %]
11
[% SET footerjs = 1 %]
11
[% SET footerjs = 1 %]
12
[% formulaire = BLOCK %]
13
    [% INCLUDE 'patron-search-header.inc' %]
14
[% END %]
12
[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
15
[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
13
16
14
[% PROCESS 'accounts.inc' %]
17
[% PROCESS 'accounts.inc' %]
Lines 19-26 Link Here
19
</head>
22
</head>
20
23
21
<body id="pat_borraccount" class="pat">
24
<body id="pat_borraccount" class="pat">
22
[% INCLUDE 'header.inc' %]
25
[% INCLUDE 'header.inc' form=formulaire %]
23
[% INCLUDE 'patron-search-header.inc' %]
24
26
25
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
27
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26
    <ol>
28
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt (-2 / +4 lines)
Lines 3-15 Link Here
3
[% USE Price %]
3
[% USE Price %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'patron-search-header.inc' %]
8
[% END %]
6
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Delete patron [% patron.firstname | html %] [% patron.surname | html %] &rsaquo; Koha</title>
10
<title>Delete patron [% patron.firstname | html %] [% patron.surname | html %] &rsaquo; Koha</title>
8
[% INCLUDE 'doc-head-close.inc' %]
11
[% INCLUDE 'doc-head-close.inc' %]
9
</head>
12
</head>
10
<body id="pat_deletemem" class="pat">
13
<body id="pat_deletemem" class="pat">
11
[% INCLUDE 'header.inc' %]
14
[% INCLUDE 'header.inc' form=formulaire %]
12
[% INCLUDE 'patron-search-header.inc' %]
13
15
14
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15
    <ol>
17
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (-2 / +4 lines)
Lines 4-16 Link Here
4
[% USE AuthorisedValues %]
4
[% USE AuthorisedValues %]
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
7
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
8
<title>[% UNLESS blocking_error  %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>
11
<title>[% UNLESS blocking_error  %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>
9
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
10
</head>
13
</head>
11
<body id="discharge" class="discharge">
14
<body id="discharge" class="discharge">
12
[% INCLUDE 'header.inc' %]
15
[% INCLUDE 'header.inc' form=formulaire %]
13
[% INCLUDE 'patron-search-header.inc' %]
14
16
15
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16
    <ol>
18
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt (+3 lines)
Lines 9-15 Link Here
9
</head>
9
</head>
10
<body id="pat_discharges" class="pat">
10
<body id="pat_discharges" class="pat">
11
[% INCLUDE 'header.inc' %]
11
[% INCLUDE 'header.inc' %]
12
<<<<<<< HEAD
12
[% INCLUDE 'patron-search-header.inc' %]
13
[% INCLUDE 'patron-search-header.inc' %]
14
=======
15
>>>>>>> Bug 30952: Patrons Module
13
16
14
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15
    <ol>
18
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt (-2 / +4 lines)
Lines 4-17 Link Here
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE AuthorisedValues %]
5
[% USE AuthorisedValues %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
7
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
11
<title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
9
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
10
</head>
13
</head>
11
14
12
<body id="pat_files" class="pat">
15
<body id="pat_files" class="pat">
13
[% INCLUDE 'header.inc' %]
16
[% INCLUDE 'header.inc' form=formulaire %]
14
[% INCLUDE 'patron-search-header.inc' %]
15
17
16
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17
    <ol>
19
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt (-2 / +4 lines)
Lines 7-20 Link Here
7
[% USE TablesSettings %]
7
[% USE TablesSettings %]
8
[% USE ItemTypes %]
8
[% USE ItemTypes %]
9
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
10
[% formulaire = BLOCK %]
11
    [% INCLUDE 'patron-search-header.inc.inc' %]
12
[% END %]
10
[% INCLUDE 'doc-head-open.inc' %]
13
[% INCLUDE 'doc-head-open.inc' %]
11
<title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
14
<title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
12
[% INCLUDE 'doc-head-close.inc' %]
15
[% INCLUDE 'doc-head-close.inc' %]
13
</head>
16
</head>
14
17
15
<body id="pat_holdshistory" class="pat">
18
<body id="pat_holdshistory" class="pat">
16
[% INCLUDE 'header.inc' %]
19
[% INCLUDE 'header.inc' form= formulaire %]
17
[% INCLUDE 'patron-search-header.inc' %]
18
20
19
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20
    <ol>
22
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-2 / +4 lines)
Lines 5-18 Link Here
5
[% USE AuthorisedValues %]
5
[% USE AuthorisedValues %]
6
[% USE Branches %]
6
[% USE Branches %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search-header.inc.inc' %]
10
[% END %]
8
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>
12
<title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>
10
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
11
</head>
14
</head>
12
15
13
<body id="housebound-home" class="housebound">
16
<body id="housebound-home" class="housebound">
14
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'header.inc' form= formulaire %]
15
[% INCLUDE 'patron-search-header.inc' %]
16
18
17
[% BLOCK 'homebound-details' %]
19
[% BLOCK 'homebound-details' %]
18
    <div class="rows">
20
    <div class="rows">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt (-2 / +4 lines)
Lines 4-9 Link Here
4
[% USE Koha %]
4
[% USE Koha %]
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search-header.inc.inc' %]
9
[% END %]
7
[% USE AuthorisedValues %]
10
[% USE AuthorisedValues %]
8
[% USE TablesSettings %]
11
[% USE TablesSettings %]
9
12
Lines 13-20 Link Here
13
</head>
16
</head>
14
17
15
<body id="pat_illrequestshistory" class="pat">
18
<body id="pat_illrequestshistory" class="pat">
16
    [% INCLUDE 'header.inc' %]
19
    [% INCLUDE 'header.inc' form= formulaire %]
17
    [% INCLUDE 'patron-search-header.inc' %]
18
20
19
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20
        <ol>
22
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-2 / +4 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'patron-search-header.inc.inc' %]
8
[% END %]
6
9
7
[% PROCESS 'accounts.inc' %]
10
[% PROCESS 'accounts.inc' %]
8
11
Lines 12-19 Link Here
12
</head>
15
</head>
13
16
14
<body id="pat_mancredit" class="pat">
17
<body id="pat_mancredit" class="pat">
15
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'header.inc' form= formulaire %]
16
[% INCLUDE 'patron-search-header.inc' %]
17
19
18
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
    <ol>
21
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-2 / +4 lines)
Lines 4-9 Link Here
4
[% USE Price %]
4
[% USE Price %]
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search-header.inc.inc' %]
9
[% END %]
7
10
8
[% PROCESS 'accounts.inc' %]
11
[% PROCESS 'accounts.inc' %]
9
12
Lines 13-20 Link Here
13
</head>
16
</head>
14
17
15
<body id="pat_maninvoice" class="pat">
18
<body id="pat_maninvoice" class="pat">
16
[% INCLUDE 'header.inc' %]
19
[% INCLUDE 'header.inc' form= formulaire %]
17
[% INCLUDE 'patron-search-header.inc' %]
18
20
19
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20
    <ol>
22
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (-2 / +4 lines)
Lines 2-7 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% formulaire = BLOCK %]
6
    [% INCLUDE 'patron-search-header.inc' %]
7
[% END %]
5
[% PROCESS 'permissions.inc' %]
8
[% PROCESS 'permissions.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
7
<title>
10
<title>
Lines 11-18 Link Here
11
</head>
14
</head>
12
15
13
<body id="pat_member-flags" class="pat">
16
<body id="pat_member-flags" class="pat">
14
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'header.inc' form=formulaire %]
15
[% INCLUDE 'patron-search-header.inc' %]
16
18
17
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18
    <ol>
20
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-2 / +4 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'patron-search-header.inc' %]
8
[% END %]
6
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
7
<title>
10
<title>
8
    [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname | html %], [% patron.firstname | html %][% END %] &rsaquo; Patrons &rsaquo; Koha
11
    [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname | html %], [% patron.firstname | html %][% END %] &rsaquo; Patrons &rsaquo; Koha
Lines 11-18 Link Here
11
</head>
14
</head>
12
15
13
<body id="pat_member-password" class="pat">
16
<body id="pat_member-password" class="pat">
14
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'header.inc' form=formulaire %]
15
[% INCLUDE 'patron-search-header.inc' %]
16
18
17
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18
    <ol>
20
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-43 / +112 lines)
Lines 5-10 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% USE Categories %]
6
[% USE Categories %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search-header.inc.inc' %]
10
[% END %]
8
[% PROCESS 'patronfields.inc' %]
11
[% PROCESS 'patronfields.inc' %]
9
[% SET libraries = Branches.all %]
12
[% SET libraries = Branches.all %]
10
[% SET categories = Categories.all.unblessed %]
13
[% SET categories = Categories.all.unblessed %]
Lines 15-23 Link Here
15
[% INCLUDE 'doc-head-close.inc' %]
18
[% INCLUDE 'doc-head-close.inc' %]
16
</head>
19
</head>
17
20
18
<body id="pat_member" class="pat">
21
<body id="pat_member">
19
[% INCLUDE 'header.inc' %]
22
[% INCLUDE 'header.inc' form= formulaire %]
20
[% INCLUDE 'patron-search-header.inc' %]
21
23
22
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
24
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
23
    <ol>
25
    <ol>
Lines 41-46 Link Here
41
            </li>
43
            </li>
42
        [% END %]
44
        [% END %]
43
    </ol>
45
    </ol>
46
47
    <ol>
48
        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
49
    </ol>
50
51
    <ol>
52
        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
53
    </ol>
44
</nav>
54
</nav>
45
55
46
<div class="main container-fluid">
56
<div class="main container-fluid">
Lines 65-99 Link Here
65
          [% END %]
75
          [% END %]
66
76
67
          <div id="searchresults">
77
          <div id="searchresults">
78
<<<<<<< HEAD
79
=======
80
            <h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember | html %]'[% END %]</span></h3>
81
82
83
>>>>>>> Bug 30952: Patrons Module
68
            [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
84
            [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
69
              <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
85
              <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
70
                  <div>
86
                  <div>
71
                      <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a>
87
                      <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a>
72
                      |
73
                      <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
88
                      <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
74
                    [% IF CAN_user_tools_manage_patron_lists %]
89
                    [% IF CAN_user_tools_manage_patron_lists %]
75
90
76
                    [% END %]
91
                    [% END %]
77
92
78
                    [% IF CAN_user_tools_manage_patron_lists %]
93
                    [% IF CAN_user_tools_manage_patron_lists %]
79
                        <div id="patronlist-dropdown" class="btn-group">
94
                        Add selected patrons to:
80
                            <button id="patronlist-menu" type="button" class="btn btn-sm btn-default dropdown-toggle patron-edits disabled" disabled="disabled" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
95
                        <select name="searchfieldstype" id="searchfieldstype_filter">
81
                                Add to patron list <span class="caret"></span>
96
                            <option selected="selected" value=""> [New list] </option>
82
                            </button>
97
                            [% IF patron_lists %]
83
                            <ul class="dropdown-menu">
98
                                [% FOREACH pl IN patron_lists %]
84
                                [% IF patron_lists %]
99
                                    <option>[% pl.name | html %]</option>
85
                                    [% FOREACH pl IN patron_lists %]
86
                                        <li><a href="#" class="patron-list-add" data-listid="[% pl.patron_list_id | html %]">[% pl.name | html %]</a></li>
87
                                    [% END %]
88
                                [% END %]
100
                                [% END %]
89
                                <li role="separator" class="divider"></li>
101
                            [% END %]
90
                                <li><a href="#" class="patron-list-add" data-listid="new">New list</a></li>
102
                        </select>
91
                            </ul>
103
92
                        </div>
104
                         <input type="text" name="new_list_name" id="mini_inp"/>
105
106
                        <button type="submit" id="add_to_patron_list_submit" class="btn btn-link">Save</button>
107
108
93
                    [% END %]
109
                    [% END %]
94
110
95
                    [% IF CAN_user_borrowers_edit_borrowers %]
111
                    [% IF CAN_user_borrowers_edit_borrowers %]
96
                          <button id="merge-patrons" class="btn btn-sm btn-default disabled" disabled="disabled" type="submit"><i class="fa fa-compress" aria-hidden="true"></i> Merge selected patrons</button>
112
                          | <button id="merge-patrons" class="btn btn-sm btn-default disabled" disabled="disabled" type="submit"><i class="fa fa-compress" aria-hidden="true"></i> Merge selected patrons</button>
97
                    [% END %]
113
                    [% END %]
98
                  </div>
114
                  </div>
99
                </div>
115
                </div>
Lines 110-145 Link Here
110
126
111
        <div class="col-sm-2 col-sm-pull-10">
127
        <div class="col-sm-2 col-sm-pull-10">
112
            <aside>
128
            <aside>
129
<<<<<<< HEAD
113
                [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['search_field', 'search_type', 'category', 'branch'], search_filter => searchmember %]
130
                [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['search_field', 'search_type', 'category', 'branch'], search_filter => searchmember %]
131
=======
132
                <div id="filters">
133
                    <form method="get" id="searchform">
134
                        <input type="hidden" id="firstletter_filter" value="" />
135
                        <fieldset class="brief">
136
                            <h4>Search patrons</h4>
137
138
                            <fieldset>
139
                                <ol>
140
                                    <li>
141
                                        <p>Search:
142
                                        <input type="text" id="searchmember_filter" value="[% searchmember | html %]"/></p>
143
                                    </li>
144
                                    <li>
145
                                        <p>Search field:
146
                                        <select name="searchfieldstype" id="searchfieldstype_filter">
147
                                            [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %]
148
                                            [% default_fields = [ 'standard', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
149
                                            [% search_options = default_fields.merge(pref_fields).unique %]
150
                                            [% FOREACH s_o IN search_options %]
151
                                                [% display_name = PROCESS patron_fields name=s_o %]
152
                                                [% NEXT IF !display_name %]
153
                                                [% IF searchfieldstype == s_o %]
154
                                                    <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option>
155
                                                [% ELSE %]
156
                                                    <option value=[% s_o | html %]>[% display_name | $raw %]</option>
157
                                                [% END %]
158
                                            [% END %]
159
                                        </select></p>
160
                                    </li>
161
                                    <li>
162
                                        <p>Search type:
163
                                        <select name="searchtype" id="searchtype_filter">
164
                                        [% IF searchtype == "start_with" %]
165
                                            <option value='start_with' selected="selected">Starts with</option>
166
                                            <option value="contain">Contains</option>
167
                                        [% ELSE %]
168
                                            <option value='start_with'>Starts with</option>
169
                                            <option value="contain" selected="selected">Contains</option>
170
                                        [% END %]
171
                                        </select></p>
172
                                    </li>
173
                                    <li>
174
                                        <p>Patron category:
175
                                        [% SET categories = Categories.all() %]
176
                                        <select id="categorycode_filter">
177
                                        <option value="">Any</option>
178
                                        [% FOREACH cat IN categories %]
179
                                            [% IF cat.categorycode == categorycode_filter %]
180
                                    <option selected="selected" value="[% cat.categorycode | html %]">[% cat.description | html %]</option>
181
                                            [% ELSE %]
182
                                    <option value="[% cat.categorycode | html %]">[% cat.description | html %]</option>
183
184
                                            [% END %]
185
                                        [% END %]
186
                                        </select></p>
187
                                    </li>
188
                                    <li>
189
                                        <p>Library:
190
                                        [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
191
                                        <select id="branchcode_filter">
192
                                        [% IF branches.size != 1 %]
193
                                            <option value="">Any</option>
194
                                        [% END %]
195
                                        [% PROCESS options_for_libraries libraries => branches %]
196
                                        </select></p>
197
                                    </li>
198
                                </ol>
199
                                <ol>
200
                                    <button class="submit" id="principal" type="submit">Search</button>
201
                                    <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
202
                                </ol>
203
                            </fieldset>
204
                        </fieldset>
205
                    </form>
206
                </div>
207
>>>>>>> Bug 30952: Patrons Module
114
            </aside>
208
            </aside>
115
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
209
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
116
    </div> <!-- /.row -->
210
    </div> <!-- /.row -->
117
211
118
    <!-- New Patron List Modal -->
119
    <div class="modal" id="new-patron-list" tabindex="-1" role="dialog" aria-labelledby="new-patron-listLabel">
120
        <div class="modal-dialog" role="document">
121
            <div class="modal-content">
122
                <div class="modal-header">
123
                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
124
                    <h4 class="modal-title" id="new-patron-listLabel">Add patrons to a new patron list</h4>
125
                </div>
126
                <form id="new-patron-list_form">
127
                    <div class="modal-body">
128
                        <div class="form-group">
129
                            <label for="new_patron_list" class="required">Patron list name: </label>
130
                            <input class="form-control required" type="text" name="new_patron_list" id="new_patron_list" required="required" />
131
                            <input type="hidden" name="add_to_patron_list" id="add_to_patron_list" />
132
                            <span class="required">Required</span>
133
                        </div>
134
                    </div> <!-- /.modal-body -->
135
                    <div class="modal-footer">
136
                        <button type="submit" id="add_to_patron_list_submit" class="btn btn-default approve">Submit</button>
137
                        <button type="button" class="btn btn-default deny" data-dismiss="modal">Cancel</button>
138
                    </div> <!-- /.modal-footer -->
139
                </form> <!-- /#new-patron-list_form -->
140
            </div> <!-- /.modal-content -->
141
        </div> <!-- /.modal-dialog -->
142
    </div> <!-- /#new-patron-list -->
143
212
144
[% MACRO jsinclude BLOCK %]
213
[% MACRO jsinclude BLOCK %]
145
    [% INCLUDE 'datatables.inc' %]
214
    [% INCLUDE 'datatables.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-5 / +13 lines)
Lines 9-14 Link Here
9
[% PROCESS 'member-alt-address-style.inc' %]
9
[% PROCESS 'member-alt-address-style.inc' %]
10
[% PROCESS 'member-alt-contact-style.inc' %]
10
[% PROCESS 'member-alt-contact-style.inc' %]
11
[% SET footerjs = 1 %]
11
[% SET footerjs = 1 %]
12
[% formulaire = BLOCK %]
13
    [% INCLUDE 'patron-search-header.inc' %]
14
[% END %]
12
[% INCLUDE 'doc-head-open.inc' %]
15
[% INCLUDE 'doc-head-open.inc' %]
13
    <title>
16
    <title>
14
        [% UNLESS blocking_error %]
17
        [% UNLESS blocking_error %]
Lines 31-39 legend:hover { Link Here
31
[% INCLUDE 'doc-head-close.inc' %]
34
[% INCLUDE 'doc-head-close.inc' %]
32
</head>
35
</head>
33
36
34
<body id="pat_memberentrygen" class="pat">
37
<body id="pat_memberentrygen"s>
35
    [% INCLUDE 'header.inc' %]
38
    [% INCLUDE 'header.inc' form=formulaire %]
36
    [% INCLUDE 'patron-search-header.inc' %]
37
39
38
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
40
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
39
        <ol>
41
        <ol>
Lines 72-77 legend:hover { Link Here
72
                </li>
74
                </li>
73
            [% END %]
75
            [% END %]
74
        </ol>
76
        </ol>
77
        <ol>
78
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
79
        </ol>
80
        <ol>
81
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
82
        </ol>
75
    </nav> <!-- /#breadcrumbs -->
83
    </nav> <!-- /#breadcrumbs -->
76
84
77
    <div class="main container-fluid">
85
    <div class="main container-fluid">
Lines 223-231 legend:hover { Link Here
223
                        [% UNLESS ( check_member ) %]
231
                        [% UNLESS ( check_member ) %]
224
                            <div id="toolbar" class="btn-toolbar">
232
                            <div id="toolbar" class="btn-toolbar">
225
                                [% IF quickadd && opadd %]
233
                                [% IF quickadd && opadd %]
226
                                    <button class="btn btn-default toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
234
                                    <button class="btn btn-default toggler principal" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
227
                                [% END %]
235
                                [% END %]
228
                                <button class="btn btn-default toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
236
                                <button class="btn btn-default toggler principal" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
229
                                [% IF opadd %]
237
                                [% IF opadd %]
230
                                    <a class="btn btn-default" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
238
                                    <a class="btn btn-default" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
231
                                [% ELSE %]
239
                                [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt (-2 / +4 lines)
Lines 5-18 Link Here
5
[% USE Categories %]
5
[% USE Categories %]
6
[% USE KohaDates %]
6
[% USE KohaDates %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
8
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Update patron records &rsaquo; Patrons &rsaquo; Koha</title>
12
<title>Update patron records &rsaquo; Patrons &rsaquo; Koha</title>
10
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
11
</head>
14
</head>
12
15
13
<body id="pat_update" class="pat">
16
<body id="pat_update" class="pat">
14
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'header.inc' form=formulaire %]
15
[% INCLUDE 'patron-search-header.inc' %]
16
18
17
[% BLOCK display_names %]
19
[% BLOCK display_names %]
18
[% SWITCH field %]
20
[% SWITCH field %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-2 / +4 lines)
Lines 4-9 Link Here
4
[% USE Categories %]
4
[% USE Categories %]
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
7
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>
11
<title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>
9
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
Lines 46-53 Link Here
46
[% END %]
49
[% END %]
47
</head>
50
</head>
48
<body id="pat_merge" class="pat">
51
<body id="pat_merge" class="pat">
49
[% INCLUDE 'header.inc' %]
52
[% INCLUDE 'header.inc' form=formulaire %]
50
[% INCLUDE 'patron-search-header.inc' %]
51
53
52
[% BLOCK display_names %]
54
[% BLOCK display_names %]
53
    [% SWITCH rs %]
55
    [% SWITCH rs %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-3 / +11 lines)
Lines 11-16 Link Here
11
[% PROCESS 'member-display-address-style.inc' %]
11
[% PROCESS 'member-display-address-style.inc' %]
12
[% PROCESS 'member-display-alt-address-style.inc' %]
12
[% PROCESS 'member-display-alt-address-style.inc' %]
13
[% SET footerjs = 1 %]
13
[% SET footerjs = 1 %]
14
[% formulaire = BLOCK %]
15
    [% INCLUDE 'patron-search-header.inc' %]
16
[% END %]
14
[% INCLUDE 'doc-head-open.inc' %]
17
[% INCLUDE 'doc-head-open.inc' %]
15
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
18
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
16
<title>
19
<title>
Lines 21-29 Link Here
21
[% INCLUDE 'doc-head-close.inc' %]
24
[% INCLUDE 'doc-head-close.inc' %]
22
</head>
25
</head>
23
26
24
<body id="pat_moremember" class="pat">
27
<body id="pat_moremember">
25
    [% INCLUDE 'header.inc' %]
28
    [% INCLUDE 'header.inc' form=formulaire %]
26
    [% INCLUDE 'patron-search-header.inc' %]
27
29
28
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
30
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
29
        <ol>
31
        <ol>
Lines 48-53 Link Here
48
                </li>
50
                </li>
49
            [% END %]
51
            [% END %]
50
        </ol>
52
        </ol>
53
        <ol>
54
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
55
        </ol>
56
        <ol>
57
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
58
        </ol>
51
    </nav>
59
    </nav>
52
60
53
    <div class="main container-fluid">
61
    <div class="main container-fluid">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-2 / +4 lines)
Lines 5-10 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% USE KohaDates %]
6
[% USE KohaDates %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
8
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
12
<title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
10
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
Lines 14-21 Link Here
14
</head>
17
</head>
15
18
16
<body id="pat_notices" class="pat">
19
<body id="pat_notices" class="pat">
17
    [% INCLUDE 'header.inc' %]
20
    [% INCLUDE 'header.inc' form=formulaire %]
18
    [% INCLUDE 'patron-search-header.inc' %]
19
21
20
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21
        <ol>
23
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-2 / +4 lines)
Lines 7-12 Link Here
7
[% USE TablesSettings %]
7
[% USE TablesSettings %]
8
[% USE KohaDates %]
8
[% USE KohaDates %]
9
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
10
[% formulaire = BLOCK %]
11
    [% INCLUDE 'patron-search-header.inc' %]
12
[% END %]
10
[% PROCESS 'accounts.inc' %]
13
[% PROCESS 'accounts.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
14
[% INCLUDE 'doc-head-open.inc' %]
12
<title>Make a payment for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
15
<title>Make a payment for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
Lines 14-21 Link Here
14
</head>
17
</head>
15
18
16
<body id="pat_pay" class="pat">
19
<body id="pat_pay" class="pat">
17
[% INCLUDE 'header.inc' %]
20
[% INCLUDE 'header.inc' form=formulaire %]
18
[% INCLUDE 'patron-search-header.inc' %]
19
21
20
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21
    <ol>
23
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-2 / +4 lines)
Lines 5-10 Link Here
5
[% USE Registers %]
5
[% USE Registers %]
6
[% USE Price %]
6
[% USE Price %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
8
[% PROCESS 'accounts.inc' %]
11
[% PROCESS 'accounts.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
10
[% BLOCK cash_register_required %]
13
[% BLOCK cash_register_required %]
Lines 32-39 Link Here
32
</head>
35
</head>
33
36
34
<body id="pat_paycollect" class="pat">
37
<body id="pat_paycollect" class="pat">
35
[% INCLUDE 'header.inc' %]
38
[% INCLUDE 'header.inc'  form=formulaire %]
36
[% INCLUDE 'patron-search-header.inc' %]
37
39
38
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
40
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
39
    <ol>
41
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-2 / +4 lines)
Lines 5-18 Link Here
5
[% USE AuthorisedValues  %]
5
[% USE AuthorisedValues  %]
6
[% USE Branches %]
6
[% USE Branches %]
7
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
8
[% formulaire = BLOCK %]
9
    [% INCLUDE 'patron-search-header.inc' %]
10
[% END %]
8
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
12
<title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
10
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
11
</head>
14
</head>
12
15
13
<body id="pat_purchase_suggestions" class="pat">
16
<body id="pat_purchase_suggestions" class="pat">
14
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'header.inc' form=formulaire %]
15
[% INCLUDE 'patron-search-header.inc' %]
16
18
17
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18
    <ol>
20
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-2 / +4 lines)
Lines 6-19 Link Here
6
[% USE Branches %]
6
[% USE Branches %]
7
[% USE TablesSettings %]
7
[% USE TablesSettings %]
8
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
9
[% formulaire = BLOCK %]
10
    [% INCLUDE 'patron-search-header.inc' %]
11
[% END %]
9
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
10
<title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
13
<title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
11
[% INCLUDE 'doc-head-close.inc' %]
14
[% INCLUDE 'doc-head-close.inc' %]
12
</head>
15
</head>
13
16
14
<body id="pat_readingrec" class="pat">
17
<body id="pat_readingrec" class="pat">
15
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'header.inc' form=formulaire %]
16
[% INCLUDE 'patron-search-header.inc' %]
17
19
18
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19
    <ol>
21
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-2 / +4 lines)
Lines 4-17 Link Here
4
[% USE AuthorisedValues %]
4
[% USE AuthorisedValues %]
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
7
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
11
<title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
9
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
10
</head>
13
</head>
11
14
12
<body id="pat_routing_lists" class="pat">
15
<body id="pat_routing_lists" class="pat">
13
[% INCLUDE 'header.inc' %]
16
[% INCLUDE 'header.inc' form=formulaire %]
14
[% INCLUDE 'patron-search-header.inc' %]
15
17
16
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17
    <ol>
19
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt (-2 / +4 lines)
Lines 4-9 Link Here
4
[% USE AuthorisedValues %]
4
[% USE AuthorisedValues %]
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% formulaire = BLOCK %]
8
    [% INCLUDE 'patron-search-header.inc' %]
9
[% END %]
7
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
8
<title>
11
<title>
9
    [% UNLESS blocking_error %]
12
    [% UNLESS blocking_error %]
Lines 14-21 Link Here
14
</head>
17
</head>
15
18
16
<body id="pat_statistics" class="pat">
19
<body id="pat_statistics" class="pat">
17
[% INCLUDE 'header.inc' %]
20
[% INCLUDE 'header.inc' form=formulaire %]
18
[% INCLUDE 'patron-search-header.inc' %]
19
21
20
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21
    <ol>
23
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (+44 lines)
Line 0 Link Here
1
[% USE raw %]
2
[% USE I18N %]
3
[% USE To %]
4
[% USE AuthorisedValues %]
5
[% USE KohaDates %]
6
[% USE Price %]
7
[% PROCESS 'member-display-address-style.inc' %]
8
{
9
    "sEcho": [% sEcho | html %],
10
    "iTotalRecords": [% iTotalRecords | html %],
11
    "iTotalDisplayRecords": [% iTotalDisplayRecords | html %],
12
    "aaData": [
13
        [% FOREACH data IN aaData %]
14
            {
15
                [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %]
16
                "dt_borrowernumber":
17
                    "<label for='check[% data.borrowernumber | html %]' class='content_hidden'>Select patron</label><input type='checkbox' id='check[% data.borrowernumber | html %]' class='selection' name='borrowernumber' value='[% data.borrowernumber | html %]' />",
18
                [% END %]
19
                "dt_cardnumber":
20
                "[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<a href='/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | html %]' title=\"[% I18N.t("Check out") | html %]\">[% data.cardnumber | html | $To %]</a>[% ELSE %][% data.cardnumber | html | $To %][% END %]",
21
                "dt_name":
22
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap' title=\"[% I18N.t("View") | html %]\">[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br /><div class='address'><ul>[%~ INCLUDE 'display-address-style' patron=data no_line_break=1 | $To ~%][% IF data.email %]<li>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a></li>[% END %]</ul></div>",
23
    "dt_dateofbirth":
24
        "[% INCLUDE 'patron-age.inc' patron = data %]",
25
                "dt_category":
26
                    "[% data.category_description | html | $To %] <span class=\"patron_category_type\">([% data.category_type | html | $To %])</span>",
27
                "dt_branch":
28
                    "[% data.branchname | html | $To %]",
29
                "dt_dateexpiry":
30
                    "[% data.dateexpiry | html | $To %]",
31
                "dt_od_checkouts":
32
                    "[% IF data.overdues %]<span class='overdue'><strong>[% data.overdues | html %]</strong></span>[% ELSE %][% data.overdues | html %][% END %] / [% data.issues | html %]",
33
                "dt_fines":
34
                    "<span style='text-align: right; display: block;'><a href=\"/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% data.borrowernumber | html %]\">[% IF data.fines < 0 %]<span class='credit'>[% data.fines | $Price %]</span>[% ELSIF data.fines > 0 %]<span class='debit'><strong>[% data.fines | $Price %]</strong></span>[% ELSE %][% data.fines | $Price %][% END %]</a></span>",
35
                "dt_borrowernotes":
36
                    "[% data.borrowernotes | html_line_break | collapse | $To %]",
37
                "dt_action":
38
                "<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% data.borrowernumber | html %]' id='lientype'>Edit</a>[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] <a id='lientype' href='/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | html %]'>Check out</a>[% END %]",
39
                "borrowernumber":
40
                    "[% data.borrowernumber | html %]"
41
            }[% UNLESS loop.last %],[% END %]
42
        [% END %]
43
    ]
44
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt (-1 lines)
Lines 14-20 Link Here
14
14
15
<body id="patlist_add_modify" class="pat patlist">
15
<body id="patlist_add_modify" class="pat patlist">
16
[% INCLUDE 'header.inc' %]
16
[% INCLUDE 'header.inc' %]
17
[% INCLUDE 'cat-search.inc' %]
18
17
19
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20
    <ol>
19
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt (-1 lines)
Lines 26-32 Link Here
26
26
27
<body id="patlist_list" class="pat patlist">
27
<body id="patlist_list" class="pat patlist">
28
[% INCLUDE 'header.inc' %]
28
[% INCLUDE 'header.inc' %]
29
[% INCLUDE 'cat-search.inc' %]
30
29
31
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
30
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
32
    <ol>
31
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt (-1 lines)
Lines 9-15 Link Here
9
9
10
<body id="patlist_lists" class="pat patlist">
10
<body id="patlist_lists" class="pat patlist">
11
[% INCLUDE 'header.inc' %]
11
[% INCLUDE 'header.inc' %]
12
[% INCLUDE 'cat-search.inc' %]
13
12
14
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15
    <ol>
14
    <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt (-1 lines)
Lines 8-14 Link Here
8
8
9
<body id="pcard_edit-batch" class="tools pcard">
9
<body id="pcard_edit-batch" class="tools pcard">
10
    [% INCLUDE 'header.inc' %]
10
    [% INCLUDE 'header.inc' %]
11
    [% INCLUDE 'cat-search.inc' %]
12
11
13
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14
        <ol>
13
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt (-1 lines)
Lines 6-12 Link Here
6
6
7
<body id="pcard_edit-layout" class="tools pcard">
7
<body id="pcard_edit-layout" class="tools pcard">
8
    [% INCLUDE 'header.inc' %]
8
    [% INCLUDE 'header.inc' %]
9
    [% INCLUDE 'cat-search.inc' %]
10
9
11
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
10
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12
        <ol>
11
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt (-1 lines)
Lines 6-12 Link Here
6
6
7
<body id="pcard_edit-profile" class="tools pcard">
7
<body id="pcard_edit-profile" class="tools pcard">
8
    [% INCLUDE 'header.inc' %]
8
    [% INCLUDE 'header.inc' %]
9
    [% INCLUDE 'cat-search.inc' %]
10
9
11
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
10
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12
        <ol>
11
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt (-1 lines)
Lines 8-14 Link Here
8
8
9
<body id="pcard_edit-template" class="tools pcard">
9
<body id="pcard_edit-template" class="tools pcard">
10
    [% INCLUDE 'header.inc' %]
10
    [% INCLUDE 'header.inc' %]
11
    [% INCLUDE 'cat-search.inc' %]
12
11
13
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14
        <ol>
13
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt (-1 lines)
Lines 4-10 Link Here
4
</head>
4
</head>
5
<body id="pcard_home" class="tools pcard">
5
<body id="pcard_home" class="tools pcard">
6
    [% INCLUDE 'header.inc' %]
6
    [% INCLUDE 'header.inc' %]
7
    [% INCLUDE 'cat-search.inc' %]
8
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
7
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
9
        <ol>
8
        <ol>
10
            <li>
9
            <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt (-1 lines)
Lines 6-12 Link Here
6
6
7
<body id="pcard_image-manage" class="tools pcard">
7
<body id="pcard_image-manage" class="tools pcard">
8
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'header.inc' %]
9
[% INCLUDE 'cat-search.inc' %]
10
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
9
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11
    <ol>
10
    <ol>
12
        <li>
11
        <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt (-2 lines)
Lines 30-36 Link Here
30
30
31
<body id="pcard_manage" class="tools pcard">
31
<body id="pcard_manage" class="tools pcard">
32
    [% INCLUDE 'header.inc' %]
32
    [% INCLUDE 'header.inc' %]
33
    [% INCLUDE 'cat-search.inc' %]
34
33
35
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
34
    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
36
        <ol>
35
        <ol>
37
- 

Return to bug 30952