Attachment 169200 Details for Bug 35978 – Bug 35978: Add 'sections' to Course Reserves

[patch] Bug 35978: Add 'sections' to Course Reserves

Bug-35978-Add-sections-to-Course-Reserves.patch (text/plain), 11.53 KB, created by Kyle M Hall (khall) on 2024-07-19 11:25:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2024-07-19 11:25:28 UTC

Size: 11.53 KB

patch

obsolete

>From dca1f62a38a6926235b5685dd7a3caa4f640503b Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <oleonard@myacpl.org>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../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 927b274fe2d..16edd6bfdb9 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 @@
>             <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a>
>         [% 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>
>+            <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]">[% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%]</a>
>         [% END %]
>         [% WRAPPER breadcrumb_item bc_active= 1 %]
>             <span>Add reserves</span>
>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 9ccd4458ce2..9c4fad0c559 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 @@
>             <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a>
>         [% 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>
>+            <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]">[% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%]</a>
>         [% END %]
>         [% WRAPPER breadcrumb_item bc_active= 1 %]
>             [% IF is_edit || course_reserve %]
>@@ -69,9 +69,9 @@
> 
>             <fieldset class="rows">
>                 [% IF is_edit || course_reserve %]
>-                    <legend>Edit <em>[% biblio.title | html %]</em> in <em>[% course.course_name | html %]</em></legend>
>+                    <legend>Edit <em>[% biblio.title | html %]</em> in <em>[% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%]</em></legend>
>                 [% ELSE %]
>-                    <legend>Add <em>[% biblio.title | html %]</em> to <em>[% course.course_name | html %]</em></legend>
>+                    <legend>Add <em>[% biblio.title | html %]</em> to <em>[% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%]</em></legend>
>                 [% END %]
>                 <ol>
>                     <li>
>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 d278b001f21..fca7f10843b 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 @@
>             <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a>
>         [% 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>
>+            <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]">[% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%]</a>
>         [% END %]
>         [% WRAPPER breadcrumb_item bc_active= 1 %]
>             <span>Add reserves</span>
>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 dfcb472ba69..50f5057cf71 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' %]
> <title>[% FILTER collapse %]
>-    [% tx("Course details for {course_name}", { course_name = course.course_name }) | html %] &rsaquo;
>+    [% tx("Course details for {course_name}", { course_name = course.course_name }) | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] &rsaquo;
>     [% t("Course reserves") | html %] &rsaquo;
>     [% t("Koha") | html %]
> [% END %]</title>
>@@ -42,7 +42,7 @@
>             <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a>
>         [% END %]
>         [% WRAPPER breadcrumb_item bc_active= 1 %]
>-            <span>Course details for [% course.course_name | html | $HtmlTags tag="em" %]</span>
>+            <span>Course details for [% course.course_name | html | $HtmlTags tag="em" %][%- IF course.section -%] - [% course.section | html | $HtmlTags tag="em" %][%- END -%]</span>
>         [% 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 8c06c578c84..a2cb419c4c4 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 @@
>                             <tbody>
>                                 [% FOREACH c IN courses %]
>                                     <tr>
>-                                        <td><a href="course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %]</a></td>
>+                                        <td><a href="course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %][%- IF c.section -%] - [% c.section | html %][%- END -%]</a></td>
>                                         <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) | html %]</td>
>                                         <td>[% c.course_number | html %]</td>
>                                         <td>[% c.section | html %]</td>
>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 132eae27e6c..0043318b111 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' %]
> <title>[% 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 %] &rsaquo;
>@@ -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 5ce9a87fa41..58797fd6c38 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 %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
>+<title>Course reserves for [% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% BLOCK cssinclude %]
>     [% Asset.css("css/datatables.css") | $raw %]
>@@ -24,7 +24,7 @@
>             <a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a>
>         [% END %]
>         [% WRAPPER breadcrumb_item bc_active= 1 %]
>-            <span>Course reserves for &nbsp;<em>[% course.course_name | html %]</em></span>
>+            <span>Course reserves for &nbsp;<em>[% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%]</em></span>
>         [% END %]
>     [% END #/ WRAPPER breadcrumbs %]
> 
>@@ -33,7 +33,7 @@
>             <div class="col">
>                 <div id="course_reserves" class="maincontent">
> 
>-                    <h1>Course reserves for <em>[% course.course_name | html %]</em></h1>
>+                    <h1>Course reserves for <em>[% course.course_name | html %][%- IF course.section -%] - [% course.section | html %][%- END -%]</em></h1>
>                     <div class="rows">
>                         <ol>
>                             [% IF ( course.term ) %]<li><span class="label">[% tp('Semester', 'Term:') | html %]</span> [% AuthorisedValues.GetByCode( 'TERM', course.term, 1 ) | html %]</li>[% 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 b6e67303f31..7f9b181d8d6 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 @@
>                         <tbody>
>                             [% FOREACH c IN courses %]
>                                 <tr>
>-                                    <td><a href="opac-course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %]</a></td>
>+                                    <td><a href="opac-course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %][%- IF c.section -%] - [% c.section | html %][%- END -%]</a></td>
>                                     <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) | html %]</td>
>                                     <td>[% c.course_number | html %]</td>
>                                     <td>[% c.section | html %]</td>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 35978: 161808 | 161815 | 169200