gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 33068: Use template wrapper for breadcrumbs: Administration part 3 

This patch updates several administration templates so that they
use the new WRAPPER for displaying breadcrumbs.

Note: The patch includes indentation changes, so ignore whitespace
when viewing the diff.

To test, apply the patch and test each page and its variations.
Breadcrumbs should look correct, and each link should be correct.

Administration ->
 - Circulation and fine rules -> Clone rules
 - Table settings
 - Credit types ->
   - New credit type
   - Edit credit type
 - Curbside pickup
 - Currencies and exchange rates ->
   - New currency
   - Edit currency
   - Confirm deletion
 - Debit types ->
   - New debt type
   - Edit debit type
 - Desks ->
   - New desk
   - Edit desk
   - Confirm deletion
 - Did you mean?
 - EDI accounts
   - New account
   - Edit account
   - Confirm deletion

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Owen Leonard 2023-01-06 16:09:42 +00:00 committed by Tomas Cohen Arazi
parent 4d59e2717d
commit dbb3c88cfc
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
9 changed files with 140 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
View File

@ -12,25 +12,18 @@
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
<li>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fine rules</a>
</li>
<li>
<a href="#" aria-current="page">
Clone circulation and fine rules
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Clone circulation and fine rules</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

24
koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
View File

@ -177,23 +177,17 @@
[% WRAPPER 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
<li>
<a href="#" aria-current="page">
Table settings
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Table settings</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

43
koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
View File

@ -24,39 +24,30 @@
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
[% END %]
[% IF op == 'add_form' %]
<li>
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/credit_types.pl">Credit types</a>
</li>
<li>
<a href="#" aria-current="page">
[% IF credit_type.code %]
Modify credit type
[% ELSE %]
New credit type
[% END %]
</a>
</li>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF credit_type.code %]
<span>Modify credit type</span>
[% ELSE %]
<span>New credit type</span>
[% END %]
[% END %]
[% ELSE %]
<li>
<a href="#" aria-current="page">
Credit types
</a>
</li>
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Credit types</span>
[% END %]
[% END %]
</ol>
</nav>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

25
koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
View File

@ -26,22 +26,17 @@
[% USE format_minutes = format('%02d') %]
[% MACRO minutes_format BLOCK %][% IF m != "" %][% format_minutes(m) | html %][% END %][% END %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
<li>
<a href="#" aria-current="page">
Curbside pickup
</a>
</li>
</ol>
</nav>
[% WRAPPER 'sub-header.inc' %]
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Curbside pickup</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

51
koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
View File

@ -18,47 +18,36 @@
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
<li>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange rates</a>
</li>
[% END %]
[% IF op == 'add_form' %]
<li>
<a href="#" aria-current="page">
[% IF currency %]
Modify currency '[% currency.currency | html %]'
[% ELSE %]
New currency
[% END %]
</a>
</li>
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF currency %]
<span>Modify currency '[% currency.currency | html %]'</span>
[% ELSE %]
<span>New currency</span>
[% END %]
[% END %]
[% END %]
[% IF op == 'delete_confirm' %]
<li>
<a href="#" aria-current="page">
Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]
</a>
</li>
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</span>
[% END %]
[% ELSIF op == 'list' %]
<li>
<a href="#" aria-current="page">
Currencies
</a>
</li>
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Currencies</span>
[% END %]
[% END %]
</ol>
</nav>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

43
koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
View File

@ -22,39 +22,30 @@
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
[% END %]
[% IF op == 'add_form' %]
<li>
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/debit_types.pl">Debit types</a>
</li>
<li>
<a href="#" aria-current="page">
[% IF debit_type.code %]
<span>Modify debit type</span>
[% ELSE %]
<span>New debit type</span>
[% END %]
</a>
</li>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF debit_type.code %]
<span>Modify debit type</span>
[% ELSE %]
<span>New debit type</span>
[% END %]
[% END %]
[% ELSE %]
<li>
<a href="#" aria-current="page">
Debit types
</a>
</li>
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Debit types</span>
[% END %]
[% END %]
</ol>
</nav>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

61
koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
View File

@ -24,49 +24,38 @@
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
[% END %]
[% IF op == 'add_form' || op == 'delete_confirm' %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/desks.pl">Desks</a>
[% END %]
[% ELSE %]
[% WRAPPER breadcrumb_item bc_active = 1 %]
<span>Desks</span>
[% END %]
[% END %]
[% IF op == 'add_form' %]
<li>
<a href="/cgi-bin/koha/admin/desks.pl">Desks</a>
</li>
<li>
<a href="#" aria-current="page">
[% IF desk.desk_id %]
Modify desk
[% ELSE %]
New desk
[% END %]
</a>
</li>
[% WRAPPER breadcrumb_item bc_active = 1 %]
[% IF desk.desk_id %]
<span>Modify desk</span>
[% ELSE %]
<span>New desk</span>
[% END %]
[% END %]
[% ELSIF op == 'delete_confirm' %]
<li>
<a href="/cgi-bin/koha/admin/desks.pl">Desks</a>
</li>
<li>
<a href="#" aria-current="page">
Confirm deletion of desk
</a>
</li>
[% WRAPPER breadcrumb_item bc_active = 1 %]
<span>Confirm deletion of desk</span>
[% END %]
[% ELSE %]
<li>
<a href="#" aria-current="page">
Desks
</a>
</li>
[% END %]
</ol>
</nav>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

23
koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
View File

@ -33,22 +33,15 @@
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
<li>
<a href="#" aria-current="page">
Did you mean?
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Did you mean?</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

62
koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
View File

@ -22,53 +22,39 @@ EDI accounts &rsaquo; Administration &rsaquo; Koha
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
</li>
[% END %]
[% IF acct_form || delete_confirm %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a>
[% END %]
[% ELSE %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>EDI accounts</span>
[% END %]
[% END %]
[% IF acct_form %]
<li>
<a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a>
</li>
[% IF account %]
<li>
<a href="#" aria-current="page">
Modify account
</a>
</li>
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Modify account</span>
[% END %]
[% ELSE %]
<li>
<a href="#" aria-current="page">
Add new account
</a>
</li>
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Add new account</span>
[% END %]
[% END %]
[% ELSIF delete_confirm %]
<li>
<a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a>
</li>
<li>
<a href="#" aria-current="page">
Confirm deletion of account
</a>
</li>
[% ELSE %]
<li>
<a href="#" aria-current="page">
EDI accounts
</a>
</li>
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Confirm deletion of account</span>
[% END %]
[% END %]
</ol>
</nav>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">