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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt (+1 lines)
Lines 30-35 Link Here
30
        <div class="col-sm-10 col-sm-push-2">
30
        <div class="col-sm-10 col-sm-push-2">
31
            <main>
31
            <main>
32
                [% INCLUDE 'labels-toolbar.inc' %]
32
                [% INCLUDE 'labels-toolbar.inc' %]
33
                <h1>Label creator</h1>
33
            </main>
34
            </main>
34
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
35
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
35
36
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt (+1 lines)
Lines 47-52 Link Here
47
                <main>
47
                <main>
48
48
49
                    [% INCLUDE 'labels-toolbar.inc' %]
49
                    [% INCLUDE 'labels-toolbar.inc' %]
50
                    <h1>Manage labels</h1>
50
51
51
                        [% IF ( error ) %]
52
                        [% IF ( error ) %]
52
                            <div class="dialog alert">
53
                            <div class="dialog alert">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt (+1 lines)
Lines 8-13 Link Here
8
8
9
<body id="labels_label-print" class="tools labels">
9
<body id="labels_label-print" class="tools labels">
10
    <div class="main container-fluid">
10
    <div class="main container-fluid">
11
        <h1>Label printing/exporting</h1>
11
        [% IF ( batches ) %]
12
        [% IF ( batches ) %]
12
            <form>
13
            <form>
13
                <h3>Click on the following links to download the exported batch(es).</h3>
14
                <h3>Click on the following links to download the exported batch(es).</h3>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt (-1 / +1 lines)
Lines 30-36 Link Here
30
        <div class="col-sm-10 col-sm-push-2">
30
        <div class="col-sm-10 col-sm-push-2">
31
            <main>
31
            <main>
32
32
33
			<h2>Quick spine label creator</h2>
33
<h1>Quick spine label creator</h1>
34
                <form action="/cgi-bin/koha/labels/spinelabel-print.pl" method="post" id="spinelabelprint">
34
                <form action="/cgi-bin/koha/labels/spinelabel-print.pl" method="post" id="spinelabelprint">
35
				<fieldset class="brief">
35
				<fieldset class="brief">
36
				<ol>
36
				<ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt (+8 lines)
Lines 60-65 Link Here
60
        <div class="col-sm-10 col-sm-push-2">
60
        <div class="col-sm-10 col-sm-push-2">
61
            <main>
61
            <main>
62
62
63
            <h1>
64
                [% IF type == 'credit' %]
65
                    Details of payment
66
                [% ELSIF type == 'debit' %]
67
                    Details of fee
68
                [% END %]
69
            </h1>
70
63
            [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
71
            [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
64
72
65
            [% IF accountline %]
73
            [% IF accountline %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (+1 lines)
Lines 44-49 Link Here
44
            <main>
44
            <main>
45
45
46
[% INCLUDE 'members-toolbar.inc' %]
46
[% INCLUDE 'members-toolbar.inc' %]
47
<h1>Account for [% INCLUDE 'patron-title.inc' %]</h1>
47
<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /></form>
48
<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /></form>
48
49
49
<!-- The manual invoice and credit buttons -->
50
<!-- The manual invoice and credit buttons -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt (-2 / +3 lines)
Lines 35-41 Link Here
35
    [% INCLUDE 'members-toolbar.inc' %]
35
    [% INCLUDE 'members-toolbar.inc' %]
36
    [% IF ItemsOnIssues || debits || is_guarantor %]
36
    [% IF ItemsOnIssues || debits || is_guarantor %]
37
        <div class="dialog alert">
37
        <div class="dialog alert">
38
        <h3>Cannot delete patron</h3>
38
        <h1>Cannot delete patron</h1>
39
            <ul>
39
            <ul>
40
            [% IF ( ItemsOnIssues ) %]
40
            [% IF ( ItemsOnIssues ) %]
41
                <li>Patron has [% ItemsOnIssues | html %] item(s) checked out.</li>
41
                <li>Patron has [% ItemsOnIssues | html %] item(s) checked out.</li>
Lines 64-70 Link Here
64
                    [% END %]
64
                    [% END %]
65
                </ul>
65
                </ul>
66
            [% END %]
66
            [% END %]
67
            <h3>Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]? This cannot be undone.</h3>
67
            <h1>Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]?</h1>
68
            <p>This cannot be undone.</p>
68
            <form action="/cgi-bin/koha/members/deletemem.pl">
69
            <form action="/cgi-bin/koha/members/deletemem.pl">
69
                <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
70
                <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
70
                <input type="hidden" name="member" value="[% patron.borrowernumber | html %]"/>
71
                <input type="hidden" name="member" value="[% patron.borrowernumber | html %]"/>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt (-2 / +2 lines)
Lines 32-38 Link Here
32
            <div class="col-md-8 col-md-offset-2">
32
            <div class="col-md-8 col-md-offset-2">
33
33
34
    [% IF pending_discharges %]
34
    [% IF pending_discharges %]
35
      <h2>Pending discharge requests</h2>
35
      <h1>Pending discharge requests</h1>
36
      <div id="pending_updates">
36
      <div id="pending_updates">
37
        <table>
37
        <table>
38
          <thead>
38
          <thead>
Lines 57-63 Link Here
57
      </div>
57
      </div>
58
    [% ELSE %]
58
    [% ELSE %]
59
      <div class="dialog message">
59
      <div class="dialog message">
60
        <p>There are no pending discharge requests.</p>
60
        <h1>There are no pending discharge requests.</h1>
61
      </div>
61
      </div>
62
    [% END %]
62
    [% END %]
63
63
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt (-2 / +2 lines)
Lines 34-43 Link Here
34
        <div class="col-sm-10 col-sm-push-2">
34
        <div class="col-sm-10 col-sm-push-2">
35
            <main>
35
            <main>
36
36
37
                [% INCLUDE 'members-toolbar.inc' %]
38
39
                <h1>Files</h1>
37
                <h1>Files</h1>
40
38
39
                [% INCLUDE 'members-toolbar.inc' %]
40
41
                [% IF errors %]
41
                [% IF errors %]
42
                    <div class="dialog alert">
42
                    <div class="dialog alert">
43
                        [% IF errors.empty_upload %]The file you are attempting to upload has no contents.[% END %]
43
                        [% IF errors.empty_upload %]The file you are attempting to upload has no contents.[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-3 / +3 lines)
Lines 87-96 Link Here
87
        <div class="col-sm-10 col-sm-push-2">
87
        <div class="col-sm-10 col-sm-push-2">
88
            <main>
88
            <main>
89
89
90
        [% INCLUDE 'members-toolbar.inc' %]
90
                <!-- Title -->
91
                <h1>Housebound details for [% INCLUDE 'patron-title.inc' %]</h1>
91
92
92
          <!-- Title -->
93
        [% INCLUDE 'members-toolbar.inc' %]
93
          <h1>Housebound details for [% INCLUDE 'patron-title.inc' %]</h1>
94
94
95
            [% FOR m IN messages %]
95
            [% FOR m IN messages %]
96
                <div class="dialog [% m.type | html %]">
96
                <div class="dialog [% m.type | html %]">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt (-1 / +1 lines)
Lines 37-44 Link Here
37
    <div class="row">
37
    <div class="row">
38
        <div class="col-sm-10 col-sm-push-2">
38
        <div class="col-sm-10 col-sm-push-2">
39
            <main>
39
            <main>
40
                [% INCLUDE 'members-toolbar.inc' %]
41
                <h1>ILL requests history</h1>
40
                <h1>ILL requests history</h1>
41
                [% INCLUDE 'members-toolbar.inc' %]
42
                [% INCLUDE 'ill-list-table.inc' %]
42
                [% INCLUDE 'ill-list-table.inc' %]
43
            </main>
43
            </main>
44
        </div> <!-- .col-sm-10.col-sm-push-2 -->
44
        </div> <!-- .col-sm-10.col-sm-push-2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (+2 lines)
Lines 36-41 Link Here
36
        <div class="col-sm-10 col-sm-push-2">
36
        <div class="col-sm-10 col-sm-push-2">
37
            <main>
37
            <main>
38
38
39
                <h1>Manual credit</h1>
40
39
            [% INCLUDE 'members-toolbar.inc' %]
41
            [% INCLUDE 'members-toolbar.inc' %]
40
42
41
            <!-- The manual invoice and credit buttons -->
43
            <!-- The manual invoice and credit buttons -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (+2 lines)
Lines 37-42 Link Here
37
        <div class="col-sm-10 col-sm-push-2">
37
        <div class="col-sm-10 col-sm-push-2">
38
            <main>
38
            <main>
39
39
40
                <h1>Manual invoice</h1>
41
40
            [% INCLUDE 'members-toolbar.inc' %]
42
            [% INCLUDE 'members-toolbar.inc' %]
41
43
42
            <!-- The manual invoice and credit buttons -->
44
            <!-- The manual invoice and credit buttons -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-1 / +1 lines)
Lines 82-88 Link Here
82
	[% END %]
82
	[% END %]
83
83
84
84
85
    <fieldset class="brief"><legend>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</legend>
85
    <fieldset class="brief"><legend><h1>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h1></legend>
86
	<ol>
86
	<ol>
87
    <li><label for="newuserid">New username:</label>
87
    <li><label for="newuserid">New username:</label>
88
    <input type="hidden" name="member" value="[% patron.borrowernumber | html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid | html %]" /></li>
88
    <input type="hidden" name="member" value="[% patron.borrowernumber | html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid | html %]" /></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +2 lines)
Lines 52-58 Link Here
52
52
53
          [% INCLUDE 'patron-toolbar.inc' %]
53
          [% INCLUDE 'patron-toolbar.inc' %]
54
          [% INCLUDE 'noadd-warnings.inc' %]
54
          [% INCLUDE 'noadd-warnings.inc' %]
55
56
          <div class="browse">
55
          <div class="browse">
57
            Browse by last name:
56
            Browse by last name:
58
            [% FOREACH letter IN alphabet.split(' ') %]
57
            [% FOREACH letter IN alphabet.split(' ') %]
Lines 60-65 Link Here
60
            [% END %]
59
            [% END %]
61
          </div>
60
          </div>
62
61
62
          <h1>Patrons</h1>
63
63
          [% IF CAN_user_borrowers_edit_borrowers && pending_borrower_modifications %]
64
          [% IF CAN_user_borrowers_edit_borrowers && pending_borrower_modifications %]
64
            <div class="pending-info" id="patron_updates_pending">
65
            <div class="pending-info" id="patron_updates_pending">
65
              <a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:
66
              <a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt (-1 / +1 lines)
Lines 108-115 Link Here
108
    <div class="row">
108
    <div class="row">
109
        <div class="col-md-8 col-md-offset-2">
109
        <div class="col-md-8 col-md-offset-2">
110
110
111
            <h1>Update patron records</h1>
111
            [% IF PendingModifications %]
112
            [% IF PendingModifications %]
112
            <h2>Update patron records</h2>
113
                <form method="post" action="members-update-do.pl">
113
                <form method="post" action="members-update-do.pl">
114
                    <div id="pending_updates">
114
                    <div id="pending_updates">
115
                            [% FOREACH pm IN PendingModifications %]
115
                            [% FOREACH pm IN PendingModifications %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-1 / +1 lines)
Lines 84-90 Link Here
84
<div class="main container-fluid">
84
<div class="main container-fluid">
85
    <div class="row">
85
    <div class="row">
86
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
86
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
87
            <h3>Merge patron records</h3>
87
            <h1>Merge patron records</h1>
88
88
89
            [% IF action == 'show' %]
89
            [% IF action == 'show' %]
90
                [% IF patrons.count > 1 %]
90
                [% IF patrons.count > 1 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-1 / +1 lines)
Lines 12-18 Link Here
12
    <div class="container-fluid">
12
    <div class="container-fluid">
13
        <div class="row">
13
        <div class="row">
14
            <div class="col-xs-12">
14
            <div class="col-xs-12">
15
                <h3>[% INCLUDE 'patron-title.inc' %]</h3>
15
                <h1>[% INCLUDE 'patron-title.inc' %]</h1>
16
            </div>
16
            </div>
17
        </div>
17
        </div>
18
        <div class="row">
18
        <div class="row">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+6 lines)
Lines 102-107 Link Here
102
                            [% INCLUDE 'patron_messages.inc' %]
102
                            [% INCLUDE 'patron_messages.inc' %]
103
                        </div>
103
                        </div>
104
104
105
                        <h1>
106
                            [% UNLESS ( I ) %]
107
                                [% patron.title | html %] [% patron.firstname | html %]
108
                            [% END %]
109
                            [% patron.surname | html %] ([% patron.cardnumber | html %])
110
                        </h1>
105
                        <div class="col-sm-6">
111
                        <div class="col-sm-6">
106
112
107
                            <div id="patron-information" class="patroninfo-section">
113
                            <div id="patron-information" class="patroninfo-section">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (+2 lines)
Lines 38-43 Link Here
38
        <div class="col-sm-10 col-sm-push-2">
38
        <div class="col-sm-10 col-sm-push-2">
39
            <main>
39
            <main>
40
40
41
                <h1>Make a payment</h1>
42
41
[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
43
[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
42
44
43
<!-- The manual invoice and credit buttons -->
45
<!-- The manual invoice and credit buttons -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-1 / +18 lines)
Lines 73-80 Link Here
73
        <div class="col-sm-10 col-sm-push-2">
73
        <div class="col-sm-10 col-sm-push-2">
74
            <main>
74
            <main>
75
75
76
[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
76
            <h1>
77
                [% IF ( pay_individual ) %]
78
                    Pay an individual fine
79
                [% ELSIF ( writeoff_individual ) %]
80
                    Write off an individual fine
81
                [% ELSE %]
82
                    [% IF ( selected_accts ) %]
83
                        [% IF type == 'WRITEOFF' %]
84
                            Write off an amount toward selected fines
85
                        [% ELSE %]
86
                            Pay an amount toward selected fines
87
                        [% END %]
88
                    [% ELSE %]
89
                        Pay an amount toward all fines
90
                    [% END %]
91
                [% END %]
92
            </h1>
77
93
94
[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
78
95
79
<!-- The manual invoice and credit buttons -->
96
<!-- The manual invoice and credit buttons -->
80
<div class="statictabs">
97
<div class="statictabs">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-1 / +1 lines)
Lines 35-42 Link Here
35
        <div class="col-sm-10 col-sm-push-2">
35
        <div class="col-sm-10 col-sm-push-2">
36
            <main>
36
            <main>
37
37
38
                [% INCLUDE 'members-toolbar.inc' %]
39
                <h1>Purchase suggestions</h1>
38
                <h1>Purchase suggestions</h1>
39
                [% INCLUDE 'members-toolbar.inc' %]
40
40
41
                <div id="toolbar" class="btn-toolbar">
41
                <div id="toolbar" class="btn-toolbar">
42
                    <a class="btn btn-default" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% patron.borrowernumber | html %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
42
                    <a class="btn btn-default" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% patron.borrowernumber | html %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-1 / +2 lines)
Lines 36-44 Link Here
36
        <div class="col-sm-10 col-sm-push-2">
36
        <div class="col-sm-10 col-sm-push-2">
37
            <main>
37
            <main>
38
38
39
[% INCLUDE 'members-toolbar.inc' %]
40
<h1>Circulation history</h1>
39
<h1>Circulation history</h1>
41
40
41
[% INCLUDE 'members-toolbar.inc' %]
42
42
[% UNLESS Koha.Preference('intranetreadinghistory') %]
43
[% UNLESS Koha.Preference('intranetreadinghistory') %]
43
    <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
44
    <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
44
[% ELSIF is_anonymous %]
45
[% ELSIF is_anonymous %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-3 / +4 lines)
Lines 34-41 Link Here
34
        <div class="col-sm-10 col-sm-push-2">
34
        <div class="col-sm-10 col-sm-push-2">
35
            <main>
35
            <main>
36
36
37
[% INCLUDE 'members-toolbar.inc' %]
37
                [% INCLUDE 'members-toolbar.inc' %]
38
38
39
                <h1>Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</h1>
39
<!-- Search Bar -->
40
<!-- Search Bar -->
40
<p class="tip">Search subscriptions:</p>
41
<p class="tip">Search subscriptions:</p>
41
<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" value="Search" class="submit" />
42
<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" value="Search" class="submit" />
Lines 43-49 Link Here
43
<!-- Search Bar End -->
44
<!-- Search Bar End -->
44
45
45
[% SET routinglists = patron.get_routing_lists %]
46
[% SET routinglists = patron.get_routing_lists %]
46
<h1>
47
<h2>
47
[% UNLESS ( routinglists ) %]
48
[% UNLESS ( routinglists ) %]
48
0 subscription routing lists
49
0 subscription routing lists
49
[% ELSIF ( routinglists.count == 1 ) %]
50
[% ELSIF ( routinglists.count == 1 ) %]
Lines 51-57 Link Here
51
[% ELSE %]
52
[% ELSE %]
52
[% routinglists.count | html %] subscription routing lists
53
[% routinglists.count | html %] subscription routing lists
53
[% END %]
54
[% END %]
54
</h1>
55
</h2>
55
56
56
<div id="subscriptions">
57
<div id="subscriptions">
57
58
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt (-2 / +1 lines)
Lines 11-17 Link Here
11
11
12
[% IF ( MULTI ) %]
12
[% IF ( MULTI ) %]
13
13
14
    <h3> Choose adult category </h3>
14
    <h1> Choose adult category </h1>
15
15
16
    [% IF patron_categories %]
16
    [% IF patron_categories %]
17
        <form method="post" action="update-child.pl">
17
        <form method="post" action="update-child.pl">
18
- 

Return to bug 27631