From srdjan at catalyst.net.nz Mon Jun 3 02:25:20 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Mon, 3 Jun 2013 12:25:20 +1200 Subject: [Koha-patches] [PATCH] Bug 10283: Hide "many items" on second tab when using OpacSeparateHoldings Message-ID: <1370219120-10505-1-git-send-email-srdjan@catalyst.net.nz> From: Jonathan Druart If there are over 50 items in the holdings or Other holdings tab, the warning and link 'This record has many physical items. Click here to view them all.' is only shown for the first tab. Test plan: - Switch on the OpacSeparateHoldings pref. - Go on a biblio detail page at the OPAC with more than 50 items - Check that the 'view all' link appears on the second tab. Signed-off-by: Srdjan --- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 10 +++++++--- opac/opac-detail.pl | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 1effd07..bfd784f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -1018,8 +1018,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
[% IF ( itemloop.size ) %] - [% IF ( lotsofitems ) %] -

This record has many physical items. Click here to view them all.

+ [% IF ( lotsofholdingsitems ) %] +

This record has many physical items. Click here to view them all.

[% ELSE %] [% INCLUDE items_table items=itemloop tab="holdings" %] [% END %] @@ -1054,7 +1054,11 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% IF (SeparateHoldings) %]
[% IF (otheritemloop.size) %] - [% INCLUDE items_table items=otheritemloop tab="otherholdings" %] + [% IF lotsofothersholdingsitems %] +

This record has many physical items. Click here to view them all.

+ [% ELSE %] + [% INCLUDE items_table items=otheritemloop tab="otherholdings" %] + [% END %] [% ELSE %] No other items. [% END %] diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 9d0851f..b4ad6a5 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -624,7 +624,10 @@ if (scalar(@itemloop) == 0 || scalar(@otheritemloop) == 0) { # TODO: The limit of 50 could be a syspref my $viewallitems = $query->param('viewallitems'); if (scalar(@itemloop) >= 50 && !$viewallitems) { - $template->param('lotsofitems' => 1); + $template->param('lotsofholdingsitems' => 1); +} +if (scalar(@otheritemloop) >= 50 && !$viewallitems) { + $template->param('lotsofothersholdingsitems' => 1); } ## get notes and subjects from MARC record -- 1.8.1.2 From srdjan at catalyst.net.nz Mon Jun 3 03:21:15 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Mon, 3 Jun 2013 13:21:15 +1200 Subject: [Koha-patches] [PATCH] Bug 10258: Remove erroneous call to haspermission in basket.pl Message-ID: <1370222475-15336-1-git-send-email-srdjan@catalyst.net.nz> From: Marcel de Rooy First parameter (userid) was not passed making the test useless. Removed the test for now. Current behavior does not change. Just adding the first parameter here does not make sense. Using the permission here needs more than that. Test plan: Open a closed basket in Acquisition. Check if you see all available basketgroups in the combo at the right side. Signed-off-by: Srdjan --- acqui/basket.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 7eff6e4..34e22c8 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -207,8 +207,12 @@ if ( $op eq 'delete_confirm' ) { } #if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups my ($basketgroup, $basketgroups); - my $member = GetMember(borrowernumber => $loggedinuser); - if ($basket->{closedate} && haspermission({ acquisition => 'group_manage'} )) { + # my $member = GetMember(borrowernumber => $loggedinuser); + # FIXME $member is not used in current code (BZ 10258) + # FIXME The following code should check the permission { acquisition => 'group_manage'} + # Removed an invalid call to haspermission for now. No behavior change. + # Only adding $member->{userid} is not the solution.. + if ($basket->{closedate}) { $basketgroups = GetBasketgroups($basket->{booksellerid}); for my $bg ( @{$basketgroups} ) { if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){ -- 1.8.1.2 From srdjan at catalyst.net.nz Mon Jun 3 03:47:23 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Mon, 3 Jun 2013 13:47:23 +1200 Subject: [Koha-patches] [PATCH] [Signed-Off] Bug 10354 - Don't show optgroup Libraries when no search groups are defined Message-ID: <1370224043-17757-1-git-send-email-srdjan@catalyst.net.nz> From: Owen Leonard In the OPAC, if there are no search groups defined, there's no reason to embed library choices inside an . should only be used to differentiate the list of individual libraries from search groups. This patch removes the when no search groups are enabled. To test, apply the patch and: - Enable OpacAddMastheadLibraryPulldown. - Create a library search group in Administration -> Libraries and Groups and enable it by checking the "show in search pulldown" box. - View the library pulldown in the OPAC search bar. Libraries and groups should be separated into s. - Disable your library search group and refresh the OPAC page. The pulldown of libraries should now display libraries with no . Signed-off-by: Srdjan --- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index f9edb01..651e669 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -87,13 +87,13 @@ [% IF ( OpacAddMastheadLibraryPulldown ) %] + [% UNLESS orders_loop.size %] + Delete + [% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 52d2ecc..16c1b61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -80,6 +80,9 @@ $(document).ready(function() { [% ELSE %] Close [% END %] + [% UNLESS invoice.receivedbiblios || invoice.receiveditems %] + / Delete + [% END %] [% END %] diff --git a/t/Acquisition/Invoice.t b/t/Acquisition/Invoice.t index a887965..0a37f44 100755 --- a/t/Acquisition/Invoice.t +++ b/t/Acquisition/Invoice.t @@ -3,7 +3,7 @@ use Modern::Perl; use C4::Context; -use Test::More tests => 47; +use Test::More tests => 49; use Test::MockModule; use_ok('C4::Acquisition'); @@ -129,3 +129,24 @@ is(scalar(@$history), 1); @bound_params = @{ $history->[0]->{bound_params} }; is(scalar(@bound_params), 1); is($bound_params[0], 42); +my $checkordersrs = [ + [qw(COUNT)], + [2] +]; + +$dbh->{mock_add_resultset} = $checkordersrs; +is(DelInvoice(42), undef, "Invoices with items don't get deleted"); + +$checkordersrs = [ + [qw(COUNT)], + [0] +]; + +my $deleters = [ + [qw(COUNT)], + [1] +]; + +$dbh->{mock_add_resultset} = $checkordersrs; +$dbh->{mock_add_resultset} = $deleters; +ok(DelInvoice(42), "Invoices with items do get deleted"); -- 1.8.1.2 From srdjan at catalyst.net.nz Mon Jun 3 07:32:53 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Mon, 3 Jun 2013 17:32:53 +1200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10090: Add itemtype description instead of code Message-ID: <1370237573-9469-1-git-send-email-srdjan@catalyst.net.nz> From: Jonathan Druart On ordered.pl and spent.pl, the itemtype codes are displayed, instead of descriptions. Links for the ordernumber should be changed. In ordered.pl, we are redirected to the receive page. In spent.pl, the links are deleted. Signed-off-by: Srdjan --- Koha/Template/Plugin/KohaItemType.pm | 44 ++++++++++++++++++++++ .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 5 ++- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 5 ++- 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 Koha/Template/Plugin/KohaItemType.pm diff --git a/Koha/Template/Plugin/KohaItemType.pm b/Koha/Template/Plugin/KohaItemType.pm new file mode 100644 index 0000000..efa3da3 --- /dev/null +++ b/Koha/Template/Plugin/KohaItemType.pm @@ -0,0 +1,44 @@ +package Koha::Template::Plugin::KohaItemType; + +# 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 2 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; +use Template::Plugin; +use base qw( Template::Plugin ); + +use C4::Koha; + +=pod + +This plugin allows one to get the description for an item type from within a template. + +First, include the line '[% USE KohaItemType %]' at the top +of the template to enable the plugin. + +To use, call KohaItemType.GetByCode with the code of the item type. + +For example: [% KohaItemType.GetByCode( 'CF' ) %] +will print the OPAC description for the CF value stored in itemtypes.description. + +=cut + +sub GetByCode { + my ( $self, $code ) = @_; + my $itemtype = getitemtypeinfo( $code ); + return $itemtype->{description}; +} + +1; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index 23441f8..56ce1ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE KohaItemType %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Ordered @@ -59,7 +60,7 @@ [% IF ( CAN_user_acquisition_order_manage ) %] - [% order.ordernumber %] + [% order.ordernumber %] [% ELSE %] [% order.ordernumber %] [% END %] @@ -68,7 +69,7 @@ [% order.booksellerid %] - [% order.itype %] + [% KohaItemType.GetByCode( order.itype ) %] [% order.left %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index 95634d0..8e7b6b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE KohaItemType %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Spent @@ -62,7 +63,7 @@ [% order.title %] - [% order.ordernumber %] + [% order.ordernumber %] [% order.booksellerid %] @@ -71,7 +72,7 @@ [% order.invoicenumber %] - [% order.itype %] + [% KohaItemType.GetByCode( order.itype ) %] [% order.quantityreceived %] -- 1.8.1.2 From tomascohen at gmail.com Mon Jun 3 20:15:09 2013 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Mon, 3 Jun 2013 15:15:09 -0300 Subject: [Koha-patches] [PATCH] Bug 10398 - Provide xml_valid.t for checking XML validity Message-ID: <1370283309-31640-1-git-send-email-tomascohen@gmail.com> This patch adds a script that checks every XML file in Koha's source tree using xmllint. To test: - Run find . -name '*.xml' - Apply the patch, and run prove -v xt/xml_valid.t - Verify every xml file was tested. Regards To+ Sponsored-by: Universidad Nacional de C?rdoba --- xt/xml_valid.t | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100755 xt/xml_valid.t diff --git a/xt/xml_valid.t b/xt/xml_valid.t new file mode 100755 index 0000000..6caca6c --- /dev/null +++ b/xt/xml_valid.t @@ -0,0 +1,53 @@ +#!/usr/bin/perl + +# Copyright (C) 2013 Universidad Nacional de Cordoba +# +# 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 2 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; +use Test::More; + +BEGIN { + use FindBin; + eval { require "$FindBin::Bin/../misc/kohalib.pl" }; +} + +my $filebase = "$FindBin::Bin/.."; +my @files = `find $filebase -name '*.xml'`; +my @command = qw(xmllint --noout); + +plan tests => scalar @files; + +foreach my $file (@files) { + chomp $file; + ok(system(@command, "$file") == 0, "XML validation for $file"); +} + +=head1 NAME + +xml_valid.t + +=head1 DESCRIPTION + +Tests every XML file inside Koha is valid using xmllint. + +=head1 USAGE + +From everywhere: + +prove xt/xml_valid.t + +=cut -- 1.7.9.5 From srdjan at catalyst.net.nz Tue Jun 4 03:54:59 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Tue, 4 Jun 2013 13:54:59 +1200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10291: Clarify misleading variable name Message-ID: <1370310899-9740-1-git-send-email-srdjan@catalyst.net.nz> From: Colin Campbell Remove the unrequired extra processing and pass the array of itemnumbers as itemnumbers_array Signed-off-by: Srdjan --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 4 ++-- tools/batchMod.pl | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt index 5404f02..292b81f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -119,8 +119,8 @@ for( x=0; xToo many items ([% too_many_items %]) to display individually.

- [% FOREACH itemnumbers_hashre IN itemnumbers_hashref %] - + [% FOREACH itemnumber IN itemnumbers_array %] + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt index 01d0bc1..de67517 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -141,8 +141,8 @@ $(document).ready(function(){ [% IF ( too_many_items ) %]

Too many items ([% too_many_items %]): not displaying each one individually.

- [% FOREACH itemnumbers_hashre IN itemnumbers_hashref %] - + [% FOREACH itemnumber IN itemnumbers_array %] + [% END %] [% END %] diff --git a/tools/batchMod.pl b/tools/batchMod.pl index c299487..ec0ef01 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -261,8 +261,7 @@ if ($op eq "show"){ } else { $template->param("too_many_items" => scalar(@itemnumbers)); # Even if we do not display the items, we need the itemnumbers - my @itemnumbers_hashref = map {{itemnumber => $_}} @itemnumbers; - $template->param("itemnumbers_hashref" => \@itemnumbers_hashref); + $template->param(itemnumbers_array => \@itemnumbers); } # now, build the item form for entering a new item my @loop_data =(); -- 1.8.1.2 From srdjan at catalyst.net.nz Tue Jun 4 04:11:53 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Tue, 4 Jun 2013 14:11:53 +1200 Subject: [Koha-patches] [PATCH] Bug 10366: Alert librarian if an invoice number is duplicated Message-ID: <1370311913-11301-1-git-send-email-srdjan@catalyst.net.nz> From: Jared Camins-Esakov Some vendors ship materials from the same invoice in multiple packages. In those cases, it would be good to notify the librarian when they enter a duplicate invoice number, so that they can continue receiving on the previously-created invoice, rather than creating an invoice with a duplicate number. Signed-off-by: Srdjan --- acqui/parcels.pl | 34 +++++++++++++++++----- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 13 +++++++++ .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 29 ++++++++++++++++++ .../en/modules/admin/preferences/acquisitions.pref | 6 ++++ 5 files changed, 75 insertions(+), 8 deletions(-) diff --git a/acqui/parcels.pl b/acqui/parcels.pl index 405ff64..7c03f7b 100755 --- a/acqui/parcels.pl +++ b/acqui/parcels.pl @@ -98,14 +98,32 @@ our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( } ); -if($op and $op eq 'new') { - my $invoicenumber = $input->param('invoice'); - my $shipmentdate = $input->param('shipmentdate'); - my $shipmentcost = $input->param('shipmentcost'); - my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid'); - if($shipmentdate) { - $shipmentdate = C4::Dates->new($shipmentdate)->output('iso'); +my $invoicenumber = $input->param('invoice'); +my $shipmentdate = $input->param('shipmentdate'); +my $shipmentcost = $input->param('shipmentcost'); +my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid'); +if($shipmentdate) { + $shipmentdate = C4::Dates->new($shipmentdate)->output('iso'); +} + +if ( $op and $op eq 'new' ) { + if ( C4::Context->preference('AcqWarnOnDuplicateInvoice') ) { + my @invoices = GetInvoices( + supplierid => $booksellerid, + invoicenumber => $invoicenumber, + ); + if ( $#invoices > 0 ) { + $template->{'VARS'}->{'duplicate_invoices'} = \@invoices; + $template->{'VARS'}->{'invoicenumber'} = $invoicenumber; + $template->{'VARS'}->{'shipmentdate'} = $shipmentdate; + $template->{'VARS'}->{'shipmentcost'} = $shipmentcost; + $template->{'VARS'}->{'shipmentcost_budgetid'} = + $shipmentcost_budgetid; + } } + $op = 'confirm' unless $template->{'VARS'}->{'duplicate_invoices'}; +} +if ($op and $op eq 'confirm') { my $invoiceid = AddInvoice( invoicenumber => $invoicenumber, booksellerid => $booksellerid, @@ -114,7 +132,7 @@ if($op and $op eq 'new') { shipmentcost_budgetid => $shipmentcost_budgetid, ); if(defined $invoiceid) { - # Successful 'Add' +# Successful 'Add' print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid"); exit 0; } else { diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 31485bc..6c5f073 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -427,3 +427,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo'); INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowHoldNotes',0,'Show hold notes on OPAC','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AcqWarnOnDuplicateInvoice','0','Warn librarians when they try to create a duplicate invoice', '', 'YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f3a90d8..dee9963 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6984,6 +6984,19 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( } +$DBversion = "3.13.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do( + q{ +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AcqWarnOnDuplicateInvoice','0','Warn librarians when they try to create a duplicate invoice', '', 'YesNo'); +} + ); + print +"Upgrade to $DBversion done (Bug 10366 - Add system preference to enabling warning librarian when invoice is duplicated)\n"; + SetVersion($DBversion); +} + + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 39c53e2..26e4af8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -1,3 +1,4 @@ +[% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Receive shipment from vendor [% name %] @@ -38,6 +39,34 @@ [% END %]

Receive shipment from vendor [% name %]

+ [% IF duplicate_invoices %] +
+

This invoice number has already been used. Would you like to receive on an existing invoice?

+ + + + [% FOREACH invoice IN duplicate_invoices %] + + + + + + [% END %] + +
Invoice no.Shipment date
[% invoice.invoicenumber %][% invoice.shipmentdate | $KohaDates %]Receive
+
+ + + + + + + +
+
+ [% END %] + + [% IF ( count ) %]

[% count %] shipments

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index 1ec49ff..cb5a4c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -35,6 +35,12 @@ Acquisitions: - Default tax rates are - pref: gist - (enter in numeric form, 0.12 for 12%. First is the default. If you want more than 1 value, please separate with |) + - + - pref: AcqWarnOnDuplicateInvoice + choices: + yes: Warn + no: "Do not warn" + - when the librarian tries to create an invoice with a duplicate number. Printing: - -- 1.8.1.2 From srdjan at catalyst.net.nz Tue Jun 4 06:40:52 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Tue, 4 Jun 2013 16:40:52 +1200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 9779 - Remove global include of YUI assets from the staff client Message-ID: <1370320852-24774-1-git-send-email-srdjan@catalyst.net.nz> From: Owen Leonard There are no pages in the staff client which use YUI JS assets other than basketgroups.tt. The links to YUI assets can therefore be removed from the global include and put directly into the basket groups template. Signed-off-by: Srdjan --- koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc | 6 ------ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 14394e6..ee7f3f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -24,12 +24,6 @@ [% END %] - - - - - - [% INCLUDE 'validator-strings.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 853c95a..4c5e604 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -5,6 +5,10 @@ [% INCLUDE 'doc-head-close.inc' %] + + + + [% IF ( grouping ) %] -- 1.8.1.2 From srdjan at catalyst.net.nz Tue Jun 4 08:09:27 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Tue, 4 Jun 2013 18:09:27 +1200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 9558 - Customize CSS for mobile Message-ID: <1370326167-32452-1-git-send-email-srdjan@catalyst.net.nz> From: Zachary Spalding It is possible to use an environment variable to specify a custom stylesheet for different libraries in a multi-library system: $ENV{'OPAC_CSS_OVERRIDE'}. This patch adds an additional option to override the CCSR theme's mobile stylesheet. The changes in this patch are courtesy Zachary Spalding as described in Bug 9558. Patch and test plan created by Owen Leonard. Signed-off-by: Srdjan --- C4/Auth.pm | 1 + koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc | 3 +++ 2 files changed, 4 insertions(+) diff --git a/C4/Auth.pm b/C4/Auth.pm index 9dba387..d68b41e 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -409,6 +409,7 @@ sub get_template_and_user { OPACBaseURL => ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} . ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}"), opac_css_override => $ENV{'OPAC_CSS_OVERRIDE'}, + opac_css_override_mobile => $ENV{'OPAC_CSS_OVERRIDE_MOBILE'}, opac_search_limit => $opac_search_limit, opac_limit_override => $opac_limit_override, OpacBrowser => C4::Context->preference("OpacBrowser"), diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc index fcbab2a..eb71770 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc @@ -18,6 +18,9 @@ [% END %] [% END %] +[% IF ( opac_css_override_mobile ) %] + + [% END %] [% IF ( opac_css_override ) %] [% END %] -- 1.8.1.2 From tomascohen at gmail.com Tue Jun 4 15:22:19 2013 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Tue, 4 Jun 2013 10:22:19 -0300 Subject: [Koha-patches] [PATCH] Bug 10399 - rebuild_zebra.pl should reset the indexes with -r even if zebraqueue empty Message-ID: <1370352139-17500-1-git-send-email-tomascohen@gmail.com> This patch add the reset_indexes sub to the rebuild_zebra.pl script. And changes the scripts' logic to run it in case -r was passed and there are no records pending on the zebraqueue table. Regards To+ --- misc/migration_tools/rebuild_zebra.pl | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl index a46526d..b5e2063 100755 --- a/misc/migration_tools/rebuild_zebra.pl +++ b/misc/migration_tools/rebuild_zebra.pl @@ -271,9 +271,12 @@ sub index_records { if %$records_deleted; do_indexing($record_type, 'update', "$directory/upd_$record_type", $reset, $noshadow, $record_fmt, $zebraidx_log_opt) if $num_records_exported; + } elsif ($num_records_exported or $skip_export) { + do_indexing($record_type, 'update', "$directory/$record_type", $reset, $noshadow, $record_fmt, $zebraidx_log_opt); } else { - do_indexing($record_type, 'update', "$directory/$record_type", $reset, $noshadow, $record_fmt, $zebraidx_log_opt) - if ($num_records_exported or $skip_export); + if ( $reset ) { + reset_index($record_type, $record_fmt, $zebraidx_log_opt); + } } } } @@ -679,6 +682,19 @@ sub do_indexing { } +sub reset_indexes { + + my ($record_type, $record_format, $zebraidx_log_opt) = @_; + + my $zebra_server = ($record_type eq 'biblio') ? 'biblioserver' : 'authorityserver'; + my $zebra_db_name = ($record_type eq 'biblio') ? 'biblios' : 'authorities'; + my $zebra_config = C4::Context->zebraconfig($zebra_server)->{'config'}; + + system("zebraidx -c $zebra_config $zebraidx_log_opt -g $record_format -d $zebra_db_name init"); + +} + + sub print_usage { print <<_USAGE_; $0: reindex MARC bibs and/or authorities in Zebra. -- 1.8.1.2 From oleonard at myacpl.org Tue Jun 4 19:36:39 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Tue, 4 Jun 2013 13:36:39 -0400 Subject: [Koha-patches] [PATCH] Bug 10406 - Remove obsolete CSS related to YUI autocomplete Message-ID: <1370367399-9585-1-git-send-email-oleonard@myacpl.org> staff-global.css contains CSS which related to the old YUI autocomplete widget. Since this has been replaced with jQueryUI the CSS is now unused and can be removed. To test, apply the patch and confirm that autocomplete looks correct and works correctly in the global circulation search box (with CircAutocompl enabled) and in the overdues report when entering a value into the filter form in a patron attribute field which is linked to an authorized value. --- .../intranet-tmpl/prog/en/css/staff-global.css | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 49f857d..cda7494 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1799,22 +1799,6 @@ span.permissiondesc { padding : .5em; } -/* borrower autocomplete */ -#borrowerautocomplete { width: 500px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */ -.autocomplete .yui-ac-highlight , -.autocomplete .yui-ac-highlight .sample-result, -.autocomplete .yui-ac-highlight .sample-query { color:#FFF; } -.autocomplete .sample-result { color: black; } -.autocomplete .sample-query { color:#000; } -#findborrower { position:static; width:auto; } -#yborrowercontainer { text-align:left;width:335px; } - -/* patron attribues autocomplete for overdues report (pattrodue) */ -.pattrodue-autocomplete .pattrodue-result { color: black; } -.pattrodue-autocomplete .yui-ac-highlight .pattrodue-result { color: white; } -.pattrodue-input { position:static; width:auto; } -.pattrodue-container { text-align:left; width:400px; } - .labeledmarc-table { border: 0; } -- 1.7.9.5 From oleonard at myacpl.org Tue Jun 4 20:38:39 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Tue, 4 Jun 2013 14:38:39 -0400 Subject: [Koha-patches] [PATCH] Bug 10307 - z39.50 server search tab shows z390.50 Message-ID: <1370371119-10298-1-git-send-email-oleonard@myacpl.org> The label on the global search form for Z39.50 administration reads "Z390.50." This patch corrects the typo. To test, apply the patch and navigate to Administration -> Z39.50 servers. The label on the global search tab should read "Search Z39.50 servers." --- .../prog/en/includes/z3950-admin-search.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc index da47e19..b09186f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc @@ -21,7 +21,7 @@
[% END %] -- 1.7.9.5 From oleonard at myacpl.org Wed Jun 5 14:47:41 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jun 2013 08:47:41 -0400 Subject: [Koha-patches] [PATCH] Bug 10409 - Do not show course entry form if no departments are found Message-ID: <1370436461-11799-1-git-send-email-oleonard@myacpl.org> The course reserves entry form should not be shown if there are no DEPARTMENT authorized values, since this prevents the form from being submitted. This patch replaces the form with an error message when no DEPARTMENT authorized values are found. Also corrected: - Corrected grid structure for more standard display - Converted labels with no corresponding inputs to - Closed unclosed tags - Corrected incorrect capitalization This patch contains whitespace changes, so please ignore whitespace when examining changes. To test, delete any DEPARTMENT authorized values, if present. Create a new course in Course Reserves. You should see a warning that no DEPARTMENT values were found. If you are logged in with the correct permission, the warning should contain a link to the correct authorized value page. If you do no, the warning should refer the problem to an administrator. After creating one or more DEPARTMENT values, the form should display and submit correctly. --- .../prog/en/modules/course_reserves/course.tt | 343 ++++++++++---------- 1 file changed, 175 insertions(+), 168 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt index 85817ed..8e6a60d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt @@ -2,71 +2,75 @@ Koha › Course reserves › [% IF course_name %] Edit [% course_name %] [% ELSE %] New course [% END %] [% INCLUDE 'doc-head-close.inc' %] - - - + + -//]]> - +[% END %] @@ -77,128 +81,131 @@ function RemoveInstructor( cardnumber ) { -
-
-
-
-
-
-
- [% IF course_id %][% END %] -
- [% IF course_id %] Edit [% ELSE %] Create [% END %] course -
    -
  1. - - [% IF departments %] - +[% IF ( departments ) %] + +
    +
    + + [% IF course_id %][% END %] +
    + [% IF course_id %] Edit [% ELSE %] Create [% END %] course +
      +
    1. + + +
    2. + +
    3. + + +
    4. + +
    5. + + +
    6. + +
    7. + + +
    8. + +
    9. + [% IF terms %] + + -
    10. - -
    11. - - -
    12. - -
    13. - - -
    14. - -
    15. - - [% IF terms %] - - [% ELSE %] - No TERM authorised values found! Please create one or more authorised values with the category TERM. - [% END %] -
    16. - -
    17. - - -
      -
      - [% FOREACH i IN instructors %] -
      - [% i.surname %], [% i.firstname %] ( Remove ) - -
      - [% END %] -
      - -
      - -
      - - -
      -
      -
    18. - - -
    19. - -
    20. - - -
    21. - -
    22. - - -
    23. - -
    24. - - [% IF enabled == 'no' %] - - [% ELSE %] - - [% END %] -
    25. -
    + [% END %] + + [% ELSE %] + Term: + No TERM authorised values found! Please create one or more authorised values with the category TERM. + [% END %] +
  2. + +
  3. + Instructors: + +
    +
    + [% FOREACH i IN instructors %] +
    + [% i.surname %], [% i.firstname %] ( Remove ) + +
    + [% END %] +
    -
    - - - Cancel +
    + + +
    - -
-
-
+
  • + + +
  • + +
  • + + +
  • + +
  • + + +
  • + +
  • + + [% IF enabled == 'no' %] + + [% ELSE %] + + [% END %] +
  • + + + +
    + + + Cancel +
    +
    -
    + +[% ELSE %] + +
    +

    + No DEPARTMENT authorised values found! + [% IF ( CAN_user_parameters ) %] + Please create one or more authorised values with the category DEPARTMENT. + [% ELSE %] + An administrator must create one or more authorised values with the category DEPARTMENT. + [% END %] +

    +[% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 1.7.9.5 From oleonard at myacpl.org Wed Jun 5 14:55:08 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jun 2013 08:55:08 -0400 Subject: [Koha-patches] [PATCH] Bug 10414 - "Course Reserves" should be "Course reserves" in global "More" menu Message-ID: <1370436908-12128-1-git-send-email-oleonard@myacpl.org> The global "More" menu lists "Course Reserves," which is incorrectly capitalized. This patch changes it to "Course reserves." To test, apply the patch and view any page in the staff client. When you click the "More" menu item the link should read "Course reserves." --- .../intranet-tmpl/prog/en/includes/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 9070aa4..58f721f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -25,7 +25,7 @@
  • Serials
  • [% END %] [% IF ( CAN_user_coursereserves ) %] -
  • Course Reserves
  • +
  • Course reserves
  • [% END %] [% IF ( CAN_user_reports ) %]
  • Reports
  • -- 1.7.9.5 From oleonard at myacpl.org Wed Jun 5 15:35:12 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jun 2013 09:35:12 -0400 Subject: [Koha-patches] [PATCH] Bug 10416 - Correct template markup problems on course detail page Message-ID: <1370439312-12880-1-git-send-email-oleonard@myacpl.org> This patch corrects several problems with the course reserves course detail page: - Unescaped ampersands - Extra
    - Incorrect text in title tag - Use of a table to display information which is more consistently displayed as a list. - More accurate alert message, "Are you sure you want to remove this item from the course?" rather than "Are you sure you want to delete this item?" - Missing icons from toolbar buttons To test, apply the patch and view the details of an existing course (Course reserves -> [Course name]). Confirm that these changes are present and look like an improvement. --- .../en/modules/course_reserves/course-details.tt | 47 ++++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index 35dca0c..08953f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -2,14 +2,14 @@ [% USE ItemTypes %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › New course +Koha › Course reserves › Course details for [% course.course_name %] [% INCLUDE 'doc-head-close.inc' %] - [% INCLUDE 'header.inc' %] @@ -20,42 +9,32 @@ $(document).ready(function() { -
    +
    -
    -
    -
    -
    - [% IF ERROR_BARCODE_NOT_FOUND %] -
    No item found for barcode [% ERROR_BARCODE_NOT_FOUND %]
    - [% END %] - -
    - - - -
    - Add items: scan barcode -
      -
    1. - - -
    2. -
    -
    - -
    - - - Cancel -
    -
    -
    -
    -
    -
    + [% IF ERROR_BARCODE_NOT_FOUND %] +
    No item found with barcode [% ERROR_BARCODE_NOT_FOUND %]
    + [% END %] + +
    + + + +
    + Add items: scan barcode +
      +
    1. + + +
    2. +
    +
    + +
    + + + Cancel +
    +
    -
    - [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index 2326e3f..96bf783 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -1,15 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Course reserves › Add items [% INCLUDE 'doc-head-close.inc' %] - - - @@ -19,115 +10,106 @@ $(document).ready(function() { -
    +
    -
    -
    -
    -
    - [% IF course_reserve %]
    This course already has this item on reserve.
    [% END %] - [% IF course_item %]
    Number of courses reserving this item: [% course_item.course_reserves.size %]
    [% END %] - -
    - - - -
    - Add [% item.title %] to [% course.course_name %] -
      -
    1. - - [% item.barcode %] - -
    2. - - [% IF item_level_itypes %] -
    3. - - -
    4. - [% END %] - -
    5. - - -
    6. - -
    7. - - -
    8. - -
    9. - - -
    10. - -
    11. - - -
    12. - -
    13. - - -
    14. - -
    -
    - -
    - - - Cancel -
    - -
    -
    -
    -
    -
    -
    + [% IF course_reserve %]
    This course already has this item on reserve.
    [% END %] + [% IF course_item %]
    Number of courses reserving this item: [% course_item.course_reserves.size %]
    [% END %] + + + + + +
    + Add [% item.title %] to [% course.course_name %] +
      +
    1. + Barcode: + [% item.barcode %] + +
    2. + + [% IF item_level_itypes %] +
    3. + + +
    4. + [% END %] + +
    5. + + +
    6. + +
    7. + + +
    8. + +
    9. + + +
    10. + +
    11. + + +
    12. + +
    13. + + +
    14. + +
    +
    + +
    + + + Cancel +
    + +
    [% INCLUDE 'intranet-bottom.inc' %] -- 1.7.9.5 From oleonard at myacpl.org Wed Jun 5 17:10:50 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jun 2013 11:10:50 -0400 Subject: [Koha-patches] [PATCH] Bug 10420 - Standardize spelling of "authorized" Message-ID: <1370445050-14816-1-git-send-email-oleonard@myacpl.org> This patch corrects instances of the non-[American]-standard spelling "authorised" when used in text. The following instances are corrected: - In Administration -> Funds, the error message displayed if you do not have permission to edit a fund. - In Administration -> Authorized values, the instructions linked to the "Libraries limitation" field. - In Administration -> MARC bibliographic framework test, instructions related to linking to authorized values. - In the course reserves add form, error messages referring to missing authorized values. - In guided reports, error messages shown when an authorized value chosen as a report parameter doesn't exit. --- .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../prog/en/modules/admin/checkmarc.tt | 6 +++--- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/course_reserves/course.tt | 4 ++-- .../en/modules/reports/guided_reports_start.tt | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 95e4f8f..7df04f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -220,7 +220,7 @@ [% IF (error_not_authorised_to_modify) %]
    -

    You are not authorised to modify this fund

    +

    You are not authorized to modify this fund

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 5ba3072..411a93a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -114,7 +114,7 @@ $(document).ready(function() { [% END %] [% END %] - Select All if this authorised value must to be displayed all the time. Otherwise select libraries you want to associate with this value. + Select All if this authorized value must to be displayed all the time. Otherwise select libraries you want to associate with this value. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt index 5777eb6..d93ada7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt @@ -67,7 +67,7 @@ itemtype NOT mapped the biblioitems.itemtype field MUST :
    • be mapped to a MARC subfield,
    • -
    • the corresponding subfield MUST have authorised_value=itemtype
    +
  • the corresponding subfield MUST have "Authorized value" set to "itemtype"
  • [% ELSE %] @@ -81,7 +81,7 @@ homebranch NOT mapped the items.homebranch field MUST :
    • be mapped to a MARC subfield,
    • -
    • the corresponding subfield MUST have authorised value=branches
    +
  • the corresponding subfield MUST have "Authorized value" set to "branches"
  • [% ELSE %] @@ -95,7 +95,7 @@ holdingbranch NOT mapped the items.holdingbranch field MUST :
    • be mapped to a MARC subfield,
    • -
    • the corresponding subfield MUST have authorised value=branches
    +
  • the corresponding subfield MUST have "Authorized value" set to "branches"
  • [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 985ece5..e561ae5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -231,7 +231,7 @@ function CheckAttributeTypeForm(f) { [% END %] [% END %] - Group attributes types with a block title (based on Authorised values category 'PA_CLASS') + Group attributes types with a block title (based on authorized values category 'PA_CLASS') diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt index 85817ed..42dc1c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt @@ -103,7 +103,7 @@ function RemoveInstructor( cardnumber ) { [% END %] [% ELSE %] - No DEPARTMENT authorised values found! Please create one or more authorised values with the category DEPARTMENT. + No DEPARTMENT authorized values found! Please create one or more authorized values with the category DEPARTMENT. [% END %] @@ -137,7 +137,7 @@ function RemoveInstructor( cardnumber ) { [% END %] [% ELSE %] - No TERM authorised values found! Please create one or more authorised values with the category TERM. + No TERM authorized values found! Please create one or more authorized values with the category TERM. [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 4cd0728..9cb99f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -671,7 +671,7 @@ canned reports and writing custom SQL reports.

    Errors found when processing parameters for report: [% name %]

    [% FOREACH problematic_authval IN problematic_authvals %]

    - [% problematic_authval.name %]: The authorised value category ([% problematic_authval.authval %]) + [% problematic_authval.name %]: The authorized value category ([% problematic_authval.authval %]) you selected does not exist.

    [% END %] @@ -714,7 +714,7 @@ canned reports and writing custom SQL reports.

    Errors found when processing parameters for report: [% name %]

    [% FOREACH auth_val_error IN auth_val_errors %]

    - [% auth_val_error.entry %]: The authorised value category ([% auth_val_error.auth_val %]) + [% auth_val_error.entry %]: The authorized value category ([% auth_val_error.auth_val %]) you selected does not exist.

    [% END %] -- 1.7.9.5 From oleonard at myacpl.org Wed Jun 5 18:27:31 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jun 2013 12:27:31 -0400 Subject: [Koha-patches] [PATCH] Bug 9032 [Template follow-up] Share a list (part 1: send the invitation) Message-ID: <1370449651-16492-1-git-send-email-oleonard@myacpl.org> This patch makes a few changes to the "share a list" template: - We don't use tables for layout of forms. This patch corrects the display of the share form to use Koha standard form markup. - Revise the confirmation message displayed after a list is shared to be more readable. - Add a link back to private lists to the confirmation message. - Add T:T markup to make this page display the left-hand navigation which is shown on other patron-related pages when a user is logged in. To test, apply this patch on top of other patches pending for Bug 9032 and confirm that the list share form looks correct and works correctly. Confirm that share confirmation page reads well. --- .../opac-tmpl/prog/en/modules/opac-shareshelf.tt | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt index 63c17bc..9adebcc 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt @@ -24,25 +24,25 @@
    - - - - - - - - - -
    [% shelfname %]
    - +
    +
      +
    1. List name: [% shelfname %]
    2. +
    3. +
    +
    + +
    + +
    [% ELSIF op=='conf_invite' %] -

    We have sent invitation emails to share list [% shelfname %] to the mail queue for [% approvedaddress %].

    +

    An invitation to share list [% shelfname %] has been sent to [% approvedaddress %].

    [% IF failaddress %]

    The following addresses appear to be invalid. Please correct them and try again. These are: [% failaddress %]

    [% END %]

    You will be notified if someone accepts your share within two weeks.

    +

    Return to your lists

    [% ELSIF op=='accept' %] [%# TODO: Replace the following two lines %] @@ -57,11 +57,11 @@
    [% IF ( OpacNav ) %] -
    -
    - [% INCLUDE 'navigation.inc' %] -
    -
    +
    +
    + [% INCLUDE 'navigation.inc' IsPatronPage=1 %] +
    +
    [% END %]
    -- 1.7.9.5 From oleonard at myacpl.org Wed Jun 5 19:53:14 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jun 2013 13:53:14 -0400 Subject: [Koha-patches] [PATCH] Bug 2774 - Path to theme is hard-coded in many places Message-ID: <1370454794-4954-1-git-send-email-oleonard@myacpl.org> This patch corrects serveral more places in the templates where the path to the prog theme is hard-coded. To test, apply the patch and view the following cases: - When a database update is triggered the login page loads login.css. This path should be correct. (Reference to wizard.css is removed as per Bug 10422). - The course reserves home page should load datatables-related assets correctly. - Help pages for the Quick spine label creator and the staff client home page should show the correct paths where they reference the Koha file system. - The web installer pages should correctly load the Koha logo. - The label creator "manage" pages (layouts, templates, etc.) should correctly load datatables-related assets. --- .../prog/en/includes/installer-doc-head-close.inc | 5 +---- .../en/modules/course_reserves/course-reserves.tt | 15 +++++++-------- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../prog/en/modules/installer/step1.tt | 2 +- .../prog/en/modules/installer/step2.tt | 2 +- .../prog/en/modules/installer/step3.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 6 +++--- .../en/modules/reports/guided_reports_start.tt | 4 ++-- 9 files changed, 18 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc index 2f43528..122a06c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc @@ -3,10 +3,7 @@ + + +[% IF ( OpacNav ) %] +
    +[% ELSE %] +
    +[% END %] +
    +[% INCLUDE 'masthead.inc' %] + +

    OverDrive search for '[% q | html %]'

    + + +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    + +[% IF ( OpacNav ) %] +
    +[% INCLUDE 'navigation.inc' %] +
    +[% END %] + + +
    +[% INCLUDE 'opac-bottom.inc' %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt index 923effa..9b2ea7c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt @@ -13,6 +13,7 @@ [% IF ( OpacStarRatings == 'all' ) %] [% END %] + [% IF ( OpacHighlightedWords ) %] [% END %]'); $('#preview-loading').hide(); }); } $(document).ready(function () { if ($('#pref_OpacNav').size() > 0) { $('#doc3').after(''); $('#preview-main').click(function () { showPreview('/cgi-bin/koha/opac/opac-main.pl'); }); $('#preview-results').click(function () { showPreview('/cgi-bin/koha/opac/opac-search.pl?idx=&q=pqf%3D%40attr+1%3D_ALLRECORDS+%40attr+2%3D103+%22%22&branch_group_limit='); }); $('#preview-details').click(function () { showPreview('/cgi-bin/koha/opac/opac-detail.pl?biblionumber=1'); }); $('#preview-hide').click(function () { $('#opac-preview').hide(); $('#preview-loading').hide(); }); } }); Signed-off-by: Srdjan --- koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc | 4 ++-- koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 2 -- koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc | 6 +++++- koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc | 12 ++++++------ koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc | 12 ++++++++---- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 8 +++----- koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc | 5 ++++- koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc | 8 +++----- koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc | 3 --- koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt | 6 +++--- 10 files changed, 34 insertions(+), 32 deletions(-) diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc index fcbab2a..cec9434 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc @@ -27,8 +27,8 @@ [% IF ( bidi ) %] [% END %] -[% IF ( OPACMobileUserCSS ) %][% END %] -[% IF ( OPACUserCSS ) %][% END %] + + [% IF persona %] [% END %] diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc index ec699f4..bb62261 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc @@ -313,11 +313,9 @@ You did not specify any search criteria. [% END %]

    -[% IF ( OPACNoResultsFound ) %]
    [% OPACNoResultsFound %]
    -[% END %]
    [% END %]

    [% END %]
    diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc index fe56488..c3c25e6 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc @@ -1,5 +1,9 @@ +
    +[% OpacNav %] +
    [% IF IsPatronPage %] [% INCLUDE usermenu.inc %] [% END %] -[% OpacNav %] +
    [% OpacNavBottom %] +
    diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc index a0eb3f4..b594cf1 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc @@ -1,8 +1,6 @@ -[% IF ( opaccredits ) %] -
    - [% opaccredits %] -
    -[% END %] +
    + [% opaccredits %] +
    @@ -75,8 +73,10 @@ + @@ -94,8 +94,12 @@ [% IF ( SyndeticsCoverImages ) %]$(window).load(function() { verify_images(); });[% END %] - [% IF ( opacuserjs ) %][% opacuserjs %][% END %] - //]]> + //]]> + + + diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 651e669..c4dedea 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -14,9 +14,9 @@ [% END %]
    - [% IF ( opacheader ) %] - [% opacheader %] - [% END %] +
    + [% opacheader %] +
    [% END %]

    [% END %]
    diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc index 9cd2c12..c3c25e6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc @@ -1,6 +1,9 @@ +
    [% OpacNav %] +
    [% IF IsPatronPage %] [% INCLUDE usermenu.inc %] [% END %] +
    [% OpacNavBottom %] - +
    diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc index 7020673..ec17f80 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc @@ -1,8 +1,6 @@ -[% IF ( opaccredits ) %] -
    - [% opaccredits %] -
    -[% END %] +
    + [% opaccredits %] +
    [% IF ( opaclanguagesdisplay || OpacKohaUrl ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc index fbb7c55..f575da9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -27,10 +27,7 @@ [% END %]
    -[% IF ( OPACResultsSidebar ) %]
    -[% OPACResultsSidebar %]
    [% END %] [% END %] -[% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt index 3844fc5..604c4be 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt @@ -36,8 +36,8 @@

    Quote of the Day

    [% daily_quote.text %] ~ [% daily_quote.source %]
    [% END %] - [% IF ( OpacMainUserBlock ) %]
    [% OpacMainUserBlock %]
    [% END %] - [% IF ( OpacMainUserBlockMobile ) %]
    [% OpacMainUserBlockMobile %]
    [% END %] +
    [% OpacMainUserBlock %]
    +
    [% OpacMainUserBlockMobile %]
    @@ -68,7 +68,7 @@ [% END %] [% END %] [% END %] - [% IF ( OpacNavRight ) %]
    [% OpacNavRight %]
    [% END %] +
    [% OpacNavRight %]
    [% END %] -- 1.8.1.2 From srdjan at catalyst.net.nz Tue Jun 11 06:14:53 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Tue, 11 Jun 2013 16:14:53 +1200 Subject: [Koha-patches] [PATCH] Bug 10396 : Itemcallnumber and year of publication does not need datepicker fields in catalog stats form Message-ID: <1370924093-2656-1-git-send-email-srdjan@catalyst.net.nz> From: Sophie Meynieux Signed-off-by: Srdjan --- koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt index e1fc987..91391e8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt @@ -139,7 +139,7 @@ Koha full call number - +   @@ -182,7 +182,7 @@ Publication year - + Home library -- 1.8.1.2 From srdjan at catalyst.net.nz Tue Jun 11 06:44:58 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Tue, 11 Jun 2013 16:44:58 +1200 Subject: [Koha-patches] [PATCH] Bug 9487 - Allow items fields to be used in the HOLDPLACED notice Message-ID: <1370925898-5305-1-git-send-email-srdjan@catalyst.net.nz> From: Kyle M Hall Test Plan: 1) Enable the syspref emailLibrarianWhenHoldIsPlaced 2) Modify the HOLDPLACED notice, add some item level fields 3) Place an item level hold 4) Check the email you recieve ( or just look at it from the db ) You should see the item level fields are new populated Signed-off-by: Srdjan --- C4/Reserves.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 5ff12e4..96aa9b3 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -212,6 +212,7 @@ sub AddReserve { 'branches' => $branch_details, 'borrowers' => $borrower, 'biblio' => $biblionumber, + 'items' => $checkitem, }, ) ) { -- 1.8.1.2 From juan.sieira at xercode.es Tue Jun 11 11:47:25 2013 From: juan.sieira at xercode.es (Juan Romay Sieira) Date: Tue, 11 Jun 2013 11:47:25 +0200 Subject: [Koha-patches] [PATCH] Bug 10443 - Table borrower_files does not exists in kohastructure.sql file Message-ID: <1370944045-990-1-git-send-email-juan.sieira@xercode.es> --- installer/data/mysql/kohastructure.sql | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index ca2f2b2..11d58a1 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2519,6 +2519,23 @@ CREATE TABLE `message_transports` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- +-- Table structure for table `borrower_files` +-- + +DROP TABLE IF EXISTS `borrower_files`; +CREATE TABLE IF NOT EXISTS `borrower_files` ( + `file_id` int(11) NOT NULL AUTO_INCREMENT, + `borrowernumber` int(11) NOT NULL, + `file_name` varchar(255) NOT NULL, + `file_type` varchar(255) NOT NULL, + `file_description` varchar(255) DEFAULT NULL, + `file_content` longblob NOT NULL, + `date_uploaded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`file_id`), + KEY `borrowernumber` (`borrowernumber`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- -- Table structure for table `borrower_message_preferences` -- -- 1.7.2.5 From tomascohen at gmail.com Tue Jun 11 16:22:17 2013 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Tue, 11 Jun 2013 11:22:17 -0300 Subject: [Koha-patches] [PATCH 1/2] Bug 10431 - Spanish Zebra character sorting file Message-ID: <1370960538-24454-1-git-send-email-tomascohen@gmail.com> This patch provides a definition file for spanish (es) character sorting in Zebra. It is based on the ideas from Hugo Agud and Pablo Bianchi . Makefile.PL is fixed to notice the existence of the 'es' language. The docs for koha-create are touched too. To test: Tarball ======= - Go through the install process, choosing 'es' for the Zebra's language step - Koha should work as usual. - Running this should show the lang definition is properly set. $ grep -R "lang_defs/es" /etc/koha/* (stuff like zebradb/zebra-biblios-dom.cfg:profilePath:...etc/koha/zebra/lang_defs/es... should show) - This file should be present: /etc/koha/zebradb/lang_defs/es/sort-string-utf.chr Packages ======== - Build your own package, it shouldn't break the packaging - Try the new package, using koha-create to set an instance using --lang 'es' Regards To+ Sponsored-by: Universidad Nacional de C??rdoba --- Makefile.PL | 2 +- debian/scripts/koha-create | 2 +- etc/zebradb/lang_defs/es/sort-string-utf.chr | 42 ++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 etc/zebradb/lang_defs/es/sort-string-utf.chr diff --git a/Makefile.PL b/Makefile.PL index 22ce8da..d02a944 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -477,7 +477,7 @@ my %valid_config_values = ( 'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, 'BIB_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, 'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation - 'ZEBRA_LANGUAGE' => { 'en' => 1, 'fr' => 1, 'nb' => 1 }, # FIXME should generate from contents of distribution + 'ZEBRA_LANGUAGE' => { 'en' => 1, 'es' => 1, 'fr' => 1, 'nb' => 1 }, # FIXME should generate from contents of distribution 'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 }, 'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 }, 'USE_MEMCACHED' => { 'yes' => 1, 'no' => 1 }, diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 8211e1c..446c59d 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -21,7 +21,7 @@ set -e usage="Usage: $0 [--create-db|--request-db|--populate-db|--use-db] \ [--marcflavor marc21|normarc|unimarc] \ - [--zebralang en|nb|fr] \ + [--zebralang en|nb|fr|es] \ [--defaultsql /path/to/some.sql] \ [--configfile /path/to/config] [--passwdfile /path/to/passwd] \ [--database database] [--adminuser n] instancename" diff --git a/etc/zebradb/lang_defs/es/sort-string-utf.chr b/etc/zebradb/lang_defs/es/sort-string-utf.chr new file mode 100644 index 0000000..caba617 --- /dev/null +++ b/etc/zebradb/lang_defs/es/sort-string-utf.chr @@ -0,0 +1,42 @@ +# Koha's Zebra character map file for spanish +# +encoding utf-8 +# Character sort order definition +lowercase {0-9}{a-y}?z????? +uppercase {0-9}{A-Y}?Z????? + +# Breaking characters +space {\001-\040}!"#$%&'\()*+,-./:;<=>?@\[\\]^_`\{|}~ + +# Characters to be considered equivalent for searching purposes. +equivalent u? + +# Supplemental mappings +map (ä) a +map (æ) ? +map (ø) ? +map (å) a +map (ö) o +map (Ä) A +map (&Aelig;) ? +map (Ø) ? +map (Å) A +map (Ö) O + +map ???????? a +map ???????? e +map ????? i +map ????? o +map ?????? u +map ?? c +map ? n + +map (^El\s) @ +map (^En\s) @ +map (^La\s) @ +map (^Los\s) @ +map (^Las\s) @ +map (^Un\s) @ +map (^Unos\s) @ +map (^Una\s) @ +map (^Unas\s) @ -- 1.7.9.5 From tomascohen at gmail.com Tue Jun 11 16:22:18 2013 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Tue, 11 Jun 2013 11:22:18 -0300 Subject: [Koha-patches] [PATCH 2/2] Bug 10447 - Language definitions for 'ru' and 'uk' are not available during install In-Reply-To: <1370960538-24454-1-git-send-email-tomascohen@gmail.com> References: <1370960538-24454-1-git-send-email-tomascohen@gmail.com> Message-ID: <1370960538-24454-2-git-send-email-tomascohen@gmail.com> This patch add the option to choose 'ru' and 'uk' during install for zebra. Should work for a tarball install, and make 'ru' and 'uk' available for using with koha-create too. Regards To+ Sponsored-by: Universidad Nacional de C?rdoba --- Makefile.PL | 2 +- debian/docs/koha-create.xml | 2 +- debian/scripts/koha-create | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index d02a944..faedf83 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -477,7 +477,7 @@ my %valid_config_values = ( 'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, 'BIB_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, 'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation - 'ZEBRA_LANGUAGE' => { 'en' => 1, 'es' => 1, 'fr' => 1, 'nb' => 1 }, # FIXME should generate from contents of distribution + 'ZEBRA_LANGUAGE' => { 'en' => 1, 'es' => 1, 'fr' => 1, 'nb' => 1, 'ru' => 1, 'uk' => 1 }, # FIXME should generate from contents of distribution 'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 }, 'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 }, 'USE_MEMCACHED' => { 'yes' => 1, 'no' => 1 }, diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml index d879a69..491da62 100644 --- a/debian/docs/koha-create.xml +++ b/debian/docs/koha-create.xml @@ -26,7 +26,7 @@ koha-create ||| marc21|normarc|unimarc - en|nb|fr + en|es|fr|nb|ru|uk /path/to/some.sql /path/to/config /path/to/passwd diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 446c59d..8172bae 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -21,7 +21,7 @@ set -e usage="Usage: $0 [--create-db|--request-db|--populate-db|--use-db] \ [--marcflavor marc21|normarc|unimarc] \ - [--zebralang en|nb|fr|es] \ + [--zebralang en|es|fr|nb|ru|uk] \ [--defaultsql /path/to/some.sql] \ [--configfile /path/to/config] [--passwdfile /path/to/passwd] \ [--database database] [--adminuser n] instancename" -- 1.7.9.5 From tomascohen at gmail.com Tue Jun 11 16:51:56 2013 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Tue, 11 Jun 2013 11:51:56 -0300 Subject: [Koha-patches] [PATCH 1/2] Bug 10444 - In advanced search(more), [+] and [-] should behave like links on hover Message-ID: <1370962317-11581-1-git-send-email-tomascohen@gmail.com> This patch add href="#" to the [+] and [-] links for adding and removing search terms. It also defines its style so it doesn't show underlined. To test: - Browse your OPAC to "Advanced Search" and then "More options". - The [+] and [-] don't change the cursor on hover - Apply the patch, reload and see the cursor changes - Functionality should remain unchanged Regards To+ Sponsored-by: Universidad Nacional de C?rdoba --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 4 ++++ .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 84b8489..06456e5 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -30,6 +30,10 @@ body { color : #C00; } +a.ButtonPlus, a.ButtonLess { + text-decoration : none; +} + caption { font-size : 140%; font-weight : bold; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt index 8f763d1..eeed2eb 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt @@ -125,8 +125,8 @@ [% IF ( expanded_options ) %] [% IF ( !loop.first ) %] - [+] - [-] + [+] + [-] [% END %] [% END %]

    -- 1.7.9.5 From tomascohen at gmail.com Tue Jun 11 16:51:57 2013 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Tue, 11 Jun 2013 11:51:57 -0300 Subject: [Koha-patches] [PATCH 2/2] Bug 10444 - (CCSR followup) In advanced search(more), [+] and [-] should behave like links on hover In-Reply-To: <1370962317-11581-1-git-send-email-tomascohen@gmail.com> References: <1370962317-11581-1-git-send-email-tomascohen@gmail.com> Message-ID: <1370962317-11581-2-git-send-email-tomascohen@gmail.com> Same fix for CCSR. Regards To+ Sponsored-by: Universidad Nacional de C?rdoba --- koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css index ec12042..9f9979c 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css @@ -20,6 +20,10 @@ a.disabled { color : #888888 !important; } +a.ButtonPlus, a.ButtonLess { + text-decoration : none; +} + body { background-color : white; text-align : left; -- 1.7.9.5 From amitddng135 at gmail.com Wed Jun 12 07:13:44 2013 From: amitddng135 at gmail.com (Amit Gupta) Date: Wed, 12 Jun 2013 10:43:44 +0530 Subject: [Koha-patches] [PATCH] Bug 10209 - The ability to order multiple copies of the same Message-ID: <1371014024-15558-1-git-send-email-amitddng135@gmail.com> Test Plan: 1) Create a basket. 2) Click on new order empty record. 3) Give title, quantity and select fund. 4) Order multiple copies of the same item click on Add fund and quantity button it will add one more fund and quantity by default quantity will be 1. 5) For delete fund and quantity simply click on Delete fund and quantity. --- acqui/addorder.pl | 18 ++- koha-tmpl/intranet-tmpl/prog/en/js/additem.js | 1 + .../prog/en/modules/acqui/neworderempty.tt | 126 +++++++++++++++----- 3 files changed, 115 insertions(+), 30 deletions(-) diff --git a/acqui/addorder.pl b/acqui/addorder.pl index 077adaf..ba82e25 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -156,6 +156,9 @@ $orderinfo->{'uncertainprice'} ||= 0; $orderinfo->{subscriptionid} ||= undef; my $user = $input->remote_user; +my $budget_id = $input->param('budget_id'); +my $quantity = $input->param('quantity'); +my $max_budget = $input->param('max_budget'); # create, modify or delete biblio # create if $quantity>=0 and $existing='no' @@ -204,8 +207,21 @@ if ( $orderinfo->{quantity} ne '0' ) { if ($$orderinfo{ordernumber}) { ModOrder( $orderinfo); } - else { # else, it's a new line + else { # else, it's a new line + $orderinfo->{budget_id} = $budget_id; + $orderinfo->{quantity} = $quantity; @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo); + + for (my $j = 2; $j <= $max_budget; $j++) { + my $b = $input->param("b"."$j"); + my $q = $input->param("q"."$j"); + if (defined $b) { + $orderinfo->{budget_id} = $b; + $orderinfo->{quantity} = $q; + @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo); + } + } + } # now, add items if applicable diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js index 2c15b04..1962685 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js @@ -14,6 +14,7 @@ function addItem( node, unique_item_fields ) { addItemInList(index, unique_item_fields); $("#" + index).find("a[name='buttonPlus']").text("Update"); $("#quantity").val(current_qty + 1).change(); + document.getElementById("quantity").readOnly = false; } else if ( current_qty >= max_qty ) { alert(window.MSG_ADDITEM_JS_CANT_RECEIVE_MORE_ITEMS || "You can't receive any more items."); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 87cfa8a..5c81add 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -149,6 +149,70 @@ $(document).ready(function() }); //]]> + @@ -391,13 +455,37 @@ $(document).ready(function() [% END %][%# IF (AcqCreateItemOrdering) %]
    Accounting Details -
      -
    1. - [% IF ( close ) %] - Quantity: +
        [% IF ( biblionumber ) %] [% ELSE %] + + + + [% END %] + + + + + + + + + + + +
            [% IF ( close ) %] + [% Budget_name %] + [% ELSE %] + [% END %] [% IF ( close ) %] [% quantity %] - [% ELSE %] - + [% ELSE %] [% IF (AcqCreateItemOrdering) %] [% IF subscriptionid %] @@ -413,29 +501,9 @@ $(document).ready(function() [% END %] [% END %] - - -
      1. - [% IF ( close ) %] - Fund: - [% Budget_name %] - [% ELSE %] - - - - - [% END %] +
      2. [% IF ( close ) %] -- 1.7.9.5 From tomascohen at gmail.com Thu Jun 13 20:40:32 2013 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Thu, 13 Jun 2013 15:40:32 -0300 Subject: [Koha-patches] [PATCH] Bug 10464 - Patron search on placing a hold should provide autocomplete Message-ID: <1371148832-2085-1-git-send-email-tomascohen@gmail.com> We should provide the autocomplete feature, already present for the circulation search box, if CircAutocompl is properly set; and leave as it currently works otherwise of course. This patch grabs the autocomplete handling javascript stuff from patron-search-box.inc and puts an adjusted version on reserve/request.tt and also adjusts form and input id's to match those configured in the autocomplete call. This changes where needed due to name collisions with the patron-search-box.inc that is present everywhere. To test: - On a biblio record, go to the Holds tab, mine looks like /cgi-bin/koha/reserve/request.pl?biblionumber=2 - A search box is shown for patron searching. - Search for a patron: it works as usual. - Make sure CircAutocompl is 'Don\'t try' - Apply the patch - Click the Holds tab again, and do the same search: functionality should remain intact. - Change CircAutocompl to 'Try' - Click the Holds tab again - Autocomplete should show you the possible options, and once you choose one result, it should work as usual. Note: once you apply the patch the width of the search input field will be doubled. If you are oleonard and prefer to stick with size=20, please amend the patch, I just prefered how it looked at size=40. Regards To+ Edit: Wrapped the JavaScript code with [% UNLESS ( borrowernumber ) %] to fix the behaviour on the case of rendering the placing hold page instead. Sponsored-by: Universidad Nacional de C?rdoba --- .../prog/en/modules/reserve/request.tt | 38 ++++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index f2c7564..2b986ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -130,6 +130,30 @@ function checkMultiHold() { }); $('#hold-request-form').preventDoubleFormSubmit(); + +[% UNLESS ( borrowernumber ) %] + [% IF ( CircAutocompl ) %] + $( "#patron" ).autocomplete({ + source: "/cgi-bin/koha/circ/ysearch.pl", + minLength: 3, + select: function( event, ui ) { + $( "#patron" ).val( ui.item.cardnumber ); + $( "#holds_patronsearch" ).submit(); + return false; + } + }) + .data( "autocomplete" )._renderItem = function( ul, item ) { + return $( "
      3. " ) + .data( "item.autocomplete", item ) + .append( "" + item.surname + ", " + item.firstname + + " (" + item.cardnumber + ") " + item.address + + " " + item.city + " " + item.zipcode + " " + + item.country + "" ) + .appendTo( ul ); + }; + [% END %] +[% END %] + }); // ]]> @@ -176,15 +200,15 @@ function checkMultiHold() { [% IF ( messageborrower ) %]

        Patron Not Found

        No patron with this name, please, try another

        [% END %] -
        + [% UNLESS borrower_list %] -
        - -
        Enter patron card number or partial name:
        - - +
        + +
        Enter patron card number or partial name:
        + -
        + +
        [% ELSE %]
        -- 1.7.9.5 From oleonard at myacpl.org Tue Jun 25 19:01:56 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Tue, 25 Jun 2013 13:01:56 -0400 Subject: [Koha-patches] [PATCH] Bug 10475 - Item form in acquisition not hiding subfields properly Message-ID: <1372179717-23187-1-git-send-email-oleonard@myacpl.org> Subfields hidden in your ACQ framework leave a gap where they used to be in the item entry form when adding an item to an order. This patch makes the same change made by 7116 to services/itemrecorddisplay.tt to correct the problem. To test: - Edit your ACQ framework and set some item subfields to hidden in the editor. - Set your AcqCreateItem system preference to "when placing an order." - Add a title to an existing basket from an existing record. The item entry form should display correctly with your hidden subfields hidden. No whitespace should be left behind where the subfields were hidden. Also changed: Invalid "size" attributes on hidden form fields in neworderempty.tt, stray . --- .../prog/en/modules/acqui/neworderempty.tt | 31 ++++++++++---------- .../prog/en/modules/services/itemrecorddisplay.tt | 8 +++-- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 87cfa8a..3a24e6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -242,7 +242,7 @@ $(document).ready(function()
        1. [% IF ( biblionumber ) %] Title - [% title |html %] + [% title |html %] [% ELSE %] @@ -251,7 +251,7 @@ $(document).ready(function()
        2. [% IF ( biblionumber ) %] Author: - [% author %] + [% author %] [% ELSE %] @@ -260,7 +260,7 @@ $(document).ready(function()
        3. [% IF ( biblionumber ) %] Publisher: - [% publishercode %] + [% publishercode %] [% ELSE %] @@ -269,7 +269,7 @@ $(document).ready(function()
        4. [% IF ( biblionumber ) %] Edition: - [% editionstatement %] + [% editionstatement %] [% ELSE %] @@ -279,7 +279,7 @@ $(document).ready(function()
        5. [% IF ( biblionumber ) %] Publication year: - [% publicationyear %] + [% publicationyear %] [% ELSE %] @@ -288,7 +288,7 @@ $(document).ready(function()
        6. [% IF ( biblionumber ) %] ISBN: - [% isbn %] + [% isbn %] [% ELSE %] @@ -298,7 +298,7 @@ $(document).ready(function()
        7. [% IF ( biblionumber ) %] EAN: - [% ean %] + [% ean %] [% ELSE %] @@ -308,13 +308,12 @@ $(document).ready(function()
        8. [% IF ( biblionumber ) %] Series: - [% seriestitle %] + [% seriestitle %] [% ELSE %] [% END %]
        9. - [% UNLESS ( biblionumber ) %] [% IF ( itemtypeloop ) %]
        10. @@ -395,7 +394,7 @@ $(document).ready(function()
        11. [% IF ( close ) %] Quantity: - [% quantity %] + [% quantity %] [% ELSE %] [% IF (AcqCreateItemOrdering) %] @@ -418,7 +417,7 @@ $(document).ready(function()
        12. [% IF ( close ) %] Fund: - [% Budget_name %] + [% Budget_name %] [% ELSE %] [% currency %] + [% currency %] [% ELSE %] [% listprice %] + [% listprice %] [% ELSE %] @@ -472,9 +471,9 @@ $(document).ready(function()
        13. [% IF ( close ) %] Tax rate: - [% gstrate %]% + [% gstrate %]% [% ELSE %] - + [% rrp %] + [% rrp %] [% ELSE %] (adjusted for [% cur_active %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt index 005a0a8..5637276 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt @@ -1,7 +1,11 @@
            [% FOREACH iteminfo IN iteminformation %] -
          1. -
            + [% IF ( iteminfo.hidden ) %] +
          2. + [% ELSE %] +
          3. + [% END %] +
            [% IF (iteminfo.mandatory) %] [% ELSE %] -- 1.7.9.5 From oleonard at myacpl.org Wed Jun 26 19:06:14 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 26 Jun 2013 13:06:14 -0400 Subject: [Koha-patches] [PATCH] Bug 10510 - OPAC's renew selected link has glitchy icon Message-ID: <1372266375-27206-1-git-send-email-oleonard@myacpl.org> The "renew selected" link on the list of a user's checkouts looks bad because the next icon in the sprite shows through. This patch modifies the sprite to give it proper spacing and corrects the CSS to accommodate the change. To test, apply the patch, clear your browser cache, and view the following pages to confirm that the change works: - With TagsEnabled and TagsInputOnList enabled, view a search results page when logged in and when not logged in. Tag links should be styled correctly. - With OpacBrowseResults enabled, open the detail page for any record and click the "browse shelf" link. The "forward" and "back" arrows should be styled correctly. - With OpacRenewalAllowed enabled, log in to the OPAC and view your checked out items. The "renew selected" and "renew all" links should look correct. --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 13 ++++++------- koha-tmpl/opac-tmpl/prog/images/sprite.png | Bin 8381 -> 3348 bytes 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 28c0eb9..6fd9a90 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -741,7 +741,7 @@ input.deleteshelf:active { a.tag_add { background-image: url("../../images/sprite.png"); /* Tag results */ - background-position: -10px -1104px; + background-position: -10px -1110px; background-repeat: no-repeat; padding-left : 13px; text-decoration: none; @@ -749,7 +749,7 @@ a.tag_add { #login4tags { background-image: url("../../images/sprite.png"); /* Tag results disabled */ - background-position: -10px -1124px; + background-position: -10px -1130px; background-repeat: no-repeat; padding-left : 13px; text-decoration: none; @@ -2045,7 +2045,6 @@ a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview, a#Fullhistory, a#Briefhisto #shelfbrowser #browser_next, #shelfbrowser #browser_previous { background-image : url("../../images/sprite.png"); - background-position : -5px -988px; background-repeat: no-repeat; width : 16px; } @@ -2061,10 +2060,10 @@ a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview, a#Fullhistory, a#Briefhisto width: 16px; } #shelfbrowser #browser_previous { -background-position: -9px -1001px; +background-position: -9px -1007px; } #shelfbrowser #browser_next { -background-position: -9px -1051px; +background-position: -9px -1057px; } #comments .commentline { @@ -2266,13 +2265,13 @@ div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; #renewselected_link { background-image : url("../../images/sprite.png"); - background-position : -5px -988px; + background-position : -5px -986px; background-repeat: no-repeat; } #renewall_link { background-image : url("../../images/sprite.png"); - background-position : -8px -964px; + background-position : -8px -967px; background-repeat: no-repeat; } diff --git a/koha-tmpl/opac-tmpl/prog/images/sprite.png b/koha-tmpl/opac-tmpl/prog/images/sprite.png index 6ed641dddba694cf60a4284e304d1cda79b74639..a6037a9122ac7c7b3f3773bba42d7d3b745de01d 100644 GIT binary patch delta 2251 zcmV;+2sHP-L6jPh7Ycp|0{{R3 at Ktr$u^~?ce+Z6AL_t(|+U?wVU=vju0PuF at t}d;J z2PlVtBBEo{YC^UlNo}DmJ!pV}wSW{`DfWh1SfL0OQNRPL1>{hXLqP;o4pF at Ez*~3S zRrfxi1 at nytebcujC~I0pB+>$sa%7%bPdzy at ct^i)kUF6~`KZajK0)D#p%f ze|dS%N+-toDJeJKlH$VHecc1 at r@FZ at zTukNCfq)83C1~D<8sE$x(nlhnO9wPW99;k zM~%ATicwQmwd3}oSh3|C8we@|c at mma5Rx#j(n+OYN{S0j!Ry>^_fu{v1t(5if~H{B zxN$rQ%_;cJjhUI53#b&FGG&z&ovK)Ie`qQACH^f~uP0zV#T|%kRFs z>E-7(J-2C7iGcrkj?0L1y8TAL|LfkPdygKlb?^Qw0blr`zx1~sUMS%IE`@k|#nNA_ zc>6U07Z<`(Jgj)wu;RjqcdBB=q4NkM{4Dm7MCG95XOFb3<%$)D!Xr3~&to!6f2i|( zq!BVr;~6OT+2)p;TW4jbDpq{_vla*;Yl;2wh-Fk$|!LX*! z6)RSJOgWI?$iQXuhcPOe)F^2vXLI3*m)2T^nYF}Lq3;-47&z3 at iEJ?E!6 zYXfUf0e4C00+EoA&}Bw~fKQ$=!@r&^YTCKMRorVo_6O3bLx<9Re$hn~fA>8bqHo`` z`-=Je^ZjoTKi-NJM+0BZLYiBchR)nuXtr*@6-P6VfUSc+I!gY at a-=; zp}5|*o#I;WA92p#zu&Vz|8;Jlb{rbKV*jN$Q*V~M!PZjaS-dZn2 zWvw?)#Q7eN>qU^%infh_SpUe3>lEB`dReEbHD{IC7>GAw6 z#q+u+CI4fWh~4Gxf9$yI^7-z=J4HVZo|!olejlXmjgQ~ESMcLtMLPU8NZ)wgq4Qol zWahu@*pX44QC(eaQLiah9LjfSdv1%VsRZ{=b=sU5KjH-RdhftWmv{j^o`se`3XoDgKE+erTl?|KQl6 z2gVK?i-4PX-3RL&zr@(l==j>PCs4haCrp49W5>3vZCP1?)|uG|%eqCe;-kV^2c at +R z*a(yp^~IXfEkVO*eNJ9u2%n04h%mX=7jnK#w*&?Cc0eV)l)N at WCo%-)IOQtUjNR%Y0=8Wo2c)f&u{-G&M97 zG&MC8urTxNUCqtSyLL6#)YQzb5%BEX++4O<)N6{Z;BYR#rK-zsijNas)1KR6O%1^? zrj5D-^qgb?7 at Qv6HPmd1dEWi=V7njXdHTPxrdt$8E60)?8 at qwL z0d)g0fB7cE_BFl=D_fcw z`q}=Pv6i=*=c|KWi})c?9Mw!umaW^w4$@*vGtOw1ucHG|a6Zwel8Zg~!VRp`l z(?d_>52)f3jKj at Pjm}UltPF*XWR;3-B1tvCEz}Z}ZnRx|dx7aP~RK;>^C)tj& zexeX;Hxxfp#pgM9vgP)$_ggW+$w?F^Un;>|FAJTyULwIB#*wUh& zHjEZtLvzgf z$jhk6U>GKEYh$$;zSS^{5Ji-LC#Sov- at _MShs7of4Ew6iL^8b-elLt-xJ5Zf1V%;s z?F_&ySP}jKWZN*m9RZsI{8)ScS|4DFVGXyDSw&c4OA$|9`&B at o6du2N&ly6PHvD7u$Jp9Cq0fC*J-JpkD zd3pJRHTqpn3)cMQlu5{`{t*$A$)qsjU0q#Q_#d|3d(r>!k3X9)^~|bT;ge$=bliMr zQQYw>hOAs&?}IM;i`In~s&7s-3O~=Q>J^C^L?V$@>}A*E&G(*pjAU#REJ-M at do#^wZpK%liHY3I(JdOlqCncupG1kusaU4z1gRjXD8?-Qk)Yd-1v%U$6WBk&sDTe-sv$M08xu^B@^>uZ1sXMWk zd1U_5BN!YJ>Uw4G+O{cbdp#g5Xz z{0_DB3dbfywD1#S0%7}rP{%XlS?|PBx0IFJ^R!$Je3EpZ!epyEC8|5JyN3h@{)b=l zAH073T6;@!R#sM2RMgdb?YdrB#Z^zp4zXm1IR2=R>=57H-cH?`qUW3QYmabXRQTkj zpuJz<@9*!EQ>*WHNXH{n$1 at YcY@11ZFNWc;sLc+}@bmxkALcwPt%YH#Cbm`xnpOBZlK>zGM;b4wH{zxgEU`xjT~7z_BKKM3mbBzh-A%RlPh&L zSFU!VJ#Mnin=pJT8#Ykn!XzHXtY|7^HWBTDgO}CGa4w+;_dbg_M09Y_b^?6vHmUE-GZBhG6XgkMBH2E89g!W0 zqVaF=fs2?sF%KfI2SuemOiO*cw(rjt>|aE^-^T75ELB2*Mrs^OW at 33DjcVf<6SAXP z|KhyAL4wF#4X_vhD=xbjL3G0Bfy}zs3o8y3L)zfZep3ZgV#P_3oV4{Eq!xa`pBKP0 zZvO96+O$@UngJOfSS7ibxC*ZfIL&byB3VSySt1yg at V+BL2oMe-SpZ=ZnP<-}n*$y! zQ4V?fxjYpE3#>5~tBcn7S9+_}h#>>L at N_49C~W_b!1C{6TdcHhV`_4(2!e}K%v!mU zZe)fcD&|@MAs1YeSuOEcX;os|D-lu(ce)LCWsh7TARov56H?;fnx=h7g~n#QZQ?EM z0)WOAUh>EKFm0*wxJ_c?JAtt!_t8%%NHZ0Z><(Zw%!=x|ElIQ2+k~? zx5WAosOu6O5D?&k>VV0FiHMWqAKyU>(&itz!NkM>@?fr@*iUWSpq7l96ksh z#H+dTKOPpK?1R`O)&`Tx#6gW}Umrr;*%rW`i(3vE!%@DCijds)?x5ty!EN;_CT5wy at E&>c=>v6BNPLVi} zt}1Bp2W`LYdsJ1$KXSnGsbLE3D)^sbyUWKcw?;m(yj#3LQ;*Dju0Hmtww8f8Rfuc4 z+}58MmoCju7@>N}!Tv?EGNzTj7gMCsFCszq1H{mKV7EBVwX?kU0fjt26l2rbkJAT0 zrZygIzmONNZZ7 at B69W1v^z^K#xO|zMo`-Nz{iMpVzxd^h87-jT(QLJM?U&!a+BZkT z3ewhn--;_Y1Yg{E-0k=>Nmi`-_d#od*kWcApVn!SZ5gvFbeT;3fd=uiu=$c^G#|xs~Dh% zvBWy>`dzxWZZA*F0PAc#`(w-LtQvRe>UJj8gF4rOP#%?wm#TzELkj?d({CbB8tD-DmNO zdgrUEJ|fQnbEmh2sIqzM*WVy2f*!j^+dT at 3GVEl$0JQI$=1DaaF1r*KxgM}W`gUgS zr7*R=Z6*jqG at 5u^O_2x=!Y9c5d3w#1DsIumLJWyd>;S02U;js{@rR*56GLa at VHWFE zVzyu;W|3ZHm=|j=7%%tKu8{0nc`<0_RRooegqJR;-2)RjbLAx|;$dEe+w<~Uw`Cvh zMx^#tsI1ag5GuI%cM^tKSDUw^O*1%F7uCD66N=7Y$dU`6S|Jcu3a)E)Lc)n at o7k3@ zla2%(L!|D!QSxnY_O9K_(}A$~by?@k(&3zIg;)}l*N)&jMB`hq_1Z<1d^d7EB9PW} z#)G-g0WMomT91=~)U>0EtIQjl7iASFPyndj*6TvXNkux;RPqm~F+ipIe_o}T#WC8O zx;k;{S3%E08^^@<1GbSUA#&z|BxFT`GJq1RlN?RPKC-ZgMBdK1D|buoc0+ at ljO+oF zNW7?@+pb?PsXx?RO~Z7gP;aQU=**_$6 at E3BtE;Pd^mC|y*yWFmjwTrJVv)dZ?=LV> z?t6rlEhZqzV%(3UID{}Y5r|rhpvL#jw7S6r2t!Ez9S*DPLv)kqGCQWh(Keeug*LLX zPSC&*87gjPBu5G-uN8jJ(I~C_Xzj<7U?ZXBJ}@|VoXY`+)#EeF zi{{TiB&!UVYIG2%wX55oUpWc^s-_#$)z$j!S&J9&MWQjQUQEJi1s{MBay0ey=V~ZG z-g1kIi;5~q3nBf=TAXRv!$`1XsV9RWc?UWYdR`s at Cnm(a?9^0jJ4;+G4e&VRvF{Q1 zykDHnbdPkN_pprB14*c{H1-tOU(T_>yCeUW0u#D+yFSb` zHFN=T at n=!d(f6XG&C_(nOJxjYiZ6b%U5ShG%yw*laA#Y6aq){B at y~t3cORX+NaIW{ zeW8-zyZzbP$wCvD%=W26T at 9J}{^45UNT_;Y3c=v6^6BP$MgIyZRPZQ+_G31O5H~vS zxg;}3n+FT-MAoI55|Qbzc={{}P(jv4l{)Ghiywa>+XB8HyG=>aP)BW*yUObmD-0m( z at r4MPK1fHP+E_w@2$fPTvsREoy*1aEQv!a*rCc!K%t3b#EOGn3Nkvl at H9VmkaEX&6 z&*hwB3p5+x@`0l+zwSFF{c#|Oq>?)I014>vX*rBs2|PrNLOa-U*4LhHl|TZIWXLev zzz*eg#`Js;S}9mV?j<@tYt4Y76d2QPZ#MEMsnJ at T>9x<1BRQQBN?(B;`5OICLjf31 z30ekV^mHFvTs at l;JJHows^RRg{SPW~Eg^Vlb0vx7%c|!OYD47?TC21T(Xciq`1*EY z2QV?BrHXM1fOCQ>VuCxVAVyswio8Dz&Pp~77OHI=)J0`-A=_^e7j}4SG%2nGeGTXk zM^p_KpT_viRG7^r?oDPrE0JZ1QRFeCKo16;!IHED&9kig8`e zEkNFP+MuM8Th%k>^vzAOn=+?=rH(8z1={l_d&|fA(*+RsrLGqWPDDf`T-~qE9C4v6 z@*hrUdDj7yMd6{zl&PJFwcCk%k4(SbL`%9od07b~g$$~_n)dWMGee8#e$(3-e6-T) z&D5&-32&xKSiW3S`)S!KswJrN(8ZhBD&9QI>VB){Z3UV?esZ%sBIN=`Ctg zMhdJ-QU{kJLQS+QP0^ix_AE@(oPG|;$>2_Jf1@(__Ozf*k84!4k!-6W=%l_iz5`@o z(uX5D*Tj at foCZ(7 at JRr^HR+RA=NA(oLMA6dx3F When jQueryUI was updated in the CCSR theme the corresponding CSS changes were not copied over at the same time, causing style problems with jQueryUI widgets. This patch makes the necessary changes. To test, apply the patch, clear your browser cache, and view any page which uses jQueryUI tabs (advanced search, bibliographic detail page). Tabs should look correct and correctly show which tab is active. --- koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 37 ++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css index 9f9979c..977ff90 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css @@ -2468,8 +2468,18 @@ span.sep { background-position : -7px -126px; } +/* jQueryUI Core */ + +.ui-widget-content { border: 1px solid #AAA; background: #ffffff none; color: #222222; } +.ui-widget-header { border: 1px solid #AAA; background: #E6F0F2 none; color: #222222; font-weight: bold; } +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #AAA; background: #F4F8F9 none; font-weight: normal; color: #555555; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #AAA; background: #E6F0F2 none; font-weight: normal; color: #212121; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff none; font-weight: normal; color: #212121; } +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee; color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec; color: #cd0a0a; } + /* jQuery UI standard tabs */ -.ui-tabs-nav .ui-tabs-selected a, +.ui-tabs-nav .ui-tabs-active a, .ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active, @@ -2478,11 +2488,6 @@ span.sep { outline: 0 none; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected { - background-color : #FFF; - border : 1px solid #D8D8D8; -} - .ui-widget, .ui-widget input, .ui-widget select, @@ -2491,6 +2496,7 @@ span.sep { font-family : inherit; font-size : inherit; } + ul.ui-tabs-nav li { list-style : none; } @@ -2508,10 +2514,16 @@ ul.ui-tabs-nav li { } .ui-tabs .ui-tabs-nav li { background: #F3F3F3 none; - border: 1px solid #D8D8D8; + border-color: #D8D8D8; margin-right : .4em; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected a { + +.ui-tabs .ui-tabs-nav li.ui-tabs-active { + background-color : #FFF; + border : 1px solid #D8D8D8; + border-bottom: 0; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active a { color : #000; font-weight : bold; } @@ -2520,7 +2532,7 @@ ul.ui-tabs-nav li { background : #F3F3F3 none; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected.ui-state-hover { +.ui-tabs .ui-tabs-nav li.ui-tabs-active.ui-state-hover { background : #FFF none; } @@ -2664,6 +2676,9 @@ ul.ui-tabs-nav li { /* jQuery UI Datepicker */ +.ui-datepicker table {width: 100%; font-size: .9em; border : 0; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { background : transparent none; padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } + .ui-datepicker-trigger { vertical-align: middle; margin : 0 3px; @@ -2819,3 +2834,7 @@ a.reviewlink,a.reviewlink:visited { .subjectSearch ul { padding-left: 0px; } + +.branch-info-tooltip { + display: none; +} \ No newline at end of file -- 1.7.9.5 From oleonard at myacpl.org Fri Jun 28 20:25:56 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 28 Jun 2013 14:25:56 -0400 Subject: [Koha-patches] [PATCH] Bug 10497 - star ratings not showing right in ccsr detail Message-ID: <1372443956-13637-1-git-send-email-oleonard@myacpl.org> Star ratings do not appear correctly in the CCSR theme because it lacks the image sprite used to display them. This patch adds the required file. To test, apply the patch and view a search results set which includes titles which have an existing rating. Ratings should appear correctly. View a detail page for an title which has a rating, and add a rating to a title which has no rating. Ratings should look correct and work correctly. --- .../opac-tmpl/ccsr/images/star-ratings-sprite.png | Bin 0 -> 2000 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/ccsr/images/star-ratings-sprite.png diff --git a/koha-tmpl/opac-tmpl/ccsr/images/star-ratings-sprite.png b/koha-tmpl/opac-tmpl/ccsr/images/star-ratings-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..1dadc550abfcc6824f5950c0caf717d5a26d8540 GIT binary patch literal 2000 zcmdT^3s)1 at 7M=`&@RXGH3Mg$;TI52l1*JSxV1l3`T!ciCr#D1`#fv}zK_t-OAp+4Q z(y%0g1zkW91wp0qN}&ml(1gbojXZ+_CIp5AkR&{8?F{~k&RTQMI(wh9&-Zy-~8&_;o+gq{@*Z@$!4=PMd^zJ z-ct|ll}e>Tp-`z*3tUf?Bz#_YcynPvaxPl_c&A#eUhe-^DLDQ-Cugzfn!Ja+GUT;7 z8uA;}MUl;1910msOIseGzNvGbIZvOgv3Xm4S5;p*`|u$*)P1e#7vNN?}blct_? zR5?9ly}5o}p%}S(byFo(4-U$@S~PO`5-V9HeZ4$!iy!GD<$5Rte2whQcvbN at n~e;n zDqr}nya-wmpX@(->fM at B+TpUuvztpzdR1G#QCqfAR?zI}IeOblgS0P~6|3(4JP<)u z at X3EpjLf859J_ZDLU zzw2$;RE?|;i>7~dSea^Ay#~*w#LK!879Q2lHCV}eeJ4{AR+8y&6T;p- at 1Jk_TEX|3 z&tlHD9b02vkc9;;<-~~s4#;>Rv)riZ4CeFr$e9f0%P{|y2lrN|raEafd2j5h7*ep{ zxz^TB- at X55nTy3@QB>6X_wPj_5jytO3yjce>qw&bQPJf;_yfFRb6n6q^7Hm2pSUunbfh>IiGS;mZfx{EEd~v>d5J1K|r`YdP(slOXz`TfZ!$K}A z)zr)`u@*qL_~&xW{~+LC01Z_vF~CC!#%M4ky8v3V-2}iq+&S$aTw#YX2{!9YhQ5Ol zoGz&lcrM`5enF2Hq3ta|Ej8w891gh^wtxXp51BMj6J)0YNqR(xgew{R9YdA+BlQ3q zM}+Kf^^+K0vi5^yrDJvj0P5N{l(JY_JW!XE2am?u+mi`)AEVc)gVz)E6k^%-*=gET zU91!&LWUa?VRSlu0zoV$CbBG$7y#GRaJ at 7%-HAXraA4=o at z`X?G!(+E#)GPaG^oX>749CpJUJqVZLG#$%4ErN;9|M$N!*pySp*X z>4;0A7DixOZ1P8{ftr7--ADuy41qB*zmc4FX~dv6MmFZkZtm4IMTX;dM#5>62EMZWWD%T-Nzw_~!ZOc+{rj z`raZnHT9c}zxWJqt#)SO77S at eS0v53Xu%6iy{TaQuor@@l$Gw)nw6J?rso%fG>)Zp?7inC7|Z1>U>zJ=zB;JMKTm8cqGeGq1oyJ0=sv z(jWJiWB%pc#ER1C#t%*zr?NV0{p0CcCRWZvV;2rrx3`lroA)O^#l%P|VK6!Q^^5wG zh|!CIt&$hWPm}NS92}w+?FcIvs*yy=Ye(t+&)i~3ju4CklKza1V_aIUKp#oK+sn_h I-h-C)H_bQ)TL1t6 literal 0 HcmV?d00001 -- 1.7.9.5