From 9e5366734b744de2035f0668e7db94e399daacad Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Fri, 22 Oct 2010 14:08:57 +0100 Subject: [PATCH 1/6] Bug 5315: Remove references to obsolete variable nbstatements Trying to see the wood from the trees Signed-off-by: Galen Charlton --- authorities/authorities-home.pl | 2 -- .../intranet-tmpl/prog/en/includes/auth-finder-search.inc | 1 - .../intranet-tmpl/prog/en/includes/authorities-search.inc | 3 --- .../intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl | 3 +-- koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl | 1 - 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl index fbaa1ba3df..edf02a5989 100755 --- a/authorities/authorities-home.pl +++ b/authorities/authorities-home.pl @@ -161,8 +161,6 @@ elsif ( $op eq "delete" ) { } ); - # $template->param("statements" => \@statements, - # "nbstatements" => $nbstatements); } else { ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index 8a725f008a..437b31319d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -1,7 +1,6 @@
- " /> " />
  1. Authority type diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index 9a7b2e3eb0..0a1548f323 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -6,7 +6,6 @@ - " /> - " /> - " /> - " />

    Search on

    @@ -32,4 +31,4 @@

    - \ No newline at end of file + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl index 2b07471699..f0b4cf7837 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl @@ -12,7 +12,6 @@
    - " />
    Authority search
      From ace0ce3f8da9e353f1e06eac0c26ead67b765eed Mon Sep 17 00:00:00 2001 From: Nicole Engard Date: Tue, 21 Sep 2010 08:10:34 -0400 Subject: [PATCH 2/6] bug 5235 : circ receipt should include name Signed-off-by: Ian Walls Signed-off-by: Galen Charlton --- .../prog/en/modules/members/moremember-receipt.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl index a63e15d1ad..83bd151c12 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl @@ -14,7 +14,8 @@


      -Checked out to ">
      +Checked out to
      +(">)

      From f987d35a2241a6178406a3d92ccbf9277087f2d1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 6 Oct 2010 12:13:02 -0400 Subject: [PATCH 3/6] Fix for Bug 5254 - no need to scroll left to right on acq z search - Adding inline preview/import menu to match cataloging z39.50 search - Improving behavior of inline menu on both pages - Adding white space to ISBN/ISSN output on both pages to allow line breaks, improving table width and horizontal scrolling. Signed-off-by: Nicole Engard Signed-off-by: Galen Charlton --- acqui/z3950_search.pl | 9 +++- cataloguing/z3950_search.pl | 11 ++++- .../prog/en/modules/acqui/z3950_search.tmpl | 42 +++++++++++++++---- .../en/modules/cataloguing/z3950_search.tmpl | 17 ++++---- 4 files changed, 60 insertions(+), 19 deletions(-) diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl index 0215873c1e..182e12158e 100755 --- a/acqui/z3950_search.pl +++ b/acqui/z3950_search.pl @@ -254,7 +254,14 @@ sub displayresults { ##Add necessary encoding changes to here -TG my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" ); $oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn}; - $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn}; + # pad | and ( with spaces to allow line breaks in the HTML + $oldbiblio->{isbn} =~ s/\|/ \| /g if $oldbiblio->{isbn}; + $oldbiblio->{isbn} =~ s/\(/ \(/g if $oldbiblio->{isbn}; + + $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn}; + # pad | and ( with spaces to allow line breaks in the HTML + $oldbiblio->{issn} =~ s/\|/ \| /g if $oldbiblio->{issn}; + $oldbiblio->{issn} =~ s/\(/ \(/g if $oldbiblio->{issn}; my ( $notmarcrecord, $alreadyindb, $alreadyinfarm, $imported, $breedingid diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl index 9b6c8f1d19..6311c0b332 100755 --- a/cataloguing/z3950_search.pl +++ b/cataloguing/z3950_search.pl @@ -237,8 +237,15 @@ warn "query ".$query if $DEBUG; # In rel2_2 i am not sure what encoding is so no character conversion is done here ##Add necessary encoding changes to here -TG my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" ); - $oldbiblio->{isbn} =~ s/ |-|\.//g, - $oldbiblio->{issn} =~ s/ |-|\.//g, + $oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn}; + # pad | and ( with spaces to allow line breaks in the HTML + $oldbiblio->{isbn} =~ s/\|/ \| /g if $oldbiblio->{isbn}; + $oldbiblio->{isbn} =~ s/\(/ \(/g if $oldbiblio->{isbn}; + + $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn}; + # pad | and ( with spaces to allow line breaks in the HTML + $oldbiblio->{issn} =~ s/\|/ \| /g if $oldbiblio->{issn}; + $oldbiblio->{issn} =~ s/\(/ \(/g if $oldbiblio->{issn}; my ( $notmarcrecord, $alreadyindb, $alreadyinfarm, $imported, $breedingid diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl index f9f96ae1e3..2219dfa7ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl @@ -14,6 +14,7 @@ $.tablesorter.addParser({ }); $(document).ready(function(){ + $.tablesorter.defaults.widgets = ['zebra']; $("#CheckAll").click(function(){ $(".checkboxed").checkCheckboxes(); return false; @@ -22,23 +23,48 @@ $.tablesorter.addParser({ $(".checkboxed").unCheckCheckboxes(); return false; }); + + $("#closemenu").click(function(e){ + $(".linktools").hide(); + $("tr").removeClass("selected"); + }); + $("#resultst").tablesorter({ sortList: [[1,0]], - headers: { 0: {sorter:false}, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }} + headers: { 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }} }); + /* Inline edit/delete links */ + $("td").click(function(event){ + var $tgt = $(event.target); + $(".linktools").hide(); + $("tr").removeClass("selected"); + if($tgt.is("a")||$tgt.is(":nth-child(5)")||$tgt.is(":nth-child(6)")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")){ + return true; + } else { + var position = $(this).offset(); + var top = position.top+5; + var left = position.left+5; + $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left); + } + var row = $(this).parent(); + row.addClass("selected"); + }); }); //]]> - + -
      +

      Z39.50 Search Points

      @@ -114,13 +140,13 @@ $.tablesorter.addParser({ - +
      " rel="gb_page_center[600,500]">Preview MARC " rel="gb_page_center[600,500]">Preview Card &breedingid=&booksellerid=&basketno=">Order X
      - " title="MARC" rel="gb_page_center[600,500]">MARC" title="MARC" rel="gb_page_center[600,500]">Card - &breedingid=&booksellerid=&basketno=">Order + " title="MARC" rel="gb_page_center[600,500]">MARC" title="MARC" rel="gb_page_center[600,500]">Card + &breedingid=&booksellerid=&basketno=">Order diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl index 55859c7387..f0b11f85fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl @@ -38,18 +38,19 @@ $(document).ready(function(){ }); /* Inline edit/delete links */ $("td").click(function(event){ + var $tgt = $(event.target); $(".linktools").hide(); $("tr").removeClass("selected"); + if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){ + return true; + } else { + var position = $(this).offset(); + var top = position.top+5; + var left = position.left+5; + $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left); + } var row = $(this).parent(); row.addClass("selected"); - - var $tgt = $(event.target); - if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){ return true; } else { - var position = $(this).offset(); - var top = position.top+5; - var left = position.left+5; - $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left); - } }); }); From 65b5bdf8e1022b0f5d3dec2a03a0e147d298e62e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 11 Oct 2010 20:56:41 -0400 Subject: [PATCH 4/6] Fix for Bug 4261 - keyword mapping should show which framework the map is for Signed-off-by: Nicole Engard Signed-off-by: Galen Charlton --- admin/fieldmapping.pl | 10 +++++++++- .../prog/en/modules/admin/fieldmapping.tmpl | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/admin/fieldmapping.pl b/admin/fieldmapping.pl index b7122b0a90..f7eca3c808 100755 --- a/admin/fieldmapping.pl +++ b/admin/fieldmapping.pl @@ -46,8 +46,15 @@ my ($template, $loggedinuser, $cookie) # get framework list my $frameworks = getframeworks(); my @frameworkloop; +my $selected; +my $frameworktext; foreach my $thisframeworkcode (keys %$frameworks) { - my $selected = 1 if $thisframeworkcode eq $framework; + if ($thisframeworkcode eq $framework){ + $selected = 1; + $frameworktext = $frameworks->{$thisframeworkcode}->{'frameworktext'}; + } else { + $selected = 0; + } my %row =(value => $thisframeworkcode, selected => $selected, frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'}, @@ -70,6 +77,7 @@ my $fieldloop = GetFieldMapping($framework); $template->param( frameworkloop => \@frameworkloop, framework => $framework, + frameworktext => $frameworktext, fields => $fieldloop, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl index 3781398a70..0e4e0a0f50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl @@ -25,15 +25,15 @@ $(document).ready(function() {

      Keyword to MARC Mapping

      -

      There are no mappings for this framework.

      +

      There are no mappings for the default framework.

      - + + " \> + + +
    +
    + +

    Items in batch number

    @@ -47,8 +79,14 @@
    -

    There are no items in Batch yet

    -

    Use the toolbar above to add items.

    +
    +
    1. +
      +

      There are no items in Batch yet

      +

      Add items by barcode using the text area above or leave empty to add via item search.

      +
      +
    +
    diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl index 94d56b4e72..370807ca6f 100755 --- a/labels/label-edit-batch.pl +++ b/labels/label-edit-batch.pl @@ -27,6 +27,7 @@ use CGI; use C4::Auth qw(get_template_and_user); use C4::Output qw(output_html_with_http_headers); use C4::Branch qw(get_branch_code_from_name); +use C4::Items qw(GetItemnumberFromBarcode); use C4::Creators 1.000000; use C4::Labels 1.000000; @@ -57,7 +58,8 @@ my $display_columns = [ {_label_number => {label => 'Label Number', link_field my $op = $cgi->param('op') || 'edit'; my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef; my @label_ids = $cgi->param('label_id') if $cgi->param('label_id'); -my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); +my @item_numbers = $cgi->param('item_number') || (); +my $barcode = $cgi->param('barcode') if $cgi->param('barcode'); my $branch_code = get_branch_code_from_name($template->param('LoginBranchname')); @@ -76,6 +78,15 @@ elsif ($op eq 'delete') { $errstr = "batch $batch_id was not deleted." if $err; } elsif ($op eq 'add') { + if ($barcode) { + my @barcodes = split /\n/, $barcode; # $barcode is effectively passed in as a separated list + foreach my $number (@barcodes) { + $number =~ s/\r$//; # strip any naughty return chars + if (my $item_number = GetItemnumberFromBarcode($number)) { # we must test in case an invalid barcode is passed in; we effectively disgard them atm + push @item_numbers, $item_number; + } + } + } $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id); $batch = C4::Labels::Batch->new(branch_code => $branch_code) if $batch == -2; if ($branch_code){ From 92c350fd60c356bb1402e1772e4633a897883032 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 15 Sep 2010 16:26:21 -0400 Subject: [PATCH 6/6] Fix for Bug 5223, 'related subjects' should read 'subjects' Signed-off-by: Ian Walls Signed-off-by: Galen Charlton --- .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index 4756615015..f4bc51f9ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -361,7 +361,7 @@ - Related Subjects: + Subject(s): diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl index 95d3303b5a..e31dbe7c44 100755 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl @@ -381,7 +381,7 @@ - Related Subjects: + Subject(s):