Bug 11529: Add templates for biblio title display. Unify display.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

C4/Biblio.pm

@@ -30,7 +30,6 @@ BEGIN {
         AddBiblio
         GetBiblioData
         GetMarcBiblio
-        GetRecordValue
         GetISBDView
         GetMarcControlnumber
         GetMarcNotes
@@ -643,38 +642,6 @@ sub _check_valid_auth_link {
    return ($field->as_string('abcdefghijklmnopqrstuvwxyz') eq $authorized_heading);
 }
 
-=head2 GetRecordValue
-
-  my $values = GetRecordValue($field, $record);
-
-Get MARC fields from the record using the framework mappings for biblio fields.
-
-=cut
-
-sub GetRecordValue {
-    my ( $field, $record ) = @_;
-
-    if (!$record) {
-        carp 'GetRecordValue called with undefined record';
-        return;
-    }
-
-    my @result;
-    my @mss = GetMarcSubfieldStructureFromKohaField("biblio.$field");
-    foreach my $fldhash ( @mss ) {
-        my $tag = $fldhash->{tagfield};
-        my $sub = $fldhash->{tagsubfield};
-        foreach my $fld ( $record->field($tag) ) {
-            if( $sub eq '@' || $fld->is_control_field ) {
-                push @result, $fld->data if $fld->data;
-            } else {
-                push @result, grep { $_ } $fld->subfield($sub);
-            }
-        }
-    }
-    return \@result;
-}
-
 =head2 GetBiblioData
 
   $data = &GetBiblioData($biblionumber);

C4/HoldsQueue.pm

@@ -134,8 +134,8 @@ sub GetHoldsQueueItems {
     my @bind_params = ();
     my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.itype, biblioitems.itemtype, items.location,
                          items.enumchron, items.cn_sort, biblioitems.publishercode,
-                         biblio.copyrightdate, biblio.subtitle, biblio.part_number,
-                         biblio.part_name,
+                         biblio.copyrightdate, biblio.subtitle, biblio.medium,
+                         biblio.part_number, biblio.part_name
                          biblioitems.publicationyear, biblioitems.pages, biblioitems.size,
                          biblioitems.isbn, items.copynumber
                   FROM tmp_holdsqueue
@@ -158,9 +158,6 @@ sub GetHoldsQueueItems {
         }
         delete $row->{itemtype};
 
-        my @subtitles = split(/ \| /, $row->{'subtitle'} // '' );
-        $row->{'subtitle'} = \@subtitles;
-
         push @$items, $row;
     }
     return $items;

C4/Search.pm

@@ -1938,7 +1938,6 @@ sub searchResults {
 
         SetUTF8Flag($marcrecord);
         my $oldbiblio = TransformMarcToKoha( $marcrecord, $fw );
-        $oldbiblio->{subtitle} = GetRecordValue('subtitle', $marcrecord);
         $oldbiblio->{result_number} = $i + 1;
 
         # add imageurl to itemtype if there is one

C4/ShelfBrowser.pm

@@ -223,7 +223,7 @@ sub GetShelfInfo {
         my $this_biblio = GetBibData($item->{biblionumber});
         next unless defined $this_biblio;
         $item->{'title'} = $this_biblio->{'title'};
-        $item->{'subtitle'} = C4::Biblio::SplitKohaField($this_biblio->{'subtitle'}),
+        $item->{'subtitle'} = $this_biblio->{'subtitle'},
         $item->{'medium'} = $this_biblio->{'medium'};
         $item->{'part_number'} = $this_biblio->{'part_number'};
         $item->{'part_name'} = $this_biblio->{'part_name'};

Koha/Biblio.pm

@@ -80,21 +80,6 @@ sub metadata {
     return Koha::Biblio::Metadata->_new_from_dbic($metadata);
 }
 
-=head3 subtitles
-
-my @subtitles = $biblio->subtitles();
-
-Returns list of subtitles for a record according to the framework.
-
-=cut
-
-sub subtitles {
-    my ( $self ) = @_;
-
-    my @subtitles = split( / \| /, $self->subtitle // '' );
-    return @subtitles;
-}
-
 =head3 can_article_request
 
 my $bool = $biblio->can_article_request( $borrower );

acqui/neworderbiblio.pl

@@ -130,7 +130,6 @@ foreach my $result ( @{$marcresults} ) {
     my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $result );
     my $biblio = TransformMarcToKoha( $marcrecord, '' );
 
-    $biblio->{subtitles} = C4::Biblio::SplitKohaField($biblio->{'subtitle'});
     $biblio->{booksellerid} = $booksellerid;
     push @results, $biblio;
 

basket/basket.pl

@@ -62,7 +62,6 @@ foreach my $biblionumber ( @bibs ) {
     my $dat              = &GetBiblioData($biblionumber);
     next unless $dat;
     my $record           = &GetMarcBiblio({ biblionumber => $biblionumber });
-    $dat->{subtitle}     = GetRecordValue('subtitle', $record);
     my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
     my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
     my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );

catalogue/ISBDdetail.pl

@@ -140,6 +140,7 @@ $template->param (
     ocoins => $biblio->get_coins,
     C4::Search::enabled_staff_search_views,
     searchid            => scalar $query->param('searchid'),
+    biblio              => $biblio,
 );
 
 my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);

catalogue/MARCdetail.pl

@@ -315,7 +315,8 @@ $template->param (
 	marcview => 1,
 	z3950_search_params		=> C4::Search::z3950_search_args($biblio),
 	C4::Search::enabled_staff_search_views,
-    searchid            => scalar $query->param('searchid'),
+    searchid                => scalar $query->param('searchid'),
+    biblio                  => $biblio_object->unblessed,
 );
 
 my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);

catalogue/detail.pl

@@ -141,8 +141,7 @@ my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
 my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
 my $marcseriesarray  = GetMarcSeries($record,$marcflavour);
 my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
-my $marchostsarray  = GetMarcHosts($record,$marcflavour);
-my $subtitle         = GetRecordValue('subtitle', $record);
+my $marchostsarray   = GetMarcHosts($record,$marcflavour);
 
 my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search->unblessed } };
 
@@ -378,7 +377,6 @@ $template->param(
     MARCURLS => $marcurlsarray,
     MARCISBNS => $marcisbnsarray,
     MARCHOSTS => $marchostsarray,
-    subtitle    => $subtitle,
     itemdata_ccode      => $itemfields{ccode},
     itemdata_enumchron  => $itemfields{enumchron},
     itemdata_uri        => $itemfields{uri},

catalogue/moredetail.pl

@@ -110,7 +110,7 @@ if (@hostitems){
         push (@items,@hostitems);
 }
 
-my $subtitle = GetRecordValue('subtitle', $record);
+my $biblio = Koha::Biblios->find( $biblionumber );
 
 my $totalcount=@all_items;
 my $showncount=@items;
@@ -258,7 +258,7 @@ $template->param(
     biblioitemnumber    => $bi,
     itemnumber          => $itemnumber,
     z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)),
-    subtitle            => $subtitle,
+    biblio              => $biblio->unblessed,
 );
 $template->param(ONLY_ONE => 1) if ( $itemnumber && $showncount != @items );
 $template->{'VARS'}->{'searchid'} = $query->param('searchid');
@@ -291,7 +291,6 @@ $template->param (countorders => $count_orders_using_biblio);
 my $count_deletedorders_using_biblio = scalar @deletedorders_using_biblio ;
 $template->param (countdeletedorders => $count_deletedorders_using_biblio);
 
-my $biblio = Koha::Biblios->find( $biblionumber );
 my $holds = $biblio->holds;
 $template->param( holdcount => $holds->count );
 

cataloguing/moveitem.pl

@@ -61,7 +61,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
 
 
 my $biblio = Koha::Biblios->find( $biblionumber );
-$template->param(bibliotitle => $biblio->title);
+$template->param(biblio => $biblio);
 $template->param(biblionumber => $biblionumber);
 
 # If we already have the barcode of the item to move and the biblionumber to move the item to

circ/reserveratios.pl

@@ -164,7 +164,10 @@ while ( my $data = $sth->fetchrow_hashref ) {
             priority           => $data->{priority},
             name               => $data->{borrower},
             title              => $data->{title},
-            subtitle           => C4::Biblio::SplitKohaField($data->{'subtitle'}),
+            subtitle           => $data->{subtitle},
+            medium             => $data->{medium},
+            part_number        => $data->{part_number},
+            part_name          => $data->{part_name},
             author             => $data->{author},
             itemnum            => $data->{itemnumber},
             biblionumber       => $data->{biblionumber},

circ/transferstoreceive.pl

@@ -99,7 +99,7 @@ while ( my $library = $libraries->next ) {
             %getransf = (
                 %getransf,
                 title          => $biblio->title,
-                subtitle       => C4::Biblio::SplitKohaField($biblio->{'subtitle'}),
+                subtitle       => $biblio->subtitle,
                 medium         => $biblio->medium,
                 part_number    => $biblio->part_number,
                 part_name      => $biblio->part_name,

koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss

@@ -3961,6 +3961,12 @@ input.renew {
     width: 100% !important;
 }
 
+.ar-title, .hq-title {
+    .biblio-title {
+        font-weight: bold;
+    }
+}
+
 #stockrotation {
     h3 {
         margin: 30px 0 10px 0;

koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title-head.inc

@@ -0,0 +1,10 @@
+[% IF ( biblio.title ) %]
+    [% biblio.title | html %]
+[% ELSE %]
+    No title
+[% END %]
+[% biblio.medium | html %]
+[% FOREACH subtitle IN biblio.subtitle.split(' \| ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
+    [% subtitle | html %]
+[% END %]
+[% biblio.part_number | html %] [% biblio.part_name | html %]

koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc

@@ -0,0 +1,17 @@
+[% IF ( biblio.title ) %]
+    <span class="biblio-title">[% biblio.title | html %]</span>
+[% ELSE %]
+    No title
+[% END %]
+[% IF ( biblio.medium ) %]
+    <span class="biblio-medium">[% biblio.medium | html %]</span>
+[% END %]
+[% FOREACH subtitle IN biblio.subtitle.split(' \\| ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
+    <span class="subtitle">[% subtitle | html %]</span>
+[% END %]
+[% IF ( biblio.part_number ) %]
+    <span class="part-number">[% biblio.part_number | html %]</span>
+[% END %]
+[% IF ( biblio.part_name ) %]
+    <span class="part-name">[% biblio.part_name | html %]</span>
+[% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc

@@ -22,7 +22,7 @@
                 <td><span title="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td>
                 <td><span title="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td>
                 <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
-                    [% reserveloo.biblio.title | html %] [% FOREACH subtitl IN reserveloo.biblio.subtitles %] [% subtitl | html %] [% reserveloo.biblio.part_number | html %] [% reserveloo.biblio.part_name | html %][% END %]
+                        [% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio %]
                     </a>
                         [% UNLESS ( item_level_itypes ) %]
                             [% IF ( ItemTypes.GetDescription(reserveloo.item.effective_itemtype) ) %]&nbsp; (<b>[% ItemTypes.GetDescription(reserveloo.item.effective_itemtype) | html %]</b>)

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt

@@ -49,8 +49,7 @@
       [% FOREACH biblio IN resultsloop %]
         <tr>
             <td>
-                <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></span>
-                [% FOREACH subtitle IN biblio.subtitles %] <span class="subtitle">[% subtitle | html %]</span>[% END %]
+                <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% INCLUDE 'biblio-title.inc' %]</a></span>
                 [% IF ( biblio.author ) %]  by <span class="author">[% biblio.author | html %]</span>,[% END %]</p>
                 <p>[% IF ( biblio.isbn ) %] [% biblio.isbn | html %][% END %]
                 [% IF ( biblio.pages ) %] - [% biblio.pages | html %][% END %]

koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt

@@ -70,8 +70,7 @@
                             [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
                                 <h3>
                                     <input type="checkbox" class="select_record noprint" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" />
-                                    [% BIBLIO_RESULT.title |html %]
-                                    [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl | html %][% END %]
+                                    [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %]
                                     [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author | html %][% END %]
                                 </h3>
                                 <!-- COinS / Openurl -->
@@ -264,10 +263,7 @@
                                         </td>
                                         <td>
                                             <a href="[% BIBLIO_RESULT.dest | url %]?biblionumber=[% BIBLIO_RESULT.biblionumber | uri %]" class="open_title">
-                                                [% BIBLIO_RESULT.title |html %]
-                                                [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %]
-                                                    [% subtitl | html %]
-                                                [% END %]
+                                                [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %]
                                             </a>
                                             [% BIBLIO_RESULT.author | html %]
                                             <p>

koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt

@@ -33,6 +33,7 @@ Your cart
             <span>
                 [% BIBLIO_RESULT.title | $raw %]
                 [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle | $raw %][% END %]
+                [% BIBLIO_RESULT.part_number | $raw %] [% BIBLIO_RESULT.part_name | $raw %]
             </span>
 
             <p>

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt

@@ -6,7 +6,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    ISBD details
+    ISBD details for [% INCLUDE 'biblio-title-head.inc' %]
   [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -20,7 +20,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    ISBD details
+    ISBD details for [% INCLUDE 'biblio-title.inc' %]
   [% END %]
 </div>
 

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt

@@ -6,7 +6,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    MARC details for [% bibliotitle | html %]
+    MARC details for [% INCLUDE 'biblio-title-head.inc' %]
   [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -21,7 +21,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    MARC details for <i>[% bibliotitle | html %]</i>
+    MARC details for <i>[% INCLUDE 'biblio-title.inc' %]</i>
   [% END %]
 </div>
 

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt

@@ -6,6 +6,7 @@
 [% USE Branches %]
 [% USE Biblio %]
 [% USE ColumnsSettings %]
+[% USE Stash %]
 [% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %]
 [% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %]
 
@@ -34,7 +35,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    Details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]
+    Details for [% INCLUDE 'biblio-title-head.inc' biblio=Stash.stash() %]
   [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -49,7 +50,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    Details for <i>[% title | html %]  [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</i>
+    Details for <i>[% INCLUDE 'biblio-title.inc' biblio=Stash.stash() %]</i>
   [% END %]
 </div>
 

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt

@@ -2,7 +2,7 @@
 [% USE Asset %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; [% biblio.title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %] &rsaquo; Images</title>
+<title>Koha &rsaquo; Catalog &rsaquo; [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Images</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style>
 #largeCover {
@@ -27,7 +27,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i>[% biblio.title | html %]  [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</i></a> &rsaquo; Images</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i>[% INCLUDE 'biblio-title.inc' %]</i></a> &rsaquo; Images</div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -36,7 +36,7 @@
 
 [% INCLUDE 'cat-toolbar.inc' %]
 
-<h3>Images for <i>[% biblio.title | html %]</i></h3>
+<h3>Images for <i>[% INCLUDE 'biblio-title.inc' %]</i></h3>
 <h4>[% biblio.author | html %]</h4>
 
 [% IF ( LocalCoverImages == 1 ) %]

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt

@@ -6,7 +6,7 @@
 [% USE ColumnsSettings %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; Checkout history for [% biblio.title | html %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo; Checkout history for [% INCLUDE 'biblio-title-head.inc' %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -15,14 +15,14 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Checkout history for <i>[% biblio.title | html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Checkout history for <i>[% INCLUDE 'biblio-title.inc' %]</i></div>
 
 <div class="main container-fluid">
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>Checkout history for [% biblio.title | html %]</h1>
+<h1>Checkout history for [% INCLUDE 'biblio-title.inc' %]</h1>
 [% IF biblio.author %]<h3>by [% biblio.author | html %]</h3>[% END %]
 
 [% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt

@@ -6,7 +6,7 @@
 [% USE Price %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; Item details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo; Item details for [% INCLUDE 'biblio-title-head.inc' %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style>h3{padding-top: 1em; border-top: 2px solid #CCCCCC;}#exportLabelexportModal_{border-top: 0px;}</style>
 </head>
@@ -15,7 +15,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Item details for <i>[% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Item details for <i>[% INCLUDE 'biblio-title.inc' %]</i></div>
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt

@@ -4,7 +4,7 @@
 [% USE Branches %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; Stock rotation details for [% biblio.title | html %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo; Stock rotation details for [% INCLUDE 'biblio-title-head.inc' %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="catalog_stockrotation" class="catalog">
@@ -12,7 +12,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Stock rotation details for <i>[% biblio.title | html %][% FOREACH subtitle IN biblio.subtitles %][% subtitle | html %][% END %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Stock rotation details for <i>[% INCLUDE 'biblio-title.inc' %]</i></div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -22,7 +22,7 @@
 <div id="catalogue_detail_biblio">
 
     [% IF no_op_set %]
-        <h1 class="title">Stock rotation details for [% biblio.title | html %]</h1>
+        <h1 class="title">Stock rotation details for [% INCLUDE 'biblio-title.inc' %]</h1>
         [% IF rotas.count > 0 && items.size > 0 %]
 
             <table class="items_table dataTable no-footer" role="grid">

koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt

@@ -75,8 +75,7 @@
             <td><input type="checkbox" class="selection" id="bib[% resultsloo.biblionumber | html %]" name="biblionumber" value="[% resultsloo.biblionumber | html %]" /></td>
             <td>
                 <p>
-                    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber | uri %]">[% resultsloo.title | html %]</a>
-                [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl | html %][% END %]</p>
+                    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber | uri %]">[% INCLUDE 'biblio-title.inc' biblio=resultsloo %]</a>
                 [% IF ( resultsloo.summary ) %]
                     <p>[% resultsloo.summary | html %]</p>
                 [% ELSE %]

koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt

@@ -99,10 +99,7 @@ div#result { margin-top: 1em; }
                     <input type="radio" value="[% record.biblionumber | html %]" id="ref_biblionumber[% record.biblionumber | html %]" name="ref_biblionumber" onclick="changeFramework('[% record.frameworkcode | html %]')" />
                 [% END %]
                 <label for="ref_biblionumber[% record.biblionumber | html %]">
-                    [% record.data.title | html %]
-                    [% FOREACH subtitle IN record.subtitles %]
-                        [% subtitle | html %]
-                    [% END %]
+                    [% INCLUDE 'biblio-title.inc' biblio=record.data %]
                     ([% record.biblionumber | uri %]) <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber | uri %]" class="previewData">View MARC</a>
                 </label>
             </li>

koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt

@@ -1,12 +1,12 @@
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Cataloging &rsaquo; Attach an item to [% bibliotitle | html %]</title>
+<title>Koha &rsaquo; Cataloging &rsaquo; Attach an item to [% INCLUDE 'biblio-title-head.inc' %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="catalog_moveitem" class="catalog">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Attach an item to <i>[% bibliotitle | html %][% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle | html %][% END %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Attach an item to <i>[% INCLUDE 'biblio-title.inc' %]</i></div>
 
 <div class="main container-fluid">
     <div class="row">

koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt

@@ -129,8 +129,7 @@
                                         <td class="ar-title">
                                             <p>
                                                 <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | uri %]">
-                                                    <strong>[% ar.biblio.title | html %]</strong>
-                                                    [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]
+                                                    [% INCLUDE 'biblio-title.inc' biblio=ar.biblio %]
                                                 </a>
                                             </p>
 
@@ -237,8 +236,7 @@
                                         <td class="ar-title">
                                             <p>
                                                 <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ar.biblionumber | uri %]">
-                                                    <strong>[% ar.biblio.title | html %]</strong>
-                                                    [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]
+                                                    [% INCLUDE 'biblio-title.inc' biblio=ar.biblio %]
                                                 </a>
                                             </p>
 

koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt

@@ -45,7 +45,7 @@
                         [% overduesloo.date_due | html %]
                     </td>
                     <td>
-                    [% INCLUDE 'biblio-default-view.inc' biblionumber = overduesloo.biblionumber %][% overduesloo.title | html %] [% IF ( overduesloo.subtitle ) %][% overduesloo.subtitle | html %][% END %]</a> [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %]
+                    [% INCLUDE 'biblio-default-view.inc' biblionumber = overduesloo.biblionumber %][% INCLUDE 'biblio-title.inc' biblio=overduesloo %]</a> [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %]
 
                             <br />Barcode : [% overduesloo.barcode | html %]
                     </td>

koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt

@@ -117,7 +117,7 @@
             [% END %]
             <td>[% checkout_info.barcode | html %]</td>
             <td>
-              <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.biblio.biblionumber | uri %]&amp;type=intra"><strong>[% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle | html %][% END %]</strong></a>[% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes | $raw %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&amp;itemnumber=[% checkout_info.item.itemnumber | html %]#item[% checkout_info.item.itemnumber | html %]">[% checkout_info.item.barcode | html %]</a>
+              <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.biblio.biblionumber | uri %]&amp;type=intra"><strong>[% INCLUDE 'biblio-title.inc' biblio=checkout_info.biblio %]</strong></a>[% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes | $raw %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&amp;itemnumber=[% checkout_info.item.itemnumber | html %]#item[% checkout_info.item.itemnumber | html %]">[% checkout_info.item.barcode | html %]</a>
             </td>
             <td>
               [% IF checkout_info.NEEDSCONFIRMATION %]

koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt

@@ -67,7 +67,7 @@
                 [% IF ( overdueloo.phone ) %]([% overdueloo.phone | html %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile | html %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro | html %])[% END %]</td>
             [% END %]
           <td>[% Branches.GetName( overdueloo.patron.branchcode ) | html %]</td>
-          <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title | html %]  [% overdueloo.subtitle | html %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td>
+          <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% INCLUDE 'biblio-title.inc' biblio=overdueloo %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td>
           <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | uri %]&amp;itemnumber=[% overdueloo.itemnum | uri %]#item[% overdueloo.itemnum | uri %]">[% overdueloo.barcode | html %]</a></td>
           <td>[% overdueloo.itemcallnumber | html %]</td>
           <td>[% overdueloo.replacementprice | $Price %]</td>

koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt

@@ -77,7 +77,8 @@
             <td>
             <p>
                 [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
-                [% reserveloo.title | html %] [% FOREACH s IN reserveloo.subtitle %] [% s | html %][% END %] [% reserveloo.part_number | html %] [% reserveloo.part_name | html %]</a></p>
+                    [% INCLUDE 'biblio-title.inc' biblio=reserveloo %]
+                </a></p>
                 [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
             </td>
         [% ELSE %]

koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt

@@ -38,11 +38,11 @@
 
                             [% ELSIF error == "no_checkout" %]
 
-                                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | uri %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a> ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | html %]&amp;biblionumber=[% item.biblio.biblionumber | html %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> ) is not checked out to a patron.</p>
+                                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | uri %]">[% INCLUDE 'biblio-title.inc' biblio=item.biblio %]</a> ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | html %]&amp;biblionumber=[% item.biblio.biblionumber | html %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> ) is not checked out to a patron.</p>
 
                             [% ELSIF error == "too_many" %]
 
-                                <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been renewed the maximum number of times by [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )</p>
+                                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio %] ( [% item.barcode | html %] ) has been renewed the maximum number of times by [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )</p>
 
                                 [% IF Koha.Preference('AllowRenewalLimitOverride') %]
                                     <form method="post" action="/cgi-bin/koha/circ/renew.pl">
@@ -54,7 +54,7 @@
 
                             [% ELSIF error == "too_soon" %]
 
-                                <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) cannot be renewed before [% soonestrenewdate | $KohaDates %]. </p>
+                                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio %] ( [% item.barcode | html %] ) cannot be renewed before [% soonestrenewdate | $KohaDates %]. </p>
 
                                 [% IF Koha.Preference('AllowRenewalLimitOverride') %]
                                     <form method="post" action="/cgi-bin/koha/circ/renew.pl">
@@ -66,7 +66,7 @@
 
                             [% ELSIF error == "auto_too_soon" %]
 
-                                <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal and cannot be renewed before [% soonestrenewdate | $KohaDates %]. </p>
+                                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal and cannot be renewed before [% soonestrenewdate | $KohaDates %]. </p>
 
                                 [% IF Koha.Preference('AllowRenewalLimitOverride') %]
                                     <form method="post" action="/cgi-bin/koha/circ/renew.pl">
@@ -78,7 +78,7 @@
 
                             [% ELSIF error == "auto_too_late" %]
 
-                                <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal and cannot be renewed anymore since [% latestautorenewdate | $KohaDates %]. </p>
+                                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal and cannot be renewed anymore since [% latestautorenewdate | $KohaDates %]. </p>
 
                                 [% IF Koha.Preference('AllowRenewalLimitOverride') %]
                                     <form method="post" action="/cgi-bin/koha/circ/renew.pl">
@@ -90,7 +90,7 @@
 
                             [% ELSIF error == "auto_account_expired" %]
 
-                                <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal and cannot be renewed because the patron's account is expired</p>
+                                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal and cannot be renewed because the patron's account is expired</p>
 
                                 [% IF Koha.Preference('AllowRenewalLimitOverride') %]
                                     <form method="post" action="/cgi-bin/koha/circ/renew.pl">
@@ -102,7 +102,7 @@
 
                             [% ELSIF error == "auto_renew" or error == "auto_too_much_oweing" %]
 
-                                <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal. </p>
+                                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal. </p>
 
                                 [% IF Koha.Preference('AllowRenewalLimitOverride') %]
                                     <form method="post" action="/cgi-bin/koha/circ/renew.pl">
@@ -114,7 +114,7 @@
 
                             [% ELSIF error == "on_reserve" %]
 
-                                <p>This item is on hold for another patron.</p>
+                                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio %] ( [% item.barcode | html %] ): This item is on hold for another patron.</p>
 
                                 <form method="post" action="/cgi-bin/koha/circ/renew.pl">
                                     <input type="hidden" name="barcode" value="[% item.barcode | html %]"/>
@@ -153,7 +153,7 @@
                     <div class="dialog message">
                         <h3>Item renewed:</h3>
                         <p>
-                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | uri %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a>
+                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | uri %]">[% INCLUDE 'biblio-title.inc' biblio=item.biblio %]</a>
                             ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblio.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> )
                             renewed for
                             [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )

koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt

@@ -21,7 +21,7 @@
         <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
         [% UNLESS blocking_error %]
         &rsaquo;
-        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">[% biblio.title | html %]</a>
+        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">[% INCLUDE 'biblio-title.inc' %]</a>
         &rsaquo;
         Request article
         [% END %]
@@ -33,7 +33,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                    <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | uri %]">[% biblio.title | html %]</a></h1>
+                    <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | uri %]">[% INCLUDE 'biblio-title.inc' %]</a></h1>
                     [% IF no_patrons_found %]
                         <div class="dialog alert">
                             <h3>Patron not found</h3>

koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt

@@ -57,7 +57,7 @@
             <td><p>[% reserveloo.reservecount | html %]</p></td>
             <td><p>[% reserveloo.itemcount | html %]</p></td>
             <td><a href="#" class="ratiolimit">[% reserveloo.thisratio | html %]</a></td>
-            <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title | html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl | html %][% END %][% END %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author | html %][% END %]
+            <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% INCLUDE 'biblio-title.inc' biblio=reserveloo %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author | html %][% END %]
             </td>
             <td>
                   <ul>

koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt

@@ -52,7 +52,7 @@
                 [% END %]
                     <td><p><span title="[% reser.datetransfer | html %]">[% reser.datetransfer | $KohaDates %]</span></p> [% IF ( reser.messcompa ) %]<span class="error">Transfer is [% reser.diff | html %] days late</span>[% END %]</td>
                     <td>
-                        [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title | html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl | html %][% END %][% END %]</a> [% IF ( reser.author ) %]by [% reser.author | html %][% END %]
+                        [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% INCLUDE 'biblio-title.inc' biblio=reser %]</a> [% IF ( reser.author ) %]by [% reser.author | html %][% END %]
                             [% IF ( reser.itemtype ) %] (<b>[% reser.itemtype | html %]</b>)[% END %]
                             <br />Barcode: [% reser.barcode | html %]
                     </td>

koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt

@@ -125,7 +125,7 @@
             <td class="hq-title">
                 <p>
                     <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber | uri %]">
-                        <strong>[% itemsloo.title | html %]</strong> [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %] [% itemsloo.part_number | html %] [% itemsloo.part_name | html %]
+                        [% INCLUDE 'biblio-title.inc' biblio=itemsloo %]
                     </a>
                 </p>
                 <p>

koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt

@@ -57,7 +57,7 @@
       <tbody>
       [% FOREACH hold IN holds %]
         <tr>
-          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblio.biblionumber | uri %]">[% hold.biblio.title | html %]</a></td>
+          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblio.biblionumber | uri %]">[% INCLUDE 'biblio-title.inc' biblio=hold.biblio %]</a></td>
           <td>[% hold.biblio.author | html %]</td>
           <td>[% hold.item.barcode | html %]</td>
           <td>[% Branches.GetName( hold.branchcode ) | html %]</td>

koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt

@@ -74,7 +74,7 @@
           <td>
             <span title="[% issue.issuestimestamp | html %]">[% issue.issuestimestamp | $KohaDates  with_hours => 1 %]</span>
           </td>
-          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber | uri %]">[% issue.title | html %]</a></td>
+          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber | uri %]">[% INCLUDE 'biblio-title.inc' biblio=issue %]</a></td>
 
           <td>[% issue.author | html %]</td>
 

koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt

@@ -10,7 +10,7 @@
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% UNLESS ( multi_hold ) %]
-    <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Place a hold on [% title | html %]</title>
+    <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Place a hold on [% INCLUDE 'biblio-title-head.inc' %]</title>
 [% ELSE %]
     <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Confirm holds</title>
 [% END %]
@@ -22,7 +22,7 @@
 [% INCLUDE 'circ-search.inc' %]
 
 [% UNLESS ( multi_hold ) %]
-    <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">[% title | html %]</a> &rsaquo; Place a hold on [% title | html %]</div>
+    <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">[% biblio.title | html %]</a> &rsaquo; Place a hold on [% INCLUDE 'biblio-title.inc' %]</div>
 [% ELSE %]
     <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; Confirm holds</div>
 [% END %]
@@ -58,7 +58,7 @@
   [% END %]
 
   [% UNLESS ( multi_hold ) %]
-    <h1>Place a hold on [% INCLUDE 'biblio-default-view.inc' %][% title | html %]</a> [% subtitle | html %] [% part_number | html %] [% part_name | html %]</h1>
+    <h1>Place a hold on [% INCLUDE 'biblio-default-view.inc' %][% INCLUDE 'biblio-title.inc' %]</h1>
   [% ELSE %]
     <h1>Confirm holds</h1>
   [% END %]
@@ -187,7 +187,7 @@
             [% END %]
         [% ELSE %]
             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
-            <input type="hidden" name="title" value="[% title | html %]" />
+            <input type="hidden" name="title" value="[% biblio.title | html %]" />
             <input type="hidden" name="rank-request" value="[% fixedRank | html %]" />
         [% END %]
 

koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt

@@ -21,7 +21,8 @@
     </tr>
     [% FOREACH resultsloo IN resultsloop %]
         <tr>
-            <td class="title">[% resultsloo.title | html %] [% resultsloo.subtitle | html %]
+            <td class="title">
+                [% INCLUDE 'biblio-title.inc' biblio=resultsloo %]
             </td>
             <td>
                 [% resultsloo.author | html %]

koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt

@@ -31,7 +31,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 
         [% FOREACH title IN titles %]
             <tr>
-            <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = title.biblionumber %][% title.title | html %][% FOREACH subtitl IN title.subtitle %] [% subtitl | html %][% END %]</a>
+            <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = title.biblionumber %][% INCLUDE 'biblio-title.inc' biblio=title %]</a>
             [% title.author | html %]
             <p>[% IF ( title.publishercode ) %]- [% title.publishercode | html %]
             [% IF ( title.place ) %] [% title.place | html %][% END %][% END %]

koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt

@@ -152,7 +152,7 @@
                 <tr>
                   <td><input type="checkbox" name="record_id" id="record_id_[% biblio.biblionumber | html %]" value="[% biblio.biblionumber | html %]" data-items="[% biblio.itemnumbers.size | html %]" data-issues="[% biblio.issues_count | html %]" data-reserves="[% biblio.holds_count | html %]" /></td>
                   <td><label for="record_id_[% biblio.biblionumber | html %]">[% biblio.biblionumber | html %]</label></td>
-                  <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% biblio.title | html %][% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle %] [% subtitle | html %][% END %][% END %]</a></td>
+                  <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% INCLUDE 'biblio-title.inc' %]</a></td>
                   <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.itemnumbers.size | html %]</a></td>
                   <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.holds_count | html %]</a></td>
                   <td><a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.issues_count | html %]</a></td>

koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt

@@ -31,11 +31,12 @@ Your list: [% shelfname | $raw %]
         <li>
             <span>
                 [% BIBLIO_RESULT.title | $raw %]
-                [% IF ( BIBLIO_RESULT.subtitle.size ) %]
-                  [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %]
+                [% IF ( BIBLIO_RESULT.subtitle ) %]
+                  [% FOREACH subtitle IN BIBLIO_RESULT.subtitle.split(' | ') %]
                     [% subtitle | $raw %]
                   [% END %]
                 [% END %]
+                [% BIBLIO_RESULT.part_number | $raw %] [% BIBLIO_RESULT.part_name | $raw %]
             </span>
 
             <p>

koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt

@@ -212,7 +212,8 @@
                     [% itemsloo.XSLTBloc | $raw %]
                 [% ELSE %]
                     [% INCLUDE 'biblio-default-view.inc' biblionumber = itemsloo.biblionumber %]
-                    [% itemsloo.title | html %][% FOREACH subtitl IN itemsloo.subtitle %] [% subtitl | html %][% END %]</a>
+                        [% INCLUDE 'biblio-title.inc' biblio=itemsloo %]
+                    </a>
                 [% END %]
                     <p class="hold">
                         [% IF ( itemsloo.notforloan ) %]

koha-tmpl/opac-tmpl/bootstrap/en/includes/biblio-title-head.inc

@@ -0,0 +1,9 @@
+[% IF ( biblio.title ) %]
+    [% biblio.title | html %]
+[% ELSE %]
+    No title
+[% END %]
+[% FOREACH subtitle IN biblio.subtitle.split(' \| ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
+    [% subtitle | html %]
+[% END %]
+[% biblio.part_number | html %] [% biblio.part_name | html %]

koha-tmpl/opac-tmpl/bootstrap/en/includes/biblio-title.inc

@@ -0,0 +1,14 @@
+[% IF ( biblio.title ) %]
+    <span class="biblio-title">[% biblio.title | html %]</span>
+[% ELSE %]
+    No title
+[% END %]
+[% FOREACH subtitle IN biblio.subtitle.split(' \| ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
+    <span class="subtitle">[% subtitle | html %]</span>
+[% END %]
+[% IF ( biblio.part_number ) %]
+    <span class="part-number">[% biblio.part_number | html %]</span>
+[% END %]
+[% IF ( biblio.part_name ) %]
+    <span class="part-name">[% biblio.part_name | html %]</span>
+[% END %]

koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc

@@ -53,18 +53,12 @@
                         <td class="title">
                             [% IF ! onlyinfo %]
                                 <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% HOLD.biblionumber | html %]">
-                                    [% HOLD.biblio.title | html %]
-                                    [% FOREACH s IN HOLD.biblio.subtitles %]
-                                        [% s | html %]
-                                    [% END %]
+                                    [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]
                                     [% HOLD.item.enumchron | html %]
                                 </a>
                             [% ELSE %]
                                 <strong>
-                                    [% HOLD.biblio.title | html %]
-                                    [% FOREACH s IN HOLD.biblio.subtitles %]
-                                        [% s | html %]
-                                    [% END %]
+                                    [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]
                                     [% HOLD.item.enumchron | html %]
                                 </strong>
                             [% END %]

koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc

@@ -78,11 +78,7 @@
                         <td class="top">
                             [% item.itemcallnumber | html %]
                             <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&amp;shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser">
-                                [% item.title | html %]
-                                [% FOREACH subtitl IN item.subtitle %]
-                                    [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
-                                    [% subtitl | html %]
-                                [% END %]
+                                [% INCLUDE 'biblio-title.inc' biblio=item %]
                             </a>
                         </td>
                     [% END %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt

@@ -18,7 +18,7 @@
                                 [% END %]
                                 <ul>
                                     [% FOREACH biblio IN biblios %]
-                                        <li> <span class="title">[% biblio.title | html %]</span>
+                                        <li> <span class="title">[% INCLUDE 'biblio-title.inc' %]</span>
                                             [% IF ( biblio.author ) %]<span class="author"> [% biblio.author | html %] </span>[% END %]
                                         </li>
                                     [% END %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt

@@ -67,8 +67,7 @@
                                 [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
                                     <h3>
                                                 <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]">
-                                                [% BIBLIO_RESULT.title | html %]
-                                                [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl | html %] [% END %][% END %]
+                                                [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %]
                                                 [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author | html %][% END %]
                                     </h3>
                                     <!-- COinS / Openurl -->
@@ -257,7 +256,7 @@
                                                 <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]">
                                                 </td>
                                             <td>
-                                                <a href="#" onclick="openBiblio('[% BIBLIO_RESULT.dest | html %]',[% BIBLIO_RESULT.biblionumber | html %])">[% BIBLIO_RESULT.title | html %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl | html %][% END %][% END %]</a>
+                                                <a href="#" onclick="openBiblio('[% BIBLIO_RESULT.dest | html %]',[% BIBLIO_RESULT.biblionumber | html %])">[% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %]</a>
                                                 <!-- COinS / Openurl -->
                                                 <span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.au=[% BIBLIO_RESULT.author | html %]&amp;rft.btitle=[% BIBLIO_RESULT.title |url %]&amp;rft.date=[% BIBLIO_RESULT.publicationyear | html %]&amp;rft.tpages=[% BIBLIO_RESULT.item('size') | html %]&amp;rft.isbn=[% BIBLIO_RESULT.isbn |url %]&amp;rft.aucorp=&amp;rft.place=[% BIBLIO_RESULT.place | html %]&amp;rft.pub=[% BIBLIO_RESULT.publisher |url %]&amp;rft.edition=[% BIBLIO_RESULT.edition | html %]&amp;rft.series=[% BIBLIO_RESULT.series | html %]&amp;rft.genre="></span>
                                                 [% IF ( TagsInputEnabled && loggedinusername ) %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt

@@ -6,6 +6,7 @@
 [% USE Branches %]
 [% USE ColumnsSettings %]
 [% USE AuthorisedValues %]
+[% USE Stash %]
 [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnDetail ) %]
 [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnDetail ) %]
 [% IF Koha.Preference('AmazonAssocTag') %]
@@ -30,7 +31,7 @@
 [% END %]
 
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% title | html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl | html %][% END %]</title>
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% INCLUDE 'biblio-title-head.inc' biblio=Stash.stash() %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
     [% Asset.css("lib/emoji-picker/css/emoji.css") | $raw %]
 </head>
@@ -41,7 +42,7 @@
 <div class="main">
     <ul class="breadcrumb">
         <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
-        <li><a href="#"><span>Details for: </span>[% title | html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl | html %][% END %]</a></li>
+        <li><a href="#"><span>Details for: </span>[% INCLUDE 'biblio-title.inc' biblio=Stash.stash() %]</a></li>
     </ul>
 
     <div class="container-fluid">
@@ -112,7 +113,7 @@
                     [% IF ( OPACXSLTDetailsDisplay ) %]
                         [% XSLTBloc | $raw %]
                     [% ELSE %]
-                        <h1 class="title">[% title | html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl | html %] [% END %]</span>[% END %]</h1>
+                        <h1 class="title">[% INCLUDE 'biblio-title.inc' biblio=Stash.stash() %]</h1>
                         [% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author |url %]">[% author | html %]</a></h5>[% END %]
 
                         <span class="results_summary">[% UNLESS ( item_level_itypes ) %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt

@@ -1,6 +1,6 @@
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Images for: [% biblio.title | html %]</title>
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Images for: [% INCLUDE 'biblio-title-head.inc' %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %]
     <style>
@@ -47,7 +47,7 @@
                     [% ELSE %]
                         <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber |url %]">
                     [% END %]
-                [% END %][% biblio.title | html %]</a> <span class="divider">&rsaquo;</span>
+                [% END %][% INCLUDE 'biblio-title.inc' %]</a> <span class="divider">&rsaquo;</span>
             </li>
             <li><a href="#">Images</a></li>
         </ul>
@@ -75,7 +75,7 @@
                                     [% ELSE %]
                                         <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber |url %]" title="View details for this title">
                                     [% END %]
-                                [% END %][% biblio.title | html %]</a> [% biblio.author | html %]
+                                [% END %][% INCLUDE 'biblio-title.inc' %]</a> [% biblio.author | html %]
                             </h1>
                         </div> <!-- / .span9 -->
                     </div> <!-- / .row-fluid -->

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt

@@ -37,7 +37,7 @@
      <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | $raw %][% SEARCH_RESULT.limit_cgi | url %]&amp;sort_by=[% SEARCH_RESULT.sort_by |uri %]&amp;format=opensearchdescription"/>
      <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |uri %][% SEARCH_RESULT.limit_desc |uri %]" startPage="[% SEARCH_RESULT.page | html %]" />
      <item>
-       <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl | html %][% END %]</title>
+       <title>[% INCLUDE 'biblio-title-head.inc' biblio=SEARCH_RESULT %]</title>
        <dc:identifier>ISBN [% SEARCH_RESULT.isbn | html %]</dc:identifier>
        <link>[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% END %][% END %]</link>
        <description><![CDATA[

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt

@@ -137,11 +137,11 @@
                                                 </td>
                                                 <td>
                                                 [% IF  issue.BiblioDefaultViewmarc %]
-                                                     <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF  issue.subtitle  %][% FOREACH subtitl IN issue.subtitle %][% subtitl | html %][% END %][% END %]</a>
+                                                     <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% INCLUDE 'biblio-title.inc' biblio=issue %]</a>
                                                 [% ELSIF issue.BiblioDefaultViewisbd %]
-                                                     <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl | html %][% END %][% END %]</a>
+                                                     <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% INCLUDE 'biblio-title.inc' biblio=issue %]</a>
                                                 [% ELSE %]
-                                                     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl | html %][% END %][% END %]</a>
+                                                     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% INCLUDE 'biblio-title.inc' biblio=issue %]</a>
                                                 [% END %]
                                                 <p class="results-summary item-details">[% issue.author | html %]</p>
 

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt

@@ -171,12 +171,7 @@
                                     [% END # / bibitemloo.holdable %]
 
                                     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% bibitemloo.biblionumber | html %]">
-                                        [% bibitemloo.title | html %]
-                                        [% IF ( bibitemloo.subtitle ) %]
-                                            [% FOREACH subtitl IN bibitemloo.subtitle %]
-                                                [% subtitl | html %]
-                                            [% END %]
-                                        [% END %]
+                                        [% INCLUDE 'biblio-title.inc' biblio=bibitemloo %]
                                     </a>
                                     [% IF ( bibitemloo.author ) %],  by [% bibitemloo.author | html %][% END %]
                                 </p>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt

@@ -107,12 +107,13 @@
                                                 [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
                                                 <tr>
                                                     <td>
-                                                        <a href="/cgi-bin/koha/opac-search.pl?q=[% SEARCH_RESULT.scan_use |url %]&quot;[% SEARCH_RESULT.title |url %]&quot;">[% SEARCH_RESULT.title | html %]</a>
+                                                        <a href="/cgi-bin/koha/opac-search.pl?q=[% SEARCH_RESULT.scan_use |url %]&quot;[% SEARCH_RESULT.title |url %]&quot;"><span class="biblio-title">[% SEARCH_RESULT.title | html %]</span></a>
                                                     </td>
                                                     <td>
-                                                        [% FOREACH subtitl IN SEARCH_RESULT.subtitle %]
-                                                            [% subtitl | html %]
+                                                        [% FOREACH subtitl IN SEARCH_RESULT.subtitle.split(' | ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
+                                                            <span class="subtitle">[% subtitl | html %]</span>
                                                         [% END %]
+                                                        <span class="part-number">[% SEARCH_RESULT.part_number | html %]</span> <span class="part-name">[% SEARCH_RESULT.part_name | html %]</span>
                                                     </td>
                                                 </tr>
                                                 [% END %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt

@@ -351,15 +351,7 @@
                                                         [% END %]
                                                     [% END %]
 
-                                                    [% IF ( SEARCH_RESULT.title ) %]
-                                                        [% SEARCH_RESULT.title | html %]
-                                                    [% ELSE %]
-                                                        No title
-                                                    [% END %]
-
-                                                    [% FOREACH subtitl IN SEARCH_RESULT.subtitle %]
-                                                        , [% subtitl | html %]
-                                                    [% END %]</a>
+                                                    [% INCLUDE 'biblio-title.inc' biblio=SEARCH_RESULT %]
 
                                                     [% IF ( SEARCH_RESULT.author ) %]
                                                         by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% SEARCH_RESULT.author |url %]" title="Search for works by this author" class="author">[% SEARCH_RESULT.author | html %]</a>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt

@@ -42,7 +42,7 @@
                             </div>
                         [% END # / ERRORs %]
 
-                        <h1>Comments on <i>[% title | html %] [% subtitle | html %]</i></h1>
+                        <h1>Comments on <i>[% INCLUDE 'biblio-title.inc' biblio=Stash.stash() %]</i></h1>
                         [% IF ( author ) %]<h3>[% author | html %]</h3>[% END %]
                         <form id="reviewf" action="/cgi-bin/koha/opac-review.pl[% IF ( cgi_debug ) %]?debug=1[% END %]" method="post">
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt

@@ -32,7 +32,12 @@ Your cart
         <li>
             <span>
                 [% BIBLIO_RESULT.title | $raw %]
-                [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle | $raw %][% END %]
+                [% IF ( BIBLIO_RESULT.subtitle ) %]
+                  [% FOREACH subtitle IN BIBLIO_RESULT.subtitle.split(' | ') %]
+                    [% subtitle | $raw %]
+                  [% END %]
+                [% END %]
+                [% BIBLIO_RESULT.part_number | $raw %] [% BIBLIO_RESULT.part_name | $raw %]
             </span>
 
             <p>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt

@@ -32,11 +32,12 @@ Your list : [% shelfname | $raw %]
         <li>
             <span>
                 [% BIBLIO_RESULT.title | $raw %]
-                [% IF ( BIBLIO_RESULT.subtitle.size ) %]
-                  [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %]
+                [% IF ( BIBLIO_RESULT.subtitle ) %]
+                  [% FOREACH subtitle IN BIBLIO_RESULT.subtitle.split(' | ') %]
                     [% subtitle | $raw %]
                   [% END %]
                 [% END %]
+                [% BIBLIO_RESULT.part_number | $raw %] [% BIBLIO_RESULT.part_name | $raw %]
             </span>
 
             <p>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt

@@ -375,15 +375,7 @@
                                                             [% END %]
                                                         [% END %]
 
-                                                        [% IF ( itemsloo.title ) %]
-                                                            [% itemsloo.title | html %]
-                                                        [% ELSE %]
-                                                            No title
-                                                        [% END %]
-
-                                                        [% FOREACH subtitl IN itemsloo.subtitle %]
-                                                            [% subtitl | html %]
-                                                        [% END %]
+                                                        [% INCLUDE 'biblio-title.inc' biblio=itemsloo %]
                                                         </a>
 
                                                         [% IF ( itemsloo.author ) %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt

@@ -10,7 +10,7 @@
      [% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %]
 	 [% FOREACH review IN reviews %]
      <item>
-       <title>New comment on [% review.title | html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl | html %][% END %]</title>
+       <title>New comment on [% INCLUDE 'biblio-title-head.inc' biblio=review %]</title>
        <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber | html %]#comments</link>
        <description><![CDATA[
 [% IF ( AdlibrisEnabled && review.normalized_isbn ) %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt

@@ -46,8 +46,7 @@
                                                     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber |url %]#comments" title="View details for this title">
                                                 [% END %]
                                             [% END %]
-                                            [% IF ( review.title ) %][% review.title | html %][% ELSE %]No title[% END %]
-                                            [% FOREACH subtitl IN review.subtitle %] [% subtitl | html %][% END %]
+                                            [% INCLUDE 'biblio-title.inc' biblio=review %]
                                             </a>
                                             [% IF ( review.author ) %]
                                                 by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% review.author |url %]" title="Search for works by this author" class="author">[% review.author | html %]</a>

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt

@@ -149,12 +149,7 @@
                                                 [% ELSE %]
                                                     <span class="tdlabel">Title:</span>
                                                     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% MY_TAG.biblionumber | html %]">
-                                                        [% MY_TAG.title | html %]
-                                                        [% IF ( MY_TAG.subtitle ) %]
-                                                            [% FOREACH subtitle IN MY_TAG.subtitle %]
-                                                                [% subtitle | html %]
-                                                            [% END %]
-                                                        [% END %]
+                                                        [% INCLUDE 'biblio-title.inc' biblio=MY_TAG %]
                                                     </a>
                                                     [% IF ( MY_TAG.author ) %]
                                                         by [% MY_TAG.author | html %]

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt

@@ -248,7 +248,7 @@
                                                 </td>[% END # / IF JacketImages %]
 
                                                 <td class="title">
-                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber | html %]">[% ISSUE.title | html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl | html %][% END %]</a>
+                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber | html %]">[% INCLUDE 'biblio-title.inc' biblio=ISSUE %]</a>
                                                     [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron | html %][% END %]
                                                 </td>
 
@@ -520,9 +520,9 @@
                                                 [% END # /IF jacketcell %]
 
                                                 <td>
-                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber | html %]">[% OVERDUE.title | html %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl | html %][% END %]
-                                                    </a>
-                                                    <span class="item-details">[% OVERDUE.author | html %]</span></td>
+                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber | html %]">[% INCLUDE 'biblio-title.inc' biblio=OVERDUE %]</a>
+                                                    <span class="item-details">[% OVERDUE.author | html %]</span>
+                                                </td>
 
                                                 [% UNLESS ( item_level_itypes ) %]
                                                     <td>
@@ -611,7 +611,7 @@
                                         [% FOREACH ar IN logged_in_user.article_requests_current %]
                                                 <td class="article-request-record-title">
                                                     <a class="article-request-title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ar.biblionumber | html %]">
-                                                        [% ar.biblio.title | html %]
+                                                        [% INCLUDE 'biblio-title.inc' biblio=ar.biblio %]
                                                         [% ar.item.enumchron | html %]
                                                     </a>
                                                     [% ar.biblio.author | html %]

opac/opac-addbybiblionumber.pl

@@ -148,6 +148,10 @@ if ($authorized) {
             @biblios,
             {   biblionumber => $biblionumber,
                 title        => $biblio->title,
+                subtitle     => $biblio->subtitle,
+                medium       => $biblio->medium,
+                part_number  => $biblio->part_number,
+                part_name    => $biblio->part_name,
                 author       => $biblio->author,
             }
         );

opac/opac-basket.pl

@@ -108,8 +108,6 @@ foreach my $biblionumber ( @bibs ) {
         }
     }
 
-    my $subtitle         = GetRecordValue('subtitle', $record);
-
     my $hasauthors = 0;
     if($dat->{'author'} || @$marcauthorsarray) {
       $hasauthors = 1;
@@ -150,7 +148,6 @@ foreach my $biblionumber ( @bibs ) {
     $dat->{MARCSERIES}  = $marcseriesarray;
     $dat->{MARCURLS}    = $marcurlsarray;
     $dat->{HASAUTHORS}  = $hasauthors;
-    $dat->{subtitle} = $subtitle;
 
     if ( C4::Context->preference("BiblioDefaultView") eq "normal" ) {
         $dat->{dest} = "opac-detail.pl";

opac/opac-detail.pl

@@ -767,7 +767,6 @@ if (!C4::Context->preference("OPACXSLTDetailsDisplay") ) {
 }
 
 my $marcnotesarray   = GetMarcNotes   ($record,$marcflavour);
-my $subtitle         = GetRecordValue('subtitle', $record);
 
 if( C4::Context->preference('ArticleRequests') ) {
     my $patron = $borrowernumber ? Koha::Patrons->find($borrowernumber) : undef;
@@ -790,7 +789,6 @@ if( C4::Context->preference('ArticleRequests') ) {
                      itemdata_copynumber     => $itemfields{copynumber},
                      itemdata_itemnotes      => $itemfields{itemnotes},
                      itemdata_location       => $itemfields{location_description},
-                     subtitle                => $subtitle,
                      OpacStarRatings         => C4::Context->preference("OpacStarRatings"),
     );
 

opac/opac-readingrecord.pl

@@ -98,7 +98,6 @@ foreach my $issue ( @{$issues} ) {
         my $marc_rec =
           MARC::Record::new_from_xml( $marcxml, 'utf8',
             C4::Context->preference('marcflavour') );
-        $issue->{subtitle} = GetRecordValue( 'subtitle', $marc_rec );
         $issue->{normalized_upc} = GetNormalizedUPC( $marc_rec, C4::Context->preference('marcflavour') );
     }
     # My Summary HTML

opac/opac-reserve.pl

@@ -419,7 +419,7 @@ foreach my $biblioNum (@biblionumbers) {
     my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );
     $biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
     $biblioLoopIter{title} = $biblioData->{title};
-    $biblioLoopIter{subtitle} = C4::Biblio::SplitKohaField($biblioData->{'subtitle'});
+    $biblioLoopIter{subtitle} = $biblioData->{'subtitle'};
     $biblioLoopIter{medium} = $biblioData->{medium};
     $biblioLoopIter{part_number} = $biblioData->{part_number};
     $biblioLoopIter{part_name} = $biblioData->{part_name};

opac/opac-sendshelf.pl

@@ -101,7 +101,6 @@ if ( $email ) {
 
         my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
         my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
-        my $subtitle         = GetRecordValue('subtitle', $record);
 
         my @items = GetItemsInfo( $biblionumber );
 
@@ -110,7 +109,6 @@ if ( $email ) {
         $dat->{MARCAUTHORS}    = $marcauthorsarray;
         $dat->{'biblionumber'} = $biblionumber;
         $dat->{ITEM_RESULTS}   = \@items;
-        $dat->{subtitle}       = $subtitle;
         $dat->{HASAUTHORS}     = $dat->{'author'} || @$marcauthorsarray;
 
         $iso2709 .= $record->as_usmarc();

opac/opac-shelves.pl

@@ -295,7 +295,6 @@ if ( $op eq 'view' ) {
                     $this_item->{notforloan}        = $itemtype->notforloan;
                 }
                 $this_item->{'coins'}           = $biblio->get_coins;
-                $this_item->{'subtitle'}        = GetRecordValue( 'subtitle', $record ),
                 $this_item->{'normalized_upc'}  = GetNormalizedUPC( $record, $marcflavour );
                 $this_item->{'normalized_ean'}  = GetNormalizedEAN( $record, $marcflavour );
                 $this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber( $record, $marcflavour );

opac/opac-showreviews.pl

@@ -96,7 +96,7 @@ for my $result (@$reviews){
 	$result->{normalized_oclc} = GetNormalizedOCLCNumber($record,$marcflavour);
 	$result->{normalized_isbn} = GetNormalizedISBN(undef,$record,$marcflavour);
     $result->{title} = $biblio->title;
-    $result->{subtitle} = GetRecordValue('subtitle', $record );
+    $result->{subtitle} = $biblio->subtitle;
     $result->{medium} = $biblio->medium;
     $result->{part_number} = $biblio->part_number;
     $result->{part_name} = $biblio->part_name;

opac/opac-tags.pl

@@ -257,7 +257,7 @@ if ($loggedinuser) {
         }
         next if ( $should_hide && scalar @all_items == scalar @hidden_itemnumbers );
         $tag->{title} = $biblio->title;
-        $tag->{subtitle} = C4::Biblio::SplitKohaField($biblio->subtitle);
+        $tag->{subtitle} = $biblio->subtitle;
         $tag->{medium} = $biblio->medium;
         $tag->{part_number} = $biblio->part_number;
         $tag->{part_name} = $biblio->part_name;

opac/opac-user.pl

@@ -201,8 +201,6 @@ if ( $pending_checkouts->count ) { # Useless test
         );
         $issue->{rentalfines} = $rental_fines->total_outstanding;
 
-        $issue->{'subtitle'} = C4::Biblio::SplitKohaField($issue->{'subtitle'});
-
         # check if item is renewable
         my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
         ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});

reserve/request.pl

@@ -630,12 +630,8 @@ foreach my $biblionumber (@biblionumbers) {
                      date              => $date,
                      biblionumber      => $biblionumber,
                      findborrower      => $findborrower,
-                     title             => $biblio->title,
-                     subtitle          => $biblio->subtitle,
-                     part_number       => $biblio->part_number,
-                     part_name         => $biblio->part_name,
-                     author            => $biblio->author,
-                     holdsview => 1,
+                     biblio            => $biblio,
+                     holdsview         => 1,
                      C4::Search::enabled_staff_search_views,
                     );
 

serials/subscription-bib-search.pl

@@ -124,6 +124,9 @@ if ( $op eq "do_search" && $query ) {
         $resultsloop{highlight}       = ( $i % 2 ) ? (1) : (0);
         $resultsloop{title}           = $biblio->{'title'};
         $resultsloop{subtitle}        = $biblio->{'subtitle'};
+        $resultsloop{medium}          = $biblio->{'medium'};
+        $resultsloop{part_number}     = $biblio->{'part_number'};
+        $resultsloop{part_name}       = $biblio->{'part_name'};
         $resultsloop{biblionumber}    = $biblio->{'biblionumber'};
         $resultsloop{author}          = $biblio->{'author'};
         $resultsloop{publishercode}   = $biblio->{'publishercode'};

svc/checkouts

@@ -23,7 +23,6 @@ use CGI;
 use JSON qw(to_json);
 
 use C4::Auth qw(check_cookie_auth haspermission get_session);
-use C4::Biblio qw(SplitKohaField);
 use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
 use C4::Overdues qw(GetFine);
 use C4::Context;

t/Biblio.t

@@ -51,12 +51,6 @@ warning_is { $ret = BiblioAutoLink(undef, q{}) }
 
 is( $ret, 0, 'BiblioAutoLink returns zero if not passed rec');
 
-warning_is { $ret = GetRecordValue('100', undef) }
-           { carped => 'GetRecordValue called with undefined record'},
-           "GetRecordValue returns carped warning on undef record";
-
-ok( !defined $ret, 'GetRecordValue returns undef if not passed rec');
-
 warning_is { @arr = LinkBibHeadingsToAuthorities(q{}, q{}) }
            { carped => 'LinkBibHeadingsToAuthorities called on undefined bib record'},
            "LinkBibHeadingsToAuthorities returns carped warning on undef record";

t/db_dependent/Biblio.t

@@ -382,15 +382,14 @@ sub run_tests {
     # Automatic authority creation
     t::lib::Mocks::mock_preference('BiblioAddsAuthorities', 1);
     t::lib::Mocks::mock_preference('AutoCreateAuthorities', 1);
-    my $authorities_mod = Test::MockModule->new( 'C4::Heading' );
+    my $authorities_mod = Test::MockModule->new( 'C4::AuthoritiesMarc' );
     $authorities_mod->mock(
-        'authorities',
+        'SearchAuthorities',
         sub {
             my @results;
-            return \@results;
+            return \@results, 0;
         }
     );
-
     $success = 0;
     $field = create_author_field('Author Name');
     eval {

t/db_dependent/Koha/BiblioUtils.t

@@ -1,55 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright 2014 Catalyst IT
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# Koha is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Koha; if not, see <http://www.gnu.org/licenses>.
-
-use Modern::Perl;
-
-use C4::Context;
-use C4::Biblio qw( AddBiblio );
-use Koha::Database;
-use Koha::Libraries;
-use Koha::Patrons;
-
-use Test::More tests => 4;
-
-use_ok('Koha::Biblio');
-use_ok('Koha::Biblios');
-
-my $schema = Koha::Database->new()->schema();
-$schema->storage->txn_begin();
-
-my $dbh = C4::Context->dbh;
-$dbh->{RaiseError} = 1;
-
-my @branches = Koha::Libraries->search();
-my $borrower = Koha::Patrons->search()->next();
-
-my $biblio = MARC::Record->new();
-$biblio->append_fields(
-    MARC::Field->new( '100', ' ', ' ', a => 'Hall, Kyle' ),
-    MARC::Field->new( '245', ' ', ' ', a => "Test Record", b => "Test Record Subtitle", b => "Another Test Record Subtitle" ),
-);
-my ( $biblionumber, $biblioitemnumber ) = AddBiblio( $biblio, '' );
-
-$biblio = Koha::Biblios->find( $biblionumber );
-my @subtitles = $biblio->subtitles();
-is( $subtitles[0], 'Test Record Subtitle', 'Got first subtitle correctly' );
-is( $subtitles[1], 'Another Test Record Subtitle', 'Got second subtitle correctly' );
-
-$schema->storage->txn_rollback();
-

tags/list.pl

@@ -61,7 +61,6 @@ else {
         my $taglist = get_tag_rows( { term => $tag } );
         for ( @{$taglist} ) {
             my $dat    = &GetBiblioData( $_->{biblionumber} );
-            $dat->{'subtitle'} = C4::Biblio::SplitKohaFields($dat->{'subtitle'}),
             my @items = GetItemsInfo( $_->{biblionumber} );
             $dat->{biblionumber} = $_->{biblionumber};
             $dat->{tag_id}       = $_->{tag_id};

tools/batch_delete_records.pl

@@ -94,7 +94,6 @@ if ( $op eq 'form' ) {
             my $holds_count = $biblio->holds->count;
             $biblio = $biblio->unblessed;
             my $record = &GetMarcBiblio({ biblionumber => $record_id });
-            $biblio->{subtitle} = C4::Biblio::SplitKohaField( $biblio->{subtitle} );
             $biblio->{itemnumbers} = [Koha::Items->search({ biblionumber => $record_id })->get_column('itemnumber')];
             $biblio->{holds_count} = $holds_count;
             $biblio->{issues_count} = C4::Biblio::CountItemsIssued( $record_id );

virtualshelves/sendshelf.pl

@@ -83,7 +83,6 @@ if ($email) {
             embed_items  => 1 });
         my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
         my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
-        my $subtitle         = GetRecordValue( 'subtitle', $record );
 
         my @items = GetItemsInfo($biblionumber);
 
@@ -92,7 +91,6 @@ if ($email) {
         $dat->{MARCAUTHORS}    = $marcauthorsarray;
         $dat->{'biblionumber'} = $biblionumber;
         $dat->{ITEM_RESULTS}   = \@items;
-        $dat->{subtitle}       = $subtitle;
         $dat->{HASAUTHORS}     = $dat->{'author'} || @$marcauthorsarray;
 
         $iso2709 .= $record->as_usmarc();

virtualshelves/shelves.pl

@@ -274,13 +274,16 @@ if ( $op eq 'view' ) {
                 $itemtype = Koha::ItemTypes->find( $itemtype );
                 my $biblio = Koha::Biblios->find( $content->biblionumber );
                 $this_item->{title}             = $biblio->title;
+                $this_item->{subtitle}          = $biblio->subtitle;
+                $this_item->{medium}            = $biblio->medium;
+                $this_item->{part_number}       = $biblio->part_number;
+                $this_item->{part_name}         = $biblio->part_name;
                 $this_item->{author}            = $biblio->author;
                 $this_item->{dateadded}         = $content->dateadded;
                 $this_item->{imageurl}          = $itemtype ? C4::Koha::getitemtypeimagelocation( 'intranet', $itemtype->imageurl ) : q{};
                 $this_item->{description}       = $itemtype ? $itemtype->description : q{}; #FIXME Should this be translated_description ?
                 $this_item->{notforloan}        = $itemtype->notforloan if $itemtype;
                 $this_item->{'coins'}           = $biblio->get_coins;
-                $this_item->{'subtitle'}        = GetRecordValue( 'subtitle', $record );
                 $this_item->{'normalized_upc'}  = GetNormalizedUPC( $record, $marcflavour );
                 $this_item->{'normalized_ean'}  = GetNormalizedEAN( $record, $marcflavour );
                 $this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber( $record, $marcflavour );