Commit graph

12141 commits

Author SHA1 Message Date
Jane Wagner
fde1abd82e Bug 4394 REVISED Allow opaccolorstylesheet syspref to use an external URL
Previous code would only allow for an auxiliary stylesheet on the same server.  This checks for
http in the opaccolorstylesheet syspref.  If it's found, sets a different variable pointing to the
remote server location.  If not found, retains the previous css directory path.

Also modifies the description of opaccolorstylesheet in the installer files to reflect current
usage as an auxiliary stylesheet.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-05-17 12:32:46 +12:00
74e2e63fd2 fix XHTML error in about.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 08:36:26 +12:00
76d40d97da Revert "Bug 4450 Use more consistent error returns in C4/Creators/*"
This reverts commit 1f56a04cad.

[RM note: I confirm Chris Nighswonger's testing that shows that
 the patch causes regressions, including breaking creating new
 label layouts.]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 08:36:26 +12:00
Katrin Fischer
205e0c3245 BUG 4499: Javascript error messages not translatable
- Administration > Patron categories > New Category (category.tmpl)
- Circulation > Checkouts > Toolbar (all tabs except Check out) (members-toolbar.inc)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 08:36:26 +12:00
Katrin Fischer
a633245864 BUG 4499: Javascript error messages not translatable
- Cataloging > New Record (addbiblio.tmpl)
- Administration > Currencies > New Currency (currency.tmpl)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:34 +12:00
Chris Nighswonger
d65db54e06 Bug 4141 Reconcile 3.0.x and HEAD database updates for 3.2.0
This is a partial fix addressing this error:

You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 at /home/koha/koha.prod/installer/data/mysql/updatedatabase.pl line 2916., referer: http://koha-staff.foobar.org/cgi-bin/koha/installer/install.pl

If there are no records in aqbudgets the result is an empty array which causes the sql to attempt to set AUTOINCREMENT to null.

This patch is being submitted on behalf of the Mapua Community Library.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:34 +12:00
J. David Bavousett
172cd6fe92 Correct URL for Baker & Taylor ContentCafe
This patch updates the URL for image links in ContentCafe

Sponsored by Plano Independent School District, Plano, TX, USA

[RM note: the previous book cover URL was for a varient of Baker
 and Taylor's service that has to do with 'bookstore integration',
 and if I remember correctly, the main difference is that the
 book jacket image had "buy now" text.  The version supplied
 in this patch should work for normal use of ContentCafe.]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
Paul Poulain
52645af2d6 (MT3318) RSS OPAC: Adding CDATA term in title and description tags.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
Colin Campbell
126dfd54ec Housekeeping in errors scripts
Enable warnings - remove Bug 2505 FIXME messages
Correct FSF address in License statement
To aid code analysis tools:
Call new unambiguously with arrow syntax
use noninterpolating quotes on noninterpolating strings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
b9ed528ab4 Fix for Bug 4485, System preferences page uses non-standard warning style
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
fb4c61f0df A couple of CSS and markup corrections
- moving inline style declaration to the default stylesheet
- correcting markup structure on advanced search screen to allow
  consistent custom styling

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
Jane Wagner
b1cf302ac8 Bug 4300 Display 866z summary holdings public note in OPAC
Added the 866z to the MARC21slim2OPACDetail.xsl file so that it displays
just above the 780 and 785 fields.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
Paul Poulain
7b2b05e793 stocknumber not saved properly
if you have a marc field, mapped to items.stocknumber, it's not saved properly in items.stocknumber

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
Matthias Meusburger
5db10480f8 MT2582: Fix user deletion without permission
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:32 +12:00
Chris Cormack
92f35aee3b wr-70205 Rental discount not being respected
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:32 +12:00
e88d2b3889 DB rev 134: DisplayMultiPlaceHold syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:32 +12:00
Colin Campbell
a855ecfba1 Bug 3928: Modified date should follow syspref
Changed arriveddate format to follow syspref
Fixed a whitespace error

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:32 +12:00
J. David Bavousett
aacf00e94b Bug 3928: Modification of date for serials.
When a serial status is changed to "Arrived" or "Claimed", the "Expected on"
date is changed to the current date.

A bit of rewriting to get it to apply on master - chris@bigballowax.co.nz

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:32 +12:00
Matthew Hunt
cca397e8d1 Display current selected category when editing lists.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:32 +12:00
ae66e3a0ba Fix for Bug 4475, AmazonLocale not used consistently
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:32 +12:00
5058112a60 Markup corrections for validity and to eliminate horizontal scrollbar
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:31 +12:00
d76216af0c Fix for Bug 4400, BIBTEX export from OPAC results in empty file
opac-export.pl tries to get two variables from marc2bibtex(),
but it only returns one.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:31 +12:00
089e23786d Bug 4470 Patron search result pagination bar
Obviously, Koha global pagination function could be improved. This patch
do something which belongs to this function. A CPAN module like
Data::Page could help or be an inspiration... 3.4?

There is also room for improvement in they way resultset are
constructed. The whole set is retrieved and just a subset is displayed.
It impacts performances for libraries with a great number of patrons.
The right solution would be:

  - to find the resultset size with SELECT COUNT(*)
  - to retrieved the exact subset with LIMIT and OFFSET SQL arguments

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:31 +12:00
Colin Campbell
b4eb19b6d3 Do not declare variables within (bogus) conditionals
if $index is unnecessary as we have made this true 5 lines above
variables should not be declared in conditionals if used outside of them
set $struct_attr to a sensible default to avoid generating warnings
in this assigment and elsewhere

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:31 +12:00
Chris Cormack
f80257330a Reserve and onloan were reporting the same cardnumber, due to a little bug in detail.pl fixed by this patch
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:31 +12:00
e339df410d Fix for Bug 3666, Overriding renewal limit means negative count in OPAC
Setting "renewalsleft" variable to zero if it comes out negative.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:31 +12:00
f23f442415 Fix template errors introduced in my last patch for Bug 4208
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:30 +12:00
Chris Cormack
a78576c31a Follow up to bug3093 patch 2010-05-11 17:12:40 +12:00
Jane Wagner
2894555f5c Bug 3093 add syspref to turn off multiholds button
Having the place multiple holds button at the top of the OPAC and staff search results has caused problems for some sites with tight holds policies; this syspref allows those sites to turn off the button.
2010-05-11 17:09:49 +12:00
Jane Wagner
8a1cb959c6 Bug 3671 Workaround for font display problem
If there is no 007 field, parts of the OPAC results data display in a
much smaller font than normal.  Adding a blank space in the span section
fixes it.
(cherry picked from commit 2ff55ef2a2443933881186323f5dec3fe40842dd)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-10 16:40:31 -04:00
e7f8cc8f5e bug 4403: look in appropriate theme/lang for bib display XSL
Note: approach used can be described as a hack at best; the current
language should probably become a session attribute.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-08 18:59:41 -04:00
3d8e99e5ec fix disappearance of language chooser introduced in recent patch
Note that xt/author/valid-templates.t did *not* catch the
missing /TMPL_IF

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-08 18:58:36 -04:00
a6d6be8958 quell 'non-initialized variable defaulttab' warning
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-08 18:57:41 -04:00
d407c9cb7c fix malformed call of XSLTParse4Display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-08 18:05:23 -04:00
841da504e8 Further corrections for Bug 4244, Use "checkouts" instead of "issues"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-07 13:26:29 -04:00
1127878bdc Style changes to cart popup window more compact display: - compact holdings list - adds list bullet image from the staff client
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-07 13:18:02 -04:00
Nahuel ANGELINETTI
6626e8fcca (MT #2966) fix opac-user.pl function problem
This uncomment a uselessly commented function that is needed by opac-user. And fix this function that doesn't work properly.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-07 13:10:59 -04:00
Colin Campbell
1f56a04cad Bug 4450 Use more consistent error returns in C4/Creators/*
A lot of routines were defaulting to return -1 in error conditions
but calling code was expecting a ref or object
use return with explicit undef (or emptyness in array context)
for these cases. Extended this to cases where return was not tested
( -1 might in some cases be legit data).

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 5cf2b78b6f)
[RM note: ... thereby undoing the revert]
2010-05-07 13:04:58 -04:00
46cbf7806c Bug 4465 Fixes translated boolean syspref inversion
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-07 10:39:14 -04:00
cbc9858323 another FSF address fix
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 20:31:26 -04:00
22eb0cfa1c fix two more instances of old FSF address
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 20:29:22 -04:00
Chris Cormack
5e2fcfd0b6 Adding new developers to the about page, need to do libraries next
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 19:58:27 -04:00
Chris Cormack
57e3cd67fd Adding a new developer plus 2 new meetings to the history doc
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 19:58:25 -04:00
0d8b67e73c exclude TinyMCE from non-UTF8 file checks
Since Koha otherwise had made no modifications to the TinyMCE,
we'll leave it alone.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 19:55:44 -04:00
1aebed5dc8 move misc source file test and fix scripts to xt/
The license and non-UTF8 file checks are closer to
author tests and don't really belong at the top level of the
Koha source tree.  Follow-up might be to converted them
to test cases in xt/author that can be run by prove(1).

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 19:46:51 -04:00
Lars Wirzenius
a2c1efa125 Add script to find source files that are not in UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 18:05:07 -04:00
Lars Wirzenius
3ad74a0919 Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 17:59:07 -04:00
Lars Wirzenius
6a730ce7a3 Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 17:58:54 -04:00
Lars Wirzenius
1fe2b9f613 Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 17:58:45 -04:00
Lars Wirzenius
d06333fb9d Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 17:58:39 -04:00