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

(-)a/C4/Form/MessagingPreferences.pm (-1 / +1 lines)
Lines 163-169 sub set_form_values { Link Here
163
163
164
=head1 SEE ALSO
164
=head1 SEE ALSO
165
165
166
L<C4::Members::Messaging>, F<admin/categorie.pl>, F<opac/opac-messaging.pl>, F<members/messaging.pl>
166
L<C4::Members::Messaging>, F<admin/categories.pl>, F<opac/opac-messaging.pl>, F<members/messaging.pl>
167
167
168
=head1 AUTHOR
168
=head1 AUTHOR
169
169
(-)a/admin/categorie.pl (-1 / +1 lines)
Lines 39-45 my @messages; Link Here
39
39
40
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
40
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
41
    {
41
    {
42
        template_name   => "admin/categorie.tt",
42
        template_name   => "admin/categories.tt",
43
        query           => $input,
43
        query           => $input,
44
        type            => "intranet",
44
        type            => "intranet",
45
        authnotrequired => 0,
45
        authnotrequired => 0,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (-1 / +1 lines)
Lines 26-32 Link Here
26
26
27
<h5>Patrons and circulation</h5>
27
<h5>Patrons and circulation</h5>
28
<ul>
28
<ul>
29
	<li><a href="/cgi-bin/koha/admin/categorie.pl">Patron types and categories</a></li>
29
	<li><a href="/cgi-bin/koha/admin/categories.pl">Patron types and categories</a></li>
30
    <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></li>
30
    <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></li>
31
	<li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li>
31
	<li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li>
32
	<li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li>
32
	<li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-1 / +1 lines)
Lines 40-46 Link Here
40
40
41
<h3>Patrons and circulation</h3>
41
<h3>Patrons and circulation</h3>
42
<dl>
42
<dl>
43
	<dt><a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a></dt>
43
	<dt><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></dt>
44
	<dd>Define patron categories.</dd>
44
	<dd>Define patron categories.</dd>
45
[% IF CAN_user_parameters_manage_circ_rules %]
45
[% IF CAN_user_parameters_manage_circ_rules %]
46
    <dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
46
    <dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt (-11 / +11 lines)
Lines 98-106 Link Here
98
[% INCLUDE 'header.inc' %]
98
[% INCLUDE 'header.inc' %]
99
[% INCLUDE 'patrons-admin-search.inc' %]
99
[% INCLUDE 'patrons-admin-search.inc' %]
100
100
101
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
101
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
102
[% IF op == 'delete_confirm' %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; [% IF ( patrons_in_category > 0 ) %]Cannot delete: Category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
102
[% IF op == 'delete_confirm' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; [% IF ( patrons_in_category > 0 ) %]Cannot delete: Category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
103
[% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
103
[% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
104
[% IF op == 'list' %]Patron categories[% END %]</div>
104
[% IF op == 'list' %]Patron categories[% END %]</div>
105
105
106
<div id="doc3" class="yui-t2">
106
<div id="doc3" class="yui-t2">
Lines 133-139 Link Here
133
[% END %]
133
[% END %]
134
134
135
[% IF op == 'add_form' %]
135
[% IF op == 'add_form' %]
136
    <form name="Aform" action="/cgi-bin/koha/admin/categorie.pl" method="post">
136
    <form name="Aform" action="/cgi-bin/koha/admin/categories.pl" method="post">
137
        <input type="hidden" name="op" value="add_validate" />
137
        <input type="hidden" name="op" value="add_validate" />
138
        <input type="hidden" name="checked" value="0" />
138
        <input type="hidden" name="checked" value="0" />
139
        [% IF category %]
139
        [% IF category %]
Lines 304-310 Link Here
304
[% END %]
304
[% END %]
305
305
306
[% IF op == 'delete_confirm' %]
306
[% IF op == 'delete_confirm' %]
307
    <form action="/cgi-bin/koha/admin/categorie.pl" method="post">
307
    <form action="/cgi-bin/koha/admin/categories.pl" method="post">
308
        <fieldset>
308
        <fieldset>
309
            <legend>
309
            <legend>
310
                [% IF patrons_in_category > 0 %]
310
                [% IF patrons_in_category > 0 %]
Lines 358-364 Link Here
358
                    <input type="hidden" name="op" value="delete_confirmed" />
358
                    <input type="hidden" name="op" value="delete_confirmed" />
359
                    <input type="hidden" name="categorycode" value="[% categorycode |html %]" />
359
                    <input type="hidden" name="categorycode" value="[% categorycode |html %]" />
360
                    <input type="submit" value="Delete this category" />
360
                    <input type="submit" value="Delete this category" />
361
                    <a class="cancel" href="/cgi-bin/koha/admin/categorie.pl">Cancel</a>
361
                    <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">Cancel</a>
362
                [% END %]
362
                [% END %]
363
            </fieldset>
363
            </fieldset>
364
        </fieldset>
364
        </fieldset>
Lines 368-374 Link Here
368
[% IF op == 'list' %]
368
[% IF op == 'list' %]
369
369
370
    <div id="toolbar" class="btn-toolbar">
370
    <div id="toolbar" class="btn-toolbar">
371
        <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form"><i class="fa fa-plus"></i> New category</a>
371
        <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a>
372
    </div>
372
    </div>
373
373
374
    <h2>Patron category administration</h2>
374
    <h2>Patron category administration</h2>
Lines 403-409 Link Here
403
                    <tr>
403
                    <tr>
404
                        <td>[% category.categorycode |html %]</td>
404
                        <td>[% category.categorycode |html %]</td>
405
                        <td>
405
                        <td>
406
                            <a href="/cgi-bin/koha/admin/categorie.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">[% category.description |html %]</a>
406
                            <a href="/cgi-bin/koha/admin/categories.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">[% category.description |html %]</a>
407
                        </td>
407
                        </td>
408
                        <td>
408
                        <td>
409
                            [% SWITCH category.category_type %]
409
                            [% SWITCH category.category_type %]
Lines 480-493 Link Here
480
                                Forever
480
                                Forever
481
                            [% END %]
481
                            [% END %]
482
                        </td>
482
                        </td>
483
                        <td><a href="/cgi-bin/koha/admin/categorie.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">Edit</a></td>
483
                        <td><a href="/cgi-bin/koha/admin/categories.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">Edit</a></td>
484
                        <td><a href="/cgi-bin/koha/admin/categorie.pl?op=delete_confirm&amp;categorycode=[% category.categorycode |uri %]">Delete</a></td>
484
                        <td><a href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&amp;categorycode=[% category.categorycode |uri %]">Delete</a></td>
485
                    </tr>
485
                    </tr>
486
                [% END %]
486
                [% END %]
487
            </tbody>
487
            </tbody>
488
        </table>
488
        </table>
489
    [% ELSE %]
489
    [% ELSE %]
490
        <div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categorie.pl?op=add_form">Create a new category</a>.</div>
490
        <div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categories.pl?op=add_form">Create a new category</a>.</div>
491
    [% END %]
491
    [% END %]
492
[% END %]
492
[% END %]
493
493
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +1 lines)
Lines 321-327 function filterByFirstLetterSurname(letter) { Link Here
321
                <p>There are <strong>no libraries defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/branches.pl">add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
321
                <p>There are <strong>no libraries defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/branches.pl">add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
322
              [% END %]
322
              [% END %]
323
              [% IF ( no_categories ) %]
323
              [% IF ( no_categories ) %]
324
                <p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categorie.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
324
                <p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categories.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
325
              [% END %]
325
              [% END %]
326
            </div>
326
            </div>
327
          [% END %]
327
          [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +1 lines)
Lines 187-193 Link Here
187
187
188
	[% IF ( no_add ) %]<div class="dialog alert"><h3>Cannot add patron</h3>
188
	[% IF ( no_add ) %]<div class="dialog alert"><h3>Cannot add patron</h3>
189
		[% IF ( no_branches ) %]<p>There are <strong>no libraries defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/branches.pl">add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>[% END %]
189
		[% IF ( no_branches ) %]<p>There are <strong>no libraries defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/branches.pl">add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>[% END %]
190
		[% IF ( no_categories ) %]<p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categorie.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.</p>[% END %][% END %]</div>[% END %]
190
		[% IF ( no_categories ) %]<p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categories.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.</p>[% END %][% END %]</div>[% END %]
191
191
192
	[% UNLESS ( no_add ) %]
192
	[% UNLESS ( no_add ) %]
193
    <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</h1>
193
    <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</h1>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt (-2 / +1 lines)
Lines 167-173 $(document).ready(function() { Link Here
167
            </form>
167
            </form>
168
            [% ELSE %]
168
            [% ELSE %]
169
                <div class="warning">You don't have patron categories defined, or the patron categories are not set to receive overdue notices.</div>
169
                <div class="warning">You don't have patron categories defined, or the patron categories are not set to receive overdue notices.</div>
170
                <div class="warning">If this is not what you were expecting, go to <a href="../admin/categorie.pl">patron categories</p></div>
170
                <div class="warning">If this is not what you were expecting, go to <a href="../admin/categories.pl">patron categories</p></div>
171
            [% END %]
171
            [% END %]
172
    </div>
172
    </div>
173
    </div>
173
    </div>
174
- 

Return to bug 15099