@@ -, +, @@ --- circ/branchoverdues.pl | 4 + circ/renew.pl | 5 + circ/returns.pl | 4 + circ/selectbranchprinter.pl | 4 + circ/transferstoreceive.pl | 4 + circ/view_holdsqueue.pl | 4 + circ/waitingreserves.pl | 4 + .../intranet-tmpl/prog/en/includes/circ-nav.inc | 54 ++++++++ .../prog/en/modules/circ/branchoverdues.tt | 7 +- .../prog/en/modules/circ/circulation.tt | 18 ++- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 129 ++++++++++---------- .../prog/en/modules/circ/selectbranchprinter.tt | 7 +- .../prog/en/modules/circ/transferstoreceive.tt | 7 +- .../prog/en/modules/circ/view_holdsqueue.tt | 7 +- .../prog/en/modules/circ/waitingreserves.tt | 7 +- .../prog/en/modules/offline_circ/list.tt | 14 ++- .../prog/en/modules/offline_circ/process_koc.tt | 11 +- 18 files changed, 219 insertions(+), 83 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc --- a/circ/branchoverdues.pl +++ a/circ/branchoverdues.pl @@ -156,4 +156,8 @@ $template->param( location => $location, ); +# Checking if there is a Fast Cataloging Framework +my $fa = getframeworkinfo('FA'); +$template->param( fast_cataloging => 1 ) if (defined $fa); + output_html_with_http_headers $input, $cookie, $template->output; --- a/circ/renew.pl +++ a/circ/renew.pl @@ -26,6 +26,7 @@ use C4::Output; use C4::Circulation; use Koha::DateUtils; use Koha::Database; +use C4::Koha; my $cgi = new CGI; @@ -109,4 +110,8 @@ if ($barcode) { ); } +# Checking if there is a Fast Cataloging Framework +my $fa = getframeworkinfo('FA'); +$template->param( fast_cataloging => 1 ) if (defined $fa); + output_html_with_http_headers( $cgi, $cookie, $template->output ); --- a/circ/returns.pl +++ a/circ/returns.pl @@ -657,5 +657,9 @@ if ( $itemnumber ) { } } +# Checking if there is a Fast Cataloging Framework +my $fa = getframeworkinfo('FA'); +$template->param( fast_cataloging => 1 ) if (defined $fa); + # actually print the page! output_html_with_http_headers $query, $cookie, $template->output; --- a/circ/selectbranchprinter.pl +++ a/circ/selectbranchprinter.pl @@ -138,4 +138,8 @@ $template->param( recycle_loop=> \@recycle_loop, ); +# Checking if there is a Fast Cataloging Framework +my $fa = getframeworkinfo('FA'); +$template->param( fast_cataloging => 1 ) if (defined $fa); + output_html_with_http_headers $query, $cookie, $template->output; --- a/circ/transferstoreceive.pl +++ a/circ/transferstoreceive.pl @@ -124,5 +124,9 @@ $template->param( latetransfers => $latetransfers ? 1 : 0, ); +# Checking if there is a Fast Cataloging Framework +my $fa = getframeworkinfo('FA'); +$template->param( fast_cataloging => 1 ) if (defined $fa); + output_html_with_http_headers $input, $cookie, $template->output; --- a/circ/view_holdsqueue.pl +++ a/circ/view_holdsqueue.pl @@ -76,5 +76,9 @@ $template->param( itemtypeloop => \@itemtypesloop, ); +# Checking if there is a Fast Cataloging Framework +my $fa = getframeworkinfo('FA'); +$template->param( fast_cataloging => 1 ) if (defined $fa); + # writing the template output_html_with_http_headers $query, $cookie, $template->output; --- a/circ/waitingreserves.pl +++ a/circ/waitingreserves.pl @@ -164,6 +164,10 @@ $template->param( ReservesMaxPickUpDelay => $max_pickup_delay, ); +# Checking if there is a Fast Cataloging Framework +my $fa = getframeworkinfo('FA'); +$template->param( fast_cataloging => 1 ) if (defined $fa); + if ($item && $tab eq 'holdsover') { print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover"); } elsif ($cancelall) { --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc @@ -0,0 +1,54 @@ + + + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -8,10 +8,11 @@ -
+
+
@@ -163,4 +164,8 @@
+
+ [% INCLUDE 'circ-nav.inc' %] +
+
[% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -962,12 +962,22 @@ No patron matched [% message %] [% END %]
[% END %] - +[% UNLESS ( borrowers ) %] + [% IF not( borrowernumber and borrower ) %] +
+ [% INCLUDE 'circ-nav.inc' %] +
+ [% END %] +[% END %] -[% UNLESS ( borrowers ) %][% IF borrowernumber and borrower %]
-[% INCLUDE 'circ-menu.inc' %] -
[% END %][% END %] +[% UNLESS ( borrowers ) %] + [% IF borrowernumber and borrower %] +
+ [% INCLUDE 'circ-menu.inc' %] +
+ [% END %] +[% END %]