From 1149e30be36de1ae779cb306231051e96c404dfa Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 18 Aug 2021 14:17:44 +0100 Subject: [PATCH] Bug 35978: Add 'sections' to Course Reserves We use Section to distinguish Residential from ETF Open University; This patch adds Section to the breadcrumb and title where appropriate. Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer --- .../prog/en/modules/course_reserves/add_items-step1.tt | 2 +- .../prog/en/modules/course_reserves/add_items-step2.tt | 6 +++--- .../prog/en/modules/course_reserves/batch_add_items.tt | 2 +- .../prog/en/modules/course_reserves/course-details.tt | 4 ++-- .../prog/en/modules/course_reserves/course-reserves.tt | 2 +- .../intranet-tmpl/prog/en/modules/course_reserves/course.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-course-details.tt | 6 +++--- .../opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt | 2 +- 8 files changed, 14 insertions(+), 14 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 927b274fe2..16edd6bfdb 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 @@ -22,7 +22,7 @@ Course reserves [% END %] [% WRAPPER breadcrumb_item %] - [% course.course_name | html %] + [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Add reserves 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 9ccd4458ce..9c4fad0c55 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 @@ -29,7 +29,7 @@ Course reserves [% END %] [% WRAPPER breadcrumb_item %] - [% course.course_name | html %] + [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF is_edit || course_reserve %] @@ -69,9 +69,9 @@
[% IF is_edit || course_reserve %] - Edit [% biblio.title | html %] in [% course.course_name | html %] + Edit [% biblio.title | html %] in [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] [% ELSE %] - Add [% biblio.title | html %] to [% course.course_name | html %] + Add [% biblio.title | html %] to [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] [% END %]
  1. 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 d278b001f2..fca7f10843 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 @@ -26,7 +26,7 @@ Course reserves [% END %] [% WRAPPER breadcrumb_item %] - [% course.course_name | html %] + [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Add reserves 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 acda85b512..e9acd983a6 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 @@ -9,7 +9,7 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% FILTER collapse %] - [% tx("Course details for {course_name}", { course_name = course.course_name }) | html %] › + [% tx("Course details for {course_name}", { course_name = course.course_name }) | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] › [% t("Course reserves") | html %] › [% t("Koha") | html %] [% END %] @@ -42,7 +42,7 @@ Course reserves [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Course details for [% course.course_name | html | $HtmlTags tag="em" %] + Course details for [% course.course_name | html | $HtmlTags tag="em" %][%- IF course.section -%] - [% course.section | html | $HtmlTags tag="em" %][%- END -%] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] 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 8c06c578c8..a2cb419c4c 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 @@ -64,7 +64,7 @@ [% FOREACH c IN courses %] - [% c.course_name | html %] + [% c.course_name | html %][%- IF c.section -%] - [% c.section | html %][%- END -%] [% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) | html %] [% c.course_number | html %] [% c.section | html %] 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 132eae27e6..0043318b11 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 @@ -5,7 +5,7 @@ [% INCLUDE 'doc-head-open.inc' %] [% FILTER collapse %] [% IF ( course_name ) %] - [% tx("Edit {course_name}", { course_name = course_name }) | html %] + [% tx("Edit {course_name}", { course_name = course_name }) | html %][% IF course.section %] - [% course.section | html %][% END %] [% ELSE %] [% t("New course") | html %] [% END %] › @@ -36,7 +36,7 @@ [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF course_name %] - <span>Edit [% course_name | html | $HtmlTags tag="em" %]</span> + <span>Edit [% course_name | html | $HtmlTags tag="em" %][%- IF course.section -%] - [% course.section | html | $HtmlTags tag="em" %][%- END -%]</span> [% ELSE %] <span>New course</span> [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index 5ce9a87fa4..58797fd6c3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -8,7 +8,7 @@ [% USE TablesSettings %] [% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Course reserves for [% course.course_name | html %] › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog +Course reserves for [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] [% Asset.css("css/datatables.css") | $raw %] @@ -24,7 +24,7 @@ Course reserves [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Course reserves for  [% course.course_name | html %] + Course reserves for  [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] [% END %] [% END #/ WRAPPER breadcrumbs %] @@ -33,7 +33,7 @@
    -

    Course reserves for [% course.course_name | html %]

    +

    Course reserves for [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%]

      [% IF ( course.term ) %]
    1. [% tp('Semester', 'Term:') | html %] [% AuthorisedValues.GetByCode( 'TERM', course.term, 1 ) | html %]
      2. [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt index b6e67303f3..7f9b181d8d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt @@ -47,7 +47,7 @@ [% FOREACH c IN courses %] - [% c.course_name | html %] + [% c.course_name | html %][%- IF c.section -%] - [% c.section | html %][%- END -%] [% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) | html %] [% c.course_number | html %] [% c.section | html %] -- 2.39.5