Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32787: Patron restrictions admin page has patron categories search bar

Browse source 
This patch updates the patron restriction administration page to correct
the markup around the header and breadcrumbs: Using the header WRAPPER,
using the sub-header WRAPPER, and switching to the system preferences
search bar.

The patch also corrects the page title to prevent a leading "rsaquo;"
in some cases.

Note: This patch contains indentation changes, so ignore whitespace when
viewing the diff.

To test, apply the patch and go to Administration -> Patron
restrictions. The system preferences search should be preselected in the
header search bar, and everything should look correct.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4563e3e59b)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
This commit is contained in:
Owen Leonard 2023-02-02 14:43:38 +00:00 committed by Matt Blenkinsop
parent d824526dcb
commit 95044259c8
1 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
View file

@ -4,64 +4,68 @@
[% PROCESS 'restriction-types.inc' %] [% PROCESS 'restriction-types.inc' %]
[% SET footerjs = 1 %] [% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %] [% INCLUDE 'doc-head-open.inc' %]
<title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]'[% ELSE %]New restriction[% END %][% END %] <title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]' &rsaquo; [% ELSE %]New restriction &rsaquo; [% END %][% END %]
[% IF op == 'delete_confirm' %]Confirm deletion of restriction '[% PROCESS restriction_type_description restriction_type=restriction %]'[% END %] &rsaquo; Patron restrictions &rsaquo; Administration &rsaquo; Koha [% IF op == 'delete_confirm' %]Confirm deletion of restriction '[% PROCESS restriction_type_description restriction_type=restriction %]' &rsaquo; [% END %]Patron restrictions &rsaquo; Administration &rsaquo; Koha
</title> </title>
[% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'doc-head-close.inc' %]
</head> </head>
<body id="admin_restrictions" class="admin"> <body id="admin_restrictions" class="admin">
[% INCLUDE 'header.inc' %] [% WRAPPER 'header.inc' %]
[% INCLUDE 'patrons-admin-search.inc' %] [% INCLUDE 'prefs-admin-search.inc' %]
[% END %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER 'sub-header.inc' %]
<ol> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<li> <ol>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
[% IF op == 'list' %]
<li> <li>
<a href="#" aria-current="page"> <a href="/cgi-bin/koha/mainpage.pl">Home</a>
Patron restrictions
</a>
</li> </li>
[% END %]
[% IF op == 'add_form' %]
<li> <li>
<a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a> <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li> </li>
[% IF restriction %]
[% IF op == 'list' %]
<li> <li>
<a href="#" aria-current="page"> <a href="#" aria-current="page">
Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]' Patron restrictions
</a>
</li>
[% ELSE %]
<li>
<a href="#" aria-current="page">
New restriction
</a> </a>
</li> </li>
[% END %] [% END %]
[% END %]
[% IF op == 'delete_confirm' %] [% IF op == 'add_form' %]
<li> <li>
<a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a> <a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a>
</li> </li>
<li> [% IF restriction %]
<a href="#" aria-current="page"> <li>
Delete restriction? <a href="#" aria-current="page">
</a> Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]'
</li> </a>
[% END %] </li>
</ol> [% ELSE %]
</nav> <li>
<a href="#" aria-current="page">
New restriction
</a>
</li>
[% END %]
[% END %]
[% IF op == 'delete_confirm' %]
<li>
<a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a>
</li>
<li>
<a href="#" aria-current="page">
Delete restriction?
</a>
</li>
[% END %]
</ol>
</nav>
[% END %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">