Bugzilla – Attachment 149310 Details for
Bug 33383
Use template wrapper for breadcrumbs: Course reserves
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33383: Use template wrapper for breadcrumbs: Course reserves
Bug-33383-Use-template-wrapper-for-breadcrumbs-Cou.patch (text/plain), 13.85 KB, created by
Katrin Fischer
on 2023-04-08 20:58:38 UTC
(
hide
)
Description:
Bug 33383: Use template wrapper for breadcrumbs: Course reserves
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-04-08 20:58:38 UTC
Size:
13.85 KB
patch
obsolete
>From 04d47a4f3d1d082276b3d7643f31f4589565d3e6 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 31 Mar 2023 14:27:17 +0000 >Subject: [PATCH] Bug 33383: Use template wrapper for breadcrumbs: Course > reserves > >This patch updates several course reserves templates so that they use >the new WRAPPER for displaying breadcrumbs. > >To test, apply the patch and test each page and its variations. >Breadcrumbs should look correct, and each link should be correct. > >- Course reserves > - New course > - Edit course > - Batch remove reserves > - Course details > - Add reserves (step one and two) > - Batch add reserves > >Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../course_reserves/add_items-step1.tt | 28 ++++++-------- > .../course_reserves/add_items-step2.tt | 36 +++++++++--------- > .../course_reserves/batch_add_items.tt | 28 ++++++-------- > .../modules/course_reserves/batch_rm_items.tt | 23 ++++-------- > .../modules/course_reserves/course-details.tt | 26 +++++-------- > .../course_reserves/course-reserves.tt | 17 +++------ > .../prog/en/modules/course_reserves/course.tt | 37 +++++++++++-------- > .../modules/course_reserves/invalid-course.tt | 25 +++++-------- > 8 files changed, 95 insertions(+), 125 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >index 47f494debd..751c89ac1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Add reserves › [% course.course_name | html %] › Course reserves › Koha</title> >@@ -10,25 +11,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/course_reserves/course-reserves.pl">Course reserves</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]">[% course.course_name | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Add reserves >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Add reserves</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >index 8c8913291d..ba14d8f2d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >@@ -1,6 +1,9 @@ >+[% USE raw %] >+[% USE HtmlTags %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >+[% PROCESS 'i18n.inc' %] > <title>[% IF is_edit || course_reserve %]Edit reserve[% ELSE %]Add reserves[% END %] › [% course.course_name | html %] › Course reserves › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >@@ -12,26 +15,23 @@ > [% 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/course_reserves/course-reserves.pl">Course reserves</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]">[% course.course_name | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF is_edit || course_reserve %] <span>Edit</span> [% ELSE %] <span>Reserve</span> [% END %] >- <em>[% biblio.title | html %]</em> >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF is_edit || course_reserve %] >+ [% tp("Edit course reserve", "Edit") | html %] >+ [% ELSE %] >+ [% tp("Place course reserve", "Reserve") | html %] >+ [% END %] >+ [% biblio.title | html | $HtmlTags tag="em" %] >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >index a33c6fd7bd..eb4e674a24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE ItemTypes %] >@@ -15,25 +16,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/course_reserves/course-reserves.pl">Course reserves</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]">[% course.course_name | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Add reserves >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Add reserves</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >index 6ead79e787..7f3f657a2a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >@@ -12,22 +12,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/course_reserves/course-reserves.pl">Course reserves</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Batch remove reserves >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Batch remove reserves</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index cb109938a3..cb415fe2ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -1,4 +1,5 @@ > [% USE raw %] >+[% USE HtmlTags %] > [% USE Asset %] > [% USE AuthorisedValues %] > [% USE ItemTypes %] >@@ -32,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/course_reserves/course-reserves.pl">Course reserves</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Course details for <em>[% course.course_name | html %]</em> >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Course details for [% course.course_name | html | $HtmlTags tag="em" %]</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >@@ -73,7 +67,7 @@ > </div><!-- /toolbar --> > [% END %] > >- <div class="page-section"> >+ <div class="page-section clearfix"> > > <fieldset class="rows"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index c54b09467a..50f12bfeb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -17,17 +17,12 @@ > [% 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> >- <a href="#" aria-current="page">Course reserves</a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Course reserves</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >index 702637f92f..14a808b17c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >@@ -1,3 +1,5 @@ >+[% USE raw %] >+[% USE HtmlTags %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -20,29 +22,32 @@ > [% 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/course_reserves/course-reserves.pl">Course reserves</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF course_name %] Edit <em>[% course_name | html %]</em> [% ELSE %] New course [% END %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF course_name %] >+ <span>Edit [% course_name | html | $HtmlTags tag="em" %]</span> >+ [% ELSE %] >+ <span>New course</span> >+ [% END %] >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > [% IF ( departments ) %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-md-8 col-md-offset-2"> >- <h1>[% IF course_name %] Edit <em>[% course_name | html %]</em> [% ELSE %] New course [% END %]</h1> >+ <h1> >+ [% IF course_name %] >+ <span>Edit [% course_name | html | $HtmlTags tag="em" %]</span> >+ [% ELSE %] >+ <span>New course</span> >+ [% END %] >+ </h1> > > <form method="post" action="/cgi-bin/koha/course_reserves/mod_course.pl" class="validated"> > [% IF course_id %]<input type="hidden" name="course_id" value="[% course_id | html %]" />[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >index 5c5ddee2a7..e68cdd197a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >@@ -1,5 +1,4 @@ >- >- >+[% USE raw %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Course reserves › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -10,19 +9,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> >- <a href="#" aria-current="page"> >- Course reserves >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Invalid course</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33383
:
149039
|
149045
| 149310