From c4609ed0decce1a580b3264c9f1c6416f6056a3b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 7 Nov 2012 16:24:40 +0100 Subject: [PATCH] [Signed off] Bug 6813: Followup: FIX tabs and replace all occurrences of duplicate search - tabs was broken - 'duplicate search' have to be replaced with 'duplicate finder' - adds datatable instead of tablesorter Signed-off-by: Melia Meggs --- acqui/acqui-home.pl | 1 - acqui/{duplicatesearch.pl => duplicatefinder.pl} | 4 +- .../prog/en/includes/acquisitions-menu.inc | 2 +- .../prog/en/modules/acqui/duplicatefinder.tt | 148 +++++++++++++++++++ .../prog/en/modules/acqui/duplicatesearch.tt | 154 -------------------- 5 files changed, 151 insertions(+), 158 deletions(-) rename acqui/{duplicatesearch.pl => duplicatefinder.pl} (97%) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatefinder.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatesearch.tt diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index 8b6c584..621c2b0 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -94,7 +94,6 @@ my $totavail_active = 0; my @budget_loop; foreach my $budget ( @{$budget_arr} ) { next unless (CanUserUseBudget($loggedinuser, $budget, $userflags)); - $budget->{budget_code_indent} =~ s/\ /\ \;/g; $budget->{'budget_branchname'} = diff --git a/acqui/duplicatesearch.pl b/acqui/duplicatefinder.pl similarity index 97% rename from acqui/duplicatesearch.pl rename to acqui/duplicatefinder.pl index 32c5763..88a5bcf 100755 --- a/acqui/duplicatesearch.pl +++ b/acqui/duplicatefinder.pl @@ -22,7 +22,7 @@ =head1 NAME -duplicatesearch.pl +duplicatefinder.pl =head1 DESCRIPTION @@ -49,7 +49,7 @@ my $op = $input->param('op'); # getting the template my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "acqui/duplicatesearch.tmpl", + template_name => "acqui/duplicatefinder.tt", query => $input, type => "intranet", authnotrequired => 0, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 9be34c4..a00bd9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -5,7 +5,7 @@ [% IF ( CAN_user_acquisition_budget_manage ) %]
  • Budgets
  • Funds
  • -
  • Duplicate finder
  • +
  • Duplicate finder
  • [% END %] [% IF ( CAN_user_parameters ) %]
  • Currencies
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatefinder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatefinder.tt new file mode 100644 index 0000000..8a5b2bf --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatefinder.tt @@ -0,0 +1,148 @@ +[% USE KohaDates %] +[% INCLUDE 'doc-head-open.inc' %] +Koha › Acquisitions › Duplicate finder + +[% INCLUDE 'doc-head-close.inc' %] + +[% INCLUDE 'datatables-strings.inc' %] + + + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'acquisitions-search.inc' %] + +
    +
    +
    +
    + +

    Duplicate finder

    +

    Please note that search can be slow on a large database.

    +
    + [% IF ( result ) %] +
    + +
    + [% IF (numresults_order) %] + + + + + + + + + + [% FOREACH orders_loo IN orders_loop %] + + + + + + + [% END %] +
    Basket nameOrder numberSummaryVendor
    [% orders_loo.basketname %][% orders_loo.ordernumber %][% orders_loo.title |html %]
    [% orders_loo.author %]
    [% orders_loo.name %]
    + [% ELSE %] + No results found. + [% END %] +
    +
    +

    Suggestion search results

    + [% IF (numresults_sugg) %] + + + + + + + + + + [% FOREACH sugg_loo IN sugg_loop %] + + + + + + + [% END %] +
    TitleAuthorISBNStatus
    [% sugg_loo.title %][% sugg_loo.author %][% sugg_loo.isbn %][% sugg_loo.STATUS %]
    + [% ELSE %] + No results found. + [% END %] +
    +
    +

    Catalog search results

    + [% IF (numresults_bib) %] + + + + + + + + + [% FOREACH bib_loo IN bib_loop %] + + + + + + [% END %] +
    TitleAuthorISBN
    [% bib_loo.title %][% bib_loo.author %][% bib_loo.isbn %]
    + [% ELSE %] + No results found. + [% END %] +
    +
    +[% ELSE %] +

    Please enter search terms.

    +[% END %] + +
    +
    +
    +
    +
    + +
    +

    Find duplicates:

    +
      +
    1. +
    2. +
    3. +
    + Clear All +
    +
    +[% INCLUDE 'acquisitions-menu.inc' %] +
    +
    +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatesearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatesearch.tt deleted file mode 100644 index fcf71cf..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatesearch.tt +++ /dev/null @@ -1,154 +0,0 @@ -[% USE KohaDates %] -[% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › Duplicate finder -[% INCLUDE 'doc-head-close.inc' %] - - - - - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'acquisitions-search.inc' %] - - -
    -
    -
    -
    - -

    Duplicate finder

    -

    Please note that search can be slow on a large database.

    -
    - [% IF ( result ) %] -
    - -
    - [% IF (numresults_order) %] - [% INCLUDE 'table-pager.inc' perpage='10' %] - - [% ELSE %] -
    - [% END %] - - - - - - - - - [% FOREACH orders_loo IN orders_loop %] - - - - - - - [% END %] -
    Basket nameOrder numberSummaryVendor
    [% orders_loo.basketname %][% orders_loo.ordernumber %][% orders_loo.title |html %]
    [% orders_loo.author %]
    [% orders_loo.name %]
    -
    -
    -

    Suggestion search results

    - [% IF (numresults_sugg) %] - [% INCLUDE 'table-pager.inc' perpage='10' %] - - [% ELSE %] -
    - [% END %] - - - - - - - - - [% FOREACH sugg_loo IN sugg_loop %] - - - - - - - [% END %] -
    TitleAuthorISBNStatus
    [% sugg_loo.title %][% sugg_loo.author %][% sugg_loo.isbn %][% sugg_loo.STATUS %]
    -
    -
    -

    Catalog search results

    - [% IF (numresults_bib) %] - [% INCLUDE 'table-pager.inc' perpage='10' %] - - [% ELSE %] -
    - [% END %] - - - - - - - - [% FOREACH bib_loo IN bib_loop %] - - - - - - [% END %] -
    TitleAuthorISBN
    [% bib_loo.title %][% bib_loo.author %][% bib_loo.isbn %]
    -
    -
    -[% ELSE %] -

    Please enter search terms.

    -[% END %] - -
    -
    -
    -
    -
    - -
    -

    Find duplicates:

    -
      -
    1. -
    2. -
    3. -
    - Clear All -
    -
    -[% INCLUDE 'acquisitions-menu.inc' %] -
    -
    -[% INCLUDE 'intranet-bottom.inc' %] -- 1.7.2.5