Commit graph

6058 commits

Author SHA1 Message Date
Chris Cormack
dbf6bd4be0 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-22 15:06:44 +13:00
Jared Camins-Esakov
0a1f05a5a2 Bug 5390: OPAC loses library selection
This patch ensures that the OPAC library selection masthead will always default
to the branch that is currently being searched. This only applies to systems
with multiple branches and OpacAddMastheadLibraryPulldown turned on.

To test: do a search in the OPAC, limiting by branch. The search results will
still have that branch selected in the masthead dropdown.

This patch also fixes bug 5852 and bug 3778.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 14:59:16 +13:00
Chris Cormack
7a71d2c5e8 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-21 20:39:05 +13:00
b9cee99da4 Bug 5065 Add ability to choose framework on import
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 20:36:35 +13:00
Chris Cormack
03890c90ac Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/en/mandatory/sysprefs.sql
2011-03-21 19:54:11 +13:00
Savitra Sirohi
589aac1540 Bug 5466 - Acquisitions - ability to set currency in order screens
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 16:51:40 +13:00
Salvador Zaragoza Rubio
0499633a6b Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer
It has been detected an incompatibility with Internet Explorer in the ajax.js
file that cause a javascript error for this browser that prevents proper
operation.
The error occurs because the "localName" is not supported by Internet Explorer
and returns "undefined".

Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer

Fix error on comma for IE

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 12:00:36 +13:00
Paul Poulain
01b6e7a6dd Bug 5892 : opac-user: minor spelling/html changes
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 11:58:32 +13:00
Julian Maurice
632277e453 Bug 5864: link biblio => serials subscription is wrong
The GetSubscription function can be called with 3 parameters : title,
issn, biblionumber.
In biblio view (both opac & staff interface), the link to jump from the
biblio to the subscription(s) was done using title.

The result was that for a title like "Science", all subscriptions
containing "science" in the title were linked.
That's too much and that's false.

This commit fixes this problem by calling GetSubscription with
biblionumber only where applicable.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 11:54:21 +13:00
1b57668d7e 5622: Improve display of MARC21 773 field in XSLT detail view
Applies change to OPAC and staff detail view.
Chops punctuation. Adds 773g. Strips MARC org code from URL.
Utils code is used as basis for patches #5662 and #5663 too.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 11:05:11 +13:00
Chris Cormack
1a5270bdd0 Merge remote branch 'kc/new/enh/bug_5848' into kcmaster 2011-03-18 10:46:01 +13:00
Julian Maurice
465ff64825 Bug 5848: Remove duplicated tabs in opac details for Unimarc
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:45:22 +13:00
Chris Cormack
2ea6fdec15 Merge remote branch 'kc/new/bug_4218' into kcmaster 2011-03-18 10:38:40 +13:00
4b1fe1c9c3 Follow-up fix for Bug 4218 - Staff client detail page doesn't show hold status
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:38:07 +13:00
Sophie Meynieux
6282f652b2 Bug 5889: Messages name in english for notifications on public interface.
Modification of template to allow multilanguage support. Alsa fixing columns
overflow.

BibLibre bug #5939

Tests: It works. Messages strings can now be extracted and placed in .po file
for translation.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:25:08 +13:00
Paul Poulain
e28e34fbbb Bug 5882 : catalogue/moredetails (minor) changes
MT3288 moredetail.tmpl Lost and Damaged first choice is empty

    First choice was the first value of the authorised value list
    This is not handy for users.
    Rather than showing the first value, inserting a new empty value for users to see what to do

Term "Total Renewals" misleading, change to "Current Renewals"

    In koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl under History,
    there's a Total Renewals entry: seems to indicate a cumulative count of renewals on
    the item, which it is not, contrary to "Total Issues" just below.
    Moved the line up outside "history", and renamed it "Current Renewals".

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:15:21 +13:00
Nicole C. Engard
3141202764 Follow Up Bug 5869 Update Report Page Title
The title said Checkout Stats - updated to say Holds Stats

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:13 +13:00
Nicole C. Engard
e05bb4ef85 Follow Up Bug 5869 Fix String Errors
This patch fixes all occurences of 'reserves' to 'holds.' It also
added Holds to the menu include and updates capitalization and spacing.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:11 +13:00
Chris Cormack
2b1de0948d Bug 5869 - Follow up patch, fixing copyring and s/reserves/holds/
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:09 +13:00
Paul Poulain
99b0a074eb Bug 5869 : Adding a reserve report
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:08 +13:00
Jared Camins-Esakov
de4619b849 Bug 5816: XSLT doesn't display enhanced contents
This patch corrects and standardizes the display of enhanced contents (MARC 505
with ind2='0').

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:32:41 +13:00
6b0a84c26d Bug 5863: Add to Your Cart disappeared if login disabled on opac detail
Resolving an error in ready function by additional conditionals.
Moving a line from ready to html just as in other view templates, correcting the order of menu options at the same time.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:28:05 +13:00
Chris Cormack
74c37aeeb6 Revert "Merge remote branch 'kc/new/bug_5734' into kcmaster"
This reverts commit b18ae6dee6, reversing
changes made to a52d4e8a70.
2011-03-16 16:28:00 +13:00
Chris Cormack
1e98195b10 Merge remote branch 'kc/new/enh/bug_3495' into kcmaster 2011-03-15 22:01:45 +13:00
Katrin Fischer
9dfc9d4d12 Bug 3495: Fast bib record add at circulation
The link to the Fast add framework was never shown.
Now the link is shown if you have the right permissions (fast cataloging or superlibrarian).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 22:00:23 +13:00
Chris Cormack
76d52d89e4 Merge remote branch 'kc/new/enh/bug_3659' into kcmaster 2011-03-15 15:58:26 +13:00
251e2c4d74 Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Revision fixes some markup and corrects an error that would lead
to the hold being initiated for the remembered patron when this
was not intended.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 15:48:09 +13:00
Chris Cormack
fc2fe083fc Merge remote branch 'kc/new/bug_5693' into kcmaster 2011-03-15 10:04:38 +13:00
Chris Cormack
9b5e18c4ee Bug 5693 : Follow up patch, escaping HTML in limit_cgi so "" dont break hrefs
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 10:02:37 +13:00
Janusz Kaczmarek
d6e580439b Bug 5819 : No toolbar in record view when quotes present in title - fix
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Was able to reproduce problem by surrounding 245$a with "".
Patch fixed the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:57:15 +13:00
1ff13b5aa6 Bug 5848: Same position for the tabs of Normal, MARC and ISBD view in opac detail
Adjusts three opac detail templates. Moves few styles to css.
Removes duplicate view info from XSLT file.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:50:03 +13:00
Chris Cormack
c88f43fc67 Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not
Default is on

Part of bug 5609

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 16:18:08 +13:00
Jane Wagner
f087137f9c Bug 5810 revision to fix author search link
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-13 15:03:06 +13:00
Jared Camins-Esakov
4bc293c3aa Bug 5810: Subject tracings search complete subfields
This patch adds the syspref TraceCompleteSubfields. When TraceCompleteSubfields
is set to "force," clicking on links in non-authority controlled subject
tracings will only find other records where the entire subfields match. Leaving
it at "don't force" keeps the current behavior of doing a keyword search of the
subject indexes.

This patch implements complete-subfield subject tracings in MARC21 XSLTs (OPAC
and Staff) and all Normal mode interfaces. UNIMARC XSLTs have not been updated.

This patch also adds the syspref UseAuthoritiesForTracings. When set to "Do not"
tracings in the XSLT detail displays will never generate links using authority
numbers, but rather use the heading strings (NB: the tracings currently use only
subfield 'a' for generating links).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-13 15:02:59 +13:00
Chris Cormack
554c77569d Merge remote branch 'kc/new/bug_3013' into kcmaster 2011-03-13 14:02:06 +13:00
Janusz Kaczmarek
728b3725df Bug 5569: Corrections to addbiblio.tmpl to be able to delete repetable mandatory subfields
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 20:48:54 +13:00
326222e3f1 Bug 4072 Lost items aren't hidden on OPAC result page
When hidelostitems system preference is enabled, lost items are hidden on OPAC
detail page but are shown on result page. This patch modify MARC21/UNIMARC XSL
in order to take into account hidelostitems syspref on OPAC result page.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 12:52:57 +13:00
d163e7e578 Bug 5830 Using XSLT on OPAC Lists page
On OPAC Lists page (opac-shelves.pl), biblio records are now displayed
accordingly to OPACXSLTResultsDisplay system preference.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-08 08:53:56 +13:00
Chris Cormack
b06a289173 Merge remote branch 'kc/master' into new/bug_3013 2011-03-08 08:28:42 +13:00
Salvador Zaragoza Rubio
519cb622db Bug 3013 - Value builder for 006 and 008 need choices for all format types
Modification of the intranet cataloguing plugin for 006/008 fields to allow
select a type of material and change the positions available to enter the data.
Data are hard stored in xml files to allow easy translation and processing through
Javascript and JQuery-AJAX.

Bug 3013 - Fix selection of combo and trailing whitespace

Bug 3013 - Fix selection of combo

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-08 08:28:32 +13:00
61adeac859 bug 5783: follow-up system preferences tweaks
* add the AuthoritiesLog system preference to all
  language installer SQL scripts
* options for a 'YesNo' should be '', not '0'
* fix wording glitch on preferences page

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:09:23 +13:00
8af91c079a bug 5783: Authorities edit logging
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:04:12 +13:00
Paul Poulain
b2e7b5aaca Bug 5835 : adding a class to index <select>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 14:01:28 +13:00
Nicole C. Engard
d6718e14e7 Bug 5820: Change language to 'Fund' over 'Budget'
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-06 08:40:28 +13:00
Nahuel ANGELINETTI
6b285cf44d (bug #5157) fix borrowers top issues
this fix filters of borrowers top issues that doesn't work really well... perhaps because reports scripts need too much improvment.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-06 08:31:08 +13:00
Ian Walls
4735e296cf Bug 5824: Creating a circ rule for a specific library causes anomalies
The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.

This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-05 20:38:36 +13:00
2dde876798 Fix for Bug 5818, Date picker broken on label batches
Calendar picker JS can't come before main JS includes

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-05 20:35:57 +13:00
Paul Poulain
ca8ae9b8cc BZ5432 follow-up, removing test string
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 13:22:55 +13:00
Stéphane Delaune
3cc0939622 Bug 5432 : (MT #4584b)Add duplicate support for borrowers
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 13:22:54 +13:00
32d5fe33aa Fix for Bug 5817, Malformed author search link breaks sorting on results page
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 13:20:48 +13:00
Chris Cormack
cb652af481 Merge remote branch 'kc/new/enh/bug_5792' into kcmaster 2011-03-04 12:54:59 +13:00
Nicole C. Engard
19adf162ca Bug 5792 - Add reference icon to Bridge icon set
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 12:54:20 +13:00
Nicole C. Engard
bbd08ffd09 Bug 5799 make language on circ history consistent
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 12:52:43 +13:00
Jared Camins-Esakov
83ab549724 Bug 5811: Add sysprefs to control overriding fines
This patch adds two sysprefs to allow libraries more fine-grained control over
when fines can and can't be overridden. The two sysprefs are:
* AllFinesNeedOverride - when this syspref is set to "Require" (default) any
    fine will require a staffmember to override the fine in order to check out a
    book.  When set to "Don't require," fines below noissuescharge will not need
    any override.
* AllowFineOverride - when this syspref is set to "Allow," staff will be able to
    override fines that are above noissuescharge. When set to "Don't allow"
    (default), staff will not be able to check out items to patrons with fines
    greater than noissuescharge.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 09:33:18 +13:00
6ded7b9897 Fix for Bug 5814 - Style error message on manage staged records page according to standard
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 09:23:15 +13:00
f8c85a6bc8 Follow-up fix for Bug 5804, acqui duplicate warning
Typo fix. Thanks for spotting it Marcel.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-03 12:14:56 +13:00
07cef41c73 Fix for Bug 5804 - duplicate warning when ordering needs design work
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-28 09:18:26 +13:00
Jared Camins-Esakov
02d15007df Bug 5723: Font for 780s on staff client shrinks
This patch fixes the bug that caused 780s in the staff client details XSLT to
display in progressively smaller fonts. This also corrects the semantics of the
780 ind1.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-28 09:12:55 +13:00
Chris Cormack
622f804ffd Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-28 09:09:33 +13:00
575a690b4e 2742 Encoding problem
Small correction of e umlaut. [Something happened with encoding of signed patch; my original patch did not show a wrong character.]

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-28 09:07:02 +13:00
ruth@bywatersolutions.com
0b961c0ae0 Bug 5805: Having items in-transit can cause derangement of the hold list
If you have a list of holds on a biblio, and one or more are in-transit, then the
array that is fed to modrequest.pl is not fully-populated, lacking the branch on the
in-transit rows.  If you then attempt to edit one of the remaining holds' pickup
location, it doesn't modify the one you expect, but ones *above* that.  Also, holds
at the bottom of the list get the first pickup library in the list, since they are
getting undef passed in.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-26 20:44:01 +13:00
Katrin Fischer
38b59b7b53 Bug 1962: Add fine notification during check-in
Original patch submitted by dswhite42@yahoo.com

Reformatted to apply cleanly.
Changed alert message during check-in to message used
on borrower account checkout page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-26 19:52:56 +13:00
Chris Cormack
2a3f7c1417 Merge remote branch 'kc/new/enh/bug_3550' into kcmaster 2011-02-22 08:37:34 +13:00
Chris Cormack
f75f964ba4 Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-22 08:37:25 +13:00
Colin Campbell
bf1939798f Bug 3550 : Display changes needed in opac-results-grouped too
Change to how subfield is derived had not been implemented in
opac-results-grouped causing ARRAY(hexnumber) to follow all titles
Replace template ref to scalar with an array

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-22 08:36:13 +13:00
marcel@libdevelop.rijksmuseum.nl
fc1b7201c5 2742: Wrong language name in the preferences
Follow up patch. Improvement suggested by Belgian translators (Hans Supply).

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-22 08:33:11 +13:00
febba50ba8 Bug 5782: Add warning when ordering a duplicate record from external source
Enhancement for Acquisitions/ordering from external source.
Koha already checked for duplicates, but this patch warns the user. Offers the choice to use existing record, use new record or return without making an order.
The new template is added for this interaction with the user.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-22 08:24:01 +13:00
a0367aa973 Fix for Bug 5776 - menu on funds wraps when only 1 fund
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-21 16:24:46 +13:00
Reed Wade
1f0e0c5de1 Bug 5741 - Extra comma causes JavaScript error in Internet Explorer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-20 20:29:07 +13:00
ed2b583eb1 Fix for Bug 5769 - notice tab disappearing on edit patron
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-18 10:10:10 +13:00
fb5ede8b59 Fix for Bug 5140 - In Chrome, drop-down menus disappear after using pop-up calendar
Disabling that part of the calendar JavaScript which hides
<select> form fields when the calendar is displayed. This is at
the expense of IE6.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-18 09:47:41 +13:00
Chris Cormack
36d64bd18c Merge remote branch 'kc/new/enh/bug_5462' into kcmaster 2011-02-17 09:47:14 +13:00
4797959964 Follow-up fix for Bug 5462, Fix variable names so we dont break template::toolkit
A change was made to MARCdetail.tmpl without making a corresponding
change to MARCdetail.pl. I've reworked the original change so that
both can work together.

0XX --> tab0XX

Apparently TMPL variables can't start with a number now?

MR: Recreated patch file to recover failure to apply.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-17 09:42:56 +13:00
3e26abc9cd Follow-up fix for Bug 5760 - Add the jquery table sorter to reading record
- Removing option to show 50 items/show all from script and template
- Adding parser to exclude articles in title sort (en only, see Bug 5766)
- Setting default sort to 'date due descending' as it was previously

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-17 08:28:29 +13:00
Paul Poulain
761fa37297 Bug 5760 : MT3137 : Adding jquery.tablesorter and jquery.tablesorter.pager support for readingrec.pl
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-16 14:45:41 +13:00
Paul Poulain
2f9bebf802 Bug 5759 : displaying 2nd email if there is one on print template for borrowers
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-16 08:57:48 +13:00
Chris Cormack
3f35705ddc Merge remote branch 'kc/new/enh/bug_2170' into kcmaster 2011-02-15 15:55:54 +13:00
173d3cbb2d Follow-up fix for Bug 2170 - Adding 'edititems' user-permission
Save button and duplicate confirmation redirects must respect
the edititems permission: Users without permission to edit items
should not be redirected to the edit items screen.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-15 10:31:22 +13:00
50c0ae09a1 Partial fix for Bug 5745, Overdues with fines report not showing titles
- Adding title, subtitle, and author to output
- Reworking display of shelving location selection

Patch does not address the contents of 'overdue status' and 'notified by'

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-15 10:12:36 +13:00
Chris Cormack
a10566b53c Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-15 10:04:43 +13:00
d2cf30820f Follow up on bug 2742: Correct language names in install
Rename the phonetic name in about, just like an earlier patch did elsewhere.
Make the distinction between the two Dutch translations more clear.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-15 09:55:20 +13:00
Chris Cormack
b18ae6dee6 Merge remote branch 'kc/new/bug_5734' into kcmaster 2011-02-14 10:53:17 +13:00
Paul Poulain
adb1aefaf3 Bug 5734 (MT3625) Fix column order in issue history
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:52:29 +13:00
Chris Cormack
a52d4e8a70 Merge remote branch 'kc/new/bug_5649' into kcmaster 2011-02-14 10:33:41 +13:00
Schuster
ace3f0b70a bug 5649: changes the white/blacklisting to approved/rejected consistent wording
Changes the wording to approved/rejected to be consistent with other wording

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:33:07 +13:00
53566f09fb Fix for Bug 5722, other reason for suggestions has code in text box
Input value attributes shouldn't have _() escaping.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:27:49 +13:00
9c0752edf2 Fix for Bug 5679 - funds planning showing strange borders
Table border style needed more specificity

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:24:44 +13:00
9319ab3254 Fix for Bug 5715, Adding note about ReservesMaxPickUpDelay value
Also correcting display of itemtype based on item-level_itype preference

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:19:29 +13:00
af1009da3d Bug 5735: Expanding/collapsing cloned fields in editor takes original field
Adds corrected onclick response for expanding marc tags.
Removes some lines that did not work as promised.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:50:32 +13:00
Chris Cormack
0dedbfba5a Merge remote branch 'kc/new/enh/bug_5733' into kcmaster 2011-02-14 09:29:19 +13:00
61f6828d12 Follow-up fix for Bug 5733 - Empty cart in intranet when session is closed
Modifying empty cart function to take a paramter: if true,
cart will be emptied without a prompt.

Removing unnecessary  "javascript:" pseudo-protocol.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:28:12 +13:00
3a83dc79c5 Fix for Bug 5743, 5743 - Make login errors a little nicer
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:14:46 +13:00
Katrin Fischer
f889cbaa25 Make 'about' show D Ruth Bavousett's name change
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:08:44 +13:00
Nicole Engard
77939915c0 Bug 5746: Add space after 'enhanced content' on OPAC
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 08:37:44 +13:00
Paul Poulain
94bd7ad545 Bug 5733 : MT3531: Intranet cart is emptied when session is closed
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-10 15:07:22 +13:00
d7208f76bd Fix for Bug 5716 - Whitespace correction for browse shelf
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 21:55:32 +13:00
Koustubha Kale
dcfeab4eee Adding id tags to some OPAC templates.
Many of the templates in OPAC, which deal with users data eg opac-account.tmpl, opac-passwd.tmpl etc do not have a id for the container div,
like opac-user.tmpl has an id userdetail. Having these id's makes it easier to customize with css.
This patch adds id's to most of the <div class="container"> tags.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:20:45 +13:00
koha-preprod
de491849ac Add markers to text in Javascript variable in order to be translate.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:13:06 +13:00
koha-preprod
b5c58f964a Bug 5629 : Adding an HTML anchor in the link in order to choose the right tab when we click on the link
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:10:30 +13:00
Brice Sanchez
02824a0b08 Bug 5702 : Adding if statement condition to highlight toggle
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:06:49 +13:00
Chris Cormack
7c376879b4 Bug 3495 : Providing a link to the fast add screen in circulation for an item that isn't found
Squashed commit of the following:

commit bf7fb7971d2d6ea6b3ea09bda571bdc3399efb35
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Wed Feb 9 13:53:38 2011 +1300

    Bug 3495 : Wrapping link to the fast cataloguing page with syspref and permissions

commit ae7e2c278e10efea94e19b75446d7fed25272de2
Author: Paul Poulain <paul.poulain@biblibre.com>
Date:   Wed Dec 15 20:50:45 2010 +0100

    Bug 3495 : Add link to Fast cataloguing in case the scanned barcode don't exist in circulation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 13:58:43 +13:00
Paul Poulain
3a29f37dff Bug 5726 : MT1059 Follow-up : Fix merge reference selection presentation
A change in global-staff.css messed the merge reference selection presentation

    Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 13:47:00 +13:00
8ce06ddf32 Bug 5701: Distinction between authors/additional authors in staff normal view (MARC21/XSLT)
At this time all entries in 100/110/111 and 700/710/711 are shown together.
We want to see the difference between an author and an added entry. (The 700
author could for instance be an illustrator.)
To this end we like to see the eventual relator code or term in $4 or $e too
(displayed between brackets after the name).

In the patch the code for authors is moved to a template routine at the end of
the xslt stylesheet.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-08 21:15:37 +13:00
Chris Cormack
a8222aeeb1 Merge branch 'new/bug_5277' into kcmaster 2011-02-07 21:13:56 +13:00
Chris Cormack
a4cc394508 Bug 5691 - Delete all items respects independentbranches system preferences
Squashed commit of the following:

commit 66cdb8804136803a3f626d183c8f192f61f3c7b1
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Feb 4 12:55:10 2011 +1300

    Bug 5691: Updating copyright statement

commit 79ef6c269afc9c644c51709a7657542a0fc6d7d6
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Feb 4 12:52:13 2011 +1300

    Bug 5691 - Fixing a syntax error and tidying up some formatting

commit a66485dba113c05ed51a3b4ff19f788e335aa1f6
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Tue Oct 5 17:23:55 2010 +0200

    (MT #1365) Delete all items

    Using DelItemCheck in cataloguing/additem.pl
    when deleting all items

commit fe845fd48ab22ff82ad6d8971c468c327b49f3c4
Author: Christophe Croullebois <christophe.croullebois@biblibre.com>
Date:   Wed Sep 22 11:39:28 2010 +0200

    (MT #1365) Delete all items

    Now if IndependantBranches is on and a user try to delete all items, only the items of his branch will be deleted.
    A message explain this fact.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Followup: (MT #1365) Fixing up the English idiom
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-05 07:41:29 +13:00
7acfb3a17f Fix for Bug 5532 - sysprefs editor should show names of saved prefs
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-04 13:38:05 +13:00
aac253a5e0 Fix for Bug 5689 - System preference notifications are not translatable
Defining strings in the template so that they can be translated.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-04 13:29:43 +13:00
dec6be9148 Fix for Bug 5115, Tags JavaScript includes many untranslatable strings
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-04 13:25:22 +13:00
Chris Cormack
3b5aa120d7 Merge branch 'bug_5462_signoff' of git://github.com/colinsc/koha into new/enh/bug_5462 2011-02-04 08:52:39 +13:00
Christopher Hall
0088c5da53 Bug 5462: fixed current preferences tab highlighting bug created by dashfix
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:58:52 +00:00
Christopher Hall
8fd29f3d62 Bug 5462: both intranet and opac seem to be 'clean', still need to make relevant changes in scripts
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:57:00 +00:00
Christopher Hall
6ed8d1425d Bug 5462: fixed incorrect TMPL_IF
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:56:31 +00:00
Christopher Hall
c02e4d02d5 Bug 5462: fixed dashes (replaced with _) and fullstops (removed) for variable names
Done within opac and intranet templates, still needs to be done for corresponding scripts.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:54:50 +00:00
e6a3029470 Fix for Bug 3319 - Need error message when adding patron and libraries are defined
- Hiding patron add toolbar when branches or categories are undefined
- Blocking patron entry form if branches or categories are undefined
- Removing nonfunctional template logic for displaying missing category
  error message.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:21:45 +13:00
Chris Cormack
35b47b6ff7 Bug 4931: Stocking can be by homebranch or holding branch
Squashed commit of the following:

commit 105de81639cbac5084e4a5c099b19569043e69ff
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Tue Jul 13 11:58:01 2010 +0200

    (bug #4931) fix forgottens input in buttons

    the previous patch missed an hidden input in next buttons that break next page. This fix it.

commit db00295a6b9d1d36fc888ba6a0558011fd6884ba
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Fri Jul 2 15:27:59 2010 +0200

    (bug #4931) add the ability to choose home or holding branch in stocktaking

    This add radio box in stocktaking to base it on home or holdingbranch

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 4391 Followup: Adding back lost declaration of $branchcode
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 13:50:57 +13:00
Reed Wade
241fa939b4 Bug 5665: Routing slip prints too wide for narrow printers
This patch switches off some min-width styling which causes right hand
of page to be clipped.

Work sponsored by Opus

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-01 19:31:58 +13:00
86576e7fd2 Revised fix for Bug 3850 - Budget Planning Pages Need Design Work
- Filter moved to left-hand sidebar consistent with other pages
- Export option moved to left-hand sidebar to improve visibility
- Show/hide column controls moved to their own role with clear labels
- "Locked" icon added to replace indicating locked status by row color

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-01 19:26:46 +13:00
Ian Walls
a0dc124a95 Bug 3881: OPAC Privacy reimplementation
Reimplements Paul Poulain's original OPAC Privacy patch, with some minor improvements and changes to wording

If the library enables the OPACPrivacy system preference along with the opacreadinghistory preference, and sets
an AnonymousPatron (must be a valid patron number in the database), the user will see a new tab upon login to
the OPAC, My Privacy.  From there, the user can:

- Set their OPAC Privacy to one of three values
  0 - Forever.  This keeps their reading history unless they explicitly delete it; the bulk anonymiser won't touch it
  1 - Default.  Keep reading history until either they delete it or the library does
  2 - Never.    Instantly anonymises reading history upon item return

- Instantly delete their reading history
  There is a warning and a popup to confirm.  I've removed Paul's extra confirm checkbox, which seemed redundant

A note of which preference the patron has selected is added to the Patorn Details page in the staff client.  This is read-only.

This patch also consolidates Privacy system preferences into the Privacy section of the OPAC tab.

Thank you to BibLibre for the original implmentation of this patch, and Los Gatos Public Library for funding and
testing the reimplementation.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-31 22:23:50 +13:00
Chris Cormack
1c461680c8 Bug 5452 - Overdue date color in borrower's today issues
Patch sent by Fridolyn SOMERS, but not in git format
2011-01-30 07:58:48 +13:00
Schuster
460a7b566b BUG 5649: Change wording on review.tmpl from white\black to approve\rejected consistent with the rest of the page
Changes the wording on review.tmpl from white\black to approve\rejected consistent with the rest of the page

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-29 19:18:44 +13:00
b69ad9de3e Fix for Bug 5650, item type page key wrong
- Fixes for authorised_values.pl and itemtypes.pl
- Hiding table when there are no values to prevent js error
- Hiding table pager when there are no values
- Removing paging code from the script

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-26 19:50:49 +13:00
Chris Cormack
e1b1c43425 Revert "Fix for Bug 3659, Add place hold option from patron checkout tab"
This reverts commit da2040634e.

Wrong patch was applied
2011-01-25 06:24:32 +13:00
da2040634e Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-24 20:43:04 +13:00
Chris Cormack
211399668a Bug 5618: Multiple renewals in the opac
Enables logged-in OPAC patrons to renew multiple items at once using checkboxes.

Errors are now handled better (for example, when item is on reserve)

Sponsored by Los Gatos Public Library

Squashed commit of the following:

commit 020d9904ddb22af238c8a90c1f7447ead5a6d0e7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Thu Jan 20 08:57:01 2011 +1300

    Bug 5618: typo fix

commit 147cfd91dbe88fd58c5d404db9bf06a21310e2ef
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Thu Jan 20 08:47:39 2011 +1300

    Bug 5618: Adding better error handling for reserves, and always redirecting instead of exploding

commit 2dfb6c687d0d38c240e22d41f2aef6e3a9e53f02
Author: Chris Cormack <chrisc@koha.(none)>
Date:   Fri Jan 14 15:39:20 2011 +1300

    Bug 5618: Is mostly working now, needs some prettying up

commit f8d260a4dcde144c9ed487521a79ee687ff8feb3
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Jan 14 15:03:45 2011 +1300

    bug 5618: Initial commit to set up checkboxes for choosing multiple items

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-24 07:25:54 +13:00
Robin Sheat
1bf3dd45df Bug 5551 - allow shelf browser filters to be changed
This adds three system preferences: ShelfBrowserUsesLocation,
ShelfBrowserUsesHomeBranch, and ShelfBrowserUsesCcode. These can be
toggled to determine whether the shelf browser will ensure that the
items being show will match against location, homebranch, or collection
code, respectively.

Note that this also involves a bit of a refactor to clean up the shelf
browser code.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-21 11:08:42 +13:00
Chris Cormack
a787b54bd9 Merge remote branch 'kc/new/enh/bug_5628' into kcmaster 2011-01-21 09:20:41 +13:00
Chris Cormack
ab2f589ec7 Bug 5268: Combining icons with liblime-kids 2011-01-21 08:51:09 +13:00
Chris Cormack
91906e1d03 Bug 5640: Adding the icons to the opac also 2011-01-20 21:03:56 +13:00
Paul Poulain
5483171eca Bug5640: BZ5640 (MT3584): Nimes icon set
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-20 19:35:30 +13:00
Chris Cormack
be1a194d6c New icon set, renaming and making files in the intranet too 2011-01-19 14:42:46 +13:00
claudia
422df40deb New icon set for kids, has ben rezided to 48 by 48px
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-19 14:41:42 +13:00
b63a2ae03f Bug 4289 Followup: Add syspref default value and in opac.pref
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-19 14:30:37 +13:00
Mason James
f46b03cf2d Bug 4289: 'OpacPublic' feature
applied to git tag 'v3.02.00-rc'

Frédéric Demians:

  - Rebased this patch to HEAD
  - Solved a merge conflict
  - The patch works as described here:
    http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4289

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-19 14:30:34 +13:00
Dobrica Pavlinusic
7fd062814d Bug 4920 - neworderempty.tmpl shouldn't call calcNeworderTotal() onload
Currently, modifying existing orders will recalculate values if exchange rate
has changed, which destroys previous data (our use case is just to modify
Planning value fields).

Since fields also have onChange event which also triggers caclNeworderTotal,
onload event seems redundant.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-17 20:53:04 +13:00
f45969422c Fix for Bug 3459, topissues doesn't take care of ccode
- Change conditional to display filter in sidebar without EXPR
- Enhance switch between ccode default and itemtype default searches
- Enable preselect of submitted collection code in filter form,
  stealing code from opac-search.pl

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-14 11:00:25 +13:00
a660b25aa0 Fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view
Fixed by doing a pretty dumb copy of GetMarcNotes. Functional,
but it could be there is a more efficient way to do it given
we want one repeating tag rather than a range of tags?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- fixed small typo in opac-detail
- corrected isbd punctuation in opac-detail
- tested with 0, 1, 2, 3 isbns in 020, MARC21
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-14 10:48:47 +13:00
Nicole Engard
b7fdfc1384 bug 4131 have subscription so edit routing if one exists
Changes the template variable checked in serials-menu.inc for determining where to
show 'Create Routing List' or 'Edit Routing List' to hasRouting.

Also adds the $hasRouting variable to serials/routing.pl and serials/routing-preview.pl,
for completeness.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 12:13:34 +13:00
Nicole Engard
50694f3959 bug 5486 remove note about HomeOrHoldingBranch being removed soon
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 10:23:11 +13:00
Ian Walls
58d7321469 Bug 2142: reinstate maxItemInSearchResults systempreference
Reinstates the deleted maxItemsInSearchResults system preference, which was erroneously thought to no longer be utilized.
It's removal has led to bug 4430

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 08:47:44 +13:00
Nicole Engard
4173f2221f bug 5492 update import patrons page title
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 23:04:11 +13:00
Nicole Engard
d1ef831360 bug 5604 additional icons in the Seshat icon set
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 23:03:16 +13:00
98efac4c0a Fix for Bug 4945 - Patron search is limited by default to the currently logged-in library
I couldn't figure out how (or whether) GetBranchesLoop could be
convinced to return a list of branches without selecting one, so
I swapped GetBranchesLoop with GetBranches. This will preselect
a branch only if a branch has been submitted as part of a query.

This does NOT preselect the correct branch when IndependantBranches
is turned on.

I also added a template variable which is true if a query has
been submitted with a branch or a category so that the extra
form fields can be displayed, reminding the user that they
added limiters to their query.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 15:35:09 +13:00
Chris Cormack
c0441ebbfb Merge remote branch 'kc/new/bug_5186' into kcmaster 2011-01-10 09:14:22 +13:00
Chris Cormack
2ba1ba0cfc Merge remote branch 'kc/new/bug_4838' into kcmaster 2011-01-10 09:13:17 +13:00
1b344bdbd1 Fix for Bug 4984, Invalid XHTML in staff client search results
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-10 05:25:29 +13:00
05c240953a Additional fix for Bug 3550, Use GetRecordValue to get the subtitle
- Adding subtitle to Hold Ratio report output
- Sorting by default on ratio, descending
- Adding author
- Removing description

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-10 05:18:32 +13:00
86df2d1efa Bug 5480 Some usual UNIMARC cataloguing plugins doesn't work anymore
[3.2] To be applied

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-10 04:47:20 +13:00
Chris Cormack
88fb22f081 Merge remote branch 'kc/new/enh/bug_4820' into kcmaster 2011-01-07 14:27:06 +13:00
10c52de1fa Follow-up on fix for Bug 4820, Alter layout of Circulation and fines rules page
One instance of "default" usage missed in the original update

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 14:26:20 +13:00
811023934a Follow up on fix for Bug 5570, item types not showing on other editions
Fix for the staff client.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 14:18:11 +13:00
bbd50b2d12 Fix for Bug 5570 - item types not showing on other editions
The item type which shows on other editions is the biblio-level
itemtype. XISBN.pm had some item-handling code, but I'm
removing it because it is unused. The editions tab should
now display item type only if item-level itemtypes are not
enabled.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 14:18:09 +13:00
84205212b4 Fix for Bug 5006 - Invalid XHTML in record matching rules template
- Rework JavaScript clone routines to use jQuery, to take
  label "for" into account, to handle incrementing label,
  and to properly place cloned blocks at the bottom of the group
- Rework JavaScript delete routines to use jQuery, to take
  block label numbers into account, and to show the "add"
  link if you have deleted the last block.
- Correcting markup which nests <div> inside <fieldset>
- Ensuring labels' "for" attribute matches input IDs
- Adding "required" style to required fields

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 09:57:11 +13:00
Colin Campbell
926ab8c544 Bug 5583 Rename fieldnumber to blocknumber
Variable fieldnumber does not refer to a field
It is the ISBD block number
Rename to blocknumber
Say what we mean adds to maintainability

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 09:42:05 +13:00
Colin Campbell
782654d178 Bug 5582 Pass tag nums as a string to Doc Popup
Add quotes around tag number when calling doc popup
Otherwise numbers with leading zeroes are interpreted
as octal e.g. 020 returns doc for 016

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 09:41:01 +13:00
a95385c23a Fix for Bug 4950 - checkbox should be removed when can't place a hold
- Hiding form controls for titles which can't be placed on hold
- Highlighting hold blocked message for better visibility
- Showing table of blocked holds even if none can be placed on
  hold: hiding the table hides the messages explaining why
  titles can't be placed on hold
- Removing an unused line from the script which was leaving errors
  in the error log
- Consolidating error messages into one box which were displaying
  in two.
- Correcting link to unused opac-userdetails.pl

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-06 12:47:31 +13:00
6d8f4f8868 Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl
Changes to list contents view to make it consistent with search results

My intention is to make the OPAC more consistent in the way it displays
lists of items, whether it be in search results, lists, etc. This patch
adds data to the list contents output and reformats it to that end.

The other significant change is the removal of jQuery table sorting.
Since list contents are both sorted and paginated on the server
side. Adding a client-side sort to one page of many doesn't make sense.

Other changes include:

- Change "Your lists" to "Your private lists"
- Remove "sort by" column because it seems unnecessary
- Adding logic to control display of count (item or items
  rather than item(s)
- Styling pagination bar and placing at the bottom of the page,
  consistent with other instances of pagination navigation

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-06 08:40:49 +13:00
ea023bb749 Fix for Bug 5571 - tags as bulleted list too long
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 15:46:31 +13:00
Nicole Engard
f379638c9d bug 5419: make reason checkouts blocked stand out
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 09:11:32 +13:00
562653bc8d Fix for Bug 3918 - Add to order lists inconsistent
- Added new include to contain add to basket options
- Minor markup corrections

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 08:46:07 +13:00
Chris Cormack
34c0fb8763 Merge remote branch 'kc/new/bug_5563' into kcmaster 2011-01-03 22:03:28 +13:00
Nicole Engard
c71a36fd27 bug 5562 change 'issues' to read 'checkouts'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-03 22:00:08 +13:00
Nicole Engard
606f978419 bug 5563 change note about cover images on enhanced content
on the enhanced content tab of system
preferences it says that Koha will pick
the first cover image - but in fact it
shows them all - that note needs to be
updated to properly warn of the expected
behavior.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-03 21:58:21 +13:00
4e1f49097c Reimplemented fix for bug 5556, OPAC does not display the type of authority
Formatting Janusz's suggested changes as a patch.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-03 21:56:06 +13:00
6a61750bf0 Reimplement fix for bug 5557 - Link to logs for user with view_system_logs permission
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-03 21:54:18 +13:00
Robin Sheat
7d0212cf38 bug 4942 - add validation to patron administration
This validation requires an enrollment period or a date to be provided
before the form will save, which will prevent invalid dates getting into
the system.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-02 09:26:24 +13:00
Robin Sheat
980de26320 bug 5045 - Help works even when the referrer is being stripped
This fix puts the URL of the source page as a parameter to help.pl,
which will override the referrer value, if it's provided. This deals
with people sitting behind proxies that strip the referrer information
out.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-02 09:20:01 +13:00
d1f74c852b Fix for Bug 3665, adding another submit button as in OPAC
This is the only change proposed in Bug 3665 which hasn't
already been implemented by someone else. It adds a submit
button under the first section of the advanced search page
just like the OPAC advanced search has.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-02 09:16:10 +13:00
0185ea6e9a Fix for Bug 4820, Alter layout of Circulation and fines rules page for clarity
I propose some changes to the issuing rules interface to improve usability:

 - Better define and delineate the sub-sections on the page:
   - Default checkout and hold policy
   - Checkout limit by patron category
   - Holds policy by item type

 - Repeat the current library name, when selected, for clarity: "Default
   checkout and hold policy for Athens" rather than "Default checkout and
   hold policy for this library"

 - Use the phrase "all libraries" when no library is selected. "Default
   library" seems ambiguous. "All libraries" better defines how the rule
   will be applied: to all libraries in the absence of a more specific rule.

 - Use the term "all" instead of "default" in cases where a rule will apply
   to all categories or item types.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-02 09:13:53 +13:00
d2b9602e53 Fix for Bug 5540, editing slip news changes to librarian interface
The script checks for a language-specific OPAC message and, if none
is found, preselects none of the "display location" options. This
results in the first item in the <select> behing highlighted by
default, "Librarian interface." If we want to select "slip," we
must add an explicit check for it.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-29 20:27:43 +13:00
86458028b9 Fix for bug 5451, can add tags with userlogin turned off
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-24 12:27:23 +13:00
f5b416b5bb Bug 5530 Follow up
With this patch, I don't see any other place where the old sysprefs editors
(systemprefences.pl) is used anymore.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-22 11:27:55 +13:00
Chris Cormack
801e7ffb72 Bug 5530: Fixing a link to systempreferences.pl instead of preferences.pl 2010-12-21 21:19:23 +13:00
Stéphane Delaune
95c51f1c85 (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for branch_transfer_limits.pl 2010-12-21 21:18:12 +13:00
Stéphane Delaune
77b3307772 (MT #1654) followup : corrects tablesorting for authorised_values.pl 2010-12-21 21:18:12 +13:00
Stéphane Delaune
fbfe0276a0 (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for auth_tag_structure.pl 2010-12-21 21:18:12 +13:00
Stéphane Delaune
f1762530d1 (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for marctagstructure.pl 2010-12-21 21:18:12 +13:00
Stéphane Delaune
6a76d13e44 (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for cities.pl 2010-12-21 21:18:12 +13:00
Stéphane Delaune
fcd2a2de3d (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for categorie.pl 2010-12-21 21:18:12 +13:00
Stéphane Delaune
64521709d1 (MT #1654) followup : corrects tablesorting for authorised_values and itemtypes 2010-12-21 21:18:11 +13:00
Stéphane Delaune
6e9727ad36 (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for itemtypes.pl 2010-12-21 21:18:11 +13:00
Stéphane Delaune
4c70627e9e (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for branches.pl 2010-12-21 21:18:11 +13:00
Stéphane Delaune
d950e509ff (MT #1654) Adding jquery.tablesorter and jquery.tablesorter.pager support for authorised_values.pl 2010-12-21 21:18:11 +13:00
Stéphane Delaune
1242ec7cc4 (MT #1577) complete langages checkbox for unique id 2010-12-21 21:18:11 +13:00
Henri-Damien LAURENT
77426c9ef1 MT4009: followup removing systempreferences
searching a systempreferences was disabled owed to the fact that it is now systempreferences which is used.
2010-12-21 21:18:11 +13:00
Paul Poulain
79ad2a0e17 Removing usage of preferences.pl 2010-12-21 21:18:11 +13:00
Matthias Meusburger
c00a51468e MT 2310 : New subfield for fields < 10 is now in a tab
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-12-21 21:17:30 +13:00
Matthias Meusburger
710993d0e7 MT 2446 : Cancel authority edition for a field goes back to this field 2010-12-21 21:17:29 +13:00
Chris Cormack
a1c6cbbb77 Merge remote branch 'kc/new/enh/bug_5106' into kcmaster 2010-12-21 20:52:28 +13:00
3f0eeb9c28 Proposed fix for Bug 5106 - Simplify MARC view choices in the OPAC (Conflict marker fix 2nd try)
- Eliminates the "Extended MARC View" tab
- Points the "MARC View" tab to opac-MARCDetail.pl as it is when XSLT is off
- Offers a "view plain" link on opac-MARCDetail.pl. Clicking this link
  replaces the standard labeled MARC view with an unformatted view similar to the
  one displayed in the pop-up modal MARC view.
- When viewing the "plain view," clicking the "view labeled" link will return
  you to the standard labeled MARC view.
- Adds a new XSL file for displaying MARC data in a slightly-more-formatted
  manner (compared to one big <pre></pre> block).

Removed a conflict marker line from Owen's patch (Marcel).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 17:01:33 +13:00
6b3e4f19f4 Bug 4838 Allow to choose which authority heading to copy into biblio record
With this patch, in biblio record data entry form, when ... is clicked for an
authority controlled field, it's possible to select which heading repetion to
copy if the authority has repeated headings.

When there is just one authority repetition, the first one is displayed to
choose, as previously.

This patch is REQUIRED by French libraries following SUDOC UNIMARC format, and
cataloguing multilingual materials ie all Higher Educational and Research
libraries.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 16:50:45 +13:00
Robin Sheat
8e5ee007db Bug 5186 - allow tax rates to be set to zero (master)
This allows the tax rate for a vendor to be set to zero. Previously, a
zero meant that the system default was used. Now, zero means no tax, and
to have it be the default the field should simply be left empty.
Additionally:
* this will now show on the vendor display if the tax value is from the
  system default
* this includes a database update that changes all the existing 0.00 tax
  settings to be NULL, which preserves existing behaviour.
* this now saves the tax value supplied for new vendors

Note: this patch applies against master

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 14:34:05 +13:00
Robin Sheat
3775854158 Bug 5522 - allow google preview to open in a new window
If the OPACURLOpenInNewWindow system is set, then google preview links
will obey it.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 14:23:49 +13:00
Chris Cormack
9693db7bff Merge remote branch 'kc/new/enh/bug_2965' into kcmaster 2010-12-21 08:51:31 +13:00
Katrin Fischer
cf4d851907 Bug 2965: Follow up - fixing problem with barcode field
The scanned barcode stayed in the checkout field instead of being
deleted after checkout or confirmation.

This patch reverts the template change, so the barcode is deleted.

Please test!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 08:44:46 +13:00
Chris Cormack
8fe46f3dc1 Merge remote branch 'kc/new/bug_5143' into kcmaster 2010-12-20 13:24:40 +13:00
Liz Rea
c25aaf1ca4 Bug 5143: Help file revisions per Owen Leonard
Nice changes, thanks. :)

LR

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-20 13:23:05 +13:00
Chris Cormack
3c19f22f86 Merge remote branch 'kc/new/enh/bug_5283' into kcmaster 2010-12-20 10:44:03 +13:00
Chris Cormack
206e0709d7 Bug 5283 Follow up, fixing broken template syntax 2010-12-20 10:42:59 +13:00
75762a63e9 Fix for Bug 3262 - OPAC needs syspref to show homebranch on detail page
Revised version of Liz Rea's fix adding homebranch by default. This
revision displays the homebranch name instead of branchcode.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-20 10:12:34 +13:00
Chris Cormack
c9465ed9df Revert "Merge remote branch 'kc/new/bug_5373' into kcmaster"
This reverts commit bf5a328af6, reversing
changes made to a904a9bac7.
2010-12-20 10:08:02 +13:00
Chris Cormack
8902ee5684 Merge remote branch 'kc/new/bug_5446' into kcmaster 2010-12-19 21:26:06 +13:00
9a048e2b12 Bug 5446 Fix a bug introduces by previous patch
When AcqCreateItem was set to 'cataloguing' there was no items fields in the
acq web form to validate in JS...

Alert commented.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:25:09 +13:00
276e1c3430 Fix for Bug 5518 - Add to shelf icon doesn't appear in OPAC results page
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:14:22 +13:00
Chris Cormack
1349b46320 Merge remote branch 'kc/new/bug_4908' into kcmaster 2010-12-19 21:11:54 +13:00
c4f8b9d636 Follow-up patch for Bug 4908, show patron's home library in OPAC
Adding home library to list of details when OPACPatronDetails pref
is set to "don't allow"

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:10:51 +13:00
Chris Cormack
826eda9d70 Merge remote branch 'kc/new/enh/bug_5285' into kcmaster 2010-12-19 21:08:41 +13:00
c64e286d3d Follow-up fix for Bug 5285, adding missing CSS
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:07:51 +13:00
be70444f68 Fix for Bug 5470 - improvements to results display in the staff client
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:44:49 +13:00
080f693c48 Fix for Bug 5513 - staff client display screwy if you don't have all permissions
The cause of this bug was the removal of a closing <!-- /TMPL_IF -->
in a recent commit.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:40:21 +13:00
396c2143d9 Fix for Bug 3987 - New Sys Prefs Branch - Alphabetize prefs in sections
Adding jquery tablesorter, sorting on sys pref variable by default

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:20:25 +13:00
402240bbe2 Fix for Bug 4997, More searches menu not on OPAC MARC and ISBD detail pages
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 10:50:07 +13:00
324991fefd Fix for Bug 4946 - hold warning needs rewording
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:

- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out

I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:45:03 +13:00
Chris Cormack
9c17e9305a Merge remote branch 'kc/new/enh/bug_5283' into kcmaster 2010-12-17 09:43:17 +13:00
d6e83087a4 Fix for Bug 3859, Attach item clarification
- Modifies hint text
- Adds handling for BiblioDefaultView preference
- Markup and CSS tweaks

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:41:28 +13:00
koha
05965fb56d Bug 5283 NEWS ITEM FOR RECEIPT SLIP
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.

We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.

The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl

Darrell Ulm

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:39:11 +13:00
Srdjan Jankovic
750a8a8dae Bug 5294 - Unescape vendor name when pushing back
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:11:19 +13:00
Chris Cormack
bf5a328af6 Merge remote branch 'kc/new/bug_5373' into kcmaster 2010-12-17 09:09:40 +13:00
Garry Collum
cf6867db62 Bug 5373: Adds cardnumber to the field list of the Import Patrons NOTES.
Adds 'cardnumber' as an option to the list of possible fields in the NOTES section of the patron import tool.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:08:24 +13:00
Chris Cormack
a904a9bac7 Merge remote branch 'kc/new/enh/bug_5508' into kcmaster 2010-12-16 13:47:01 +13:00
0560aa768c bug 5398: make additional pages in staff interface obey noItemTypeImages
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-16 08:49:48 +13:00
Nicole Engard
07834371f2 bug 4826 change 'add basket' to 'new basket'
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-16 08:38:56 +13:00
Paul POULAIN
78038d3cf6 fixing unopened closed tmpl_if
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:22:10 +00:00
Paul POULAIN
c401514b95 MT2743 : add filter on subscription branch to subscription claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:17:13 +00:00
Paul POULAIN
73a140b509 some display changes in subscription add
- removing librarian line
- displaying subscription number only if it's a modif
- some minor html tag changes
- putting month length on top, as default for subscription duration (it's from far the most usual case)

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:14:02 +00:00
Paul POULAIN
2f9c8293c8 adding some javascript strings for translator
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:11:06 +00:00
Paul POULAIN
43bfa40307 minor change: reordering branch/location/callnumber display
it's more logical to have branch first, then location, then callnumber (from general to specific)
Previously, it was location/callnumber/branch

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:10:02 +00:00
Christophe Croullebois
01e4b668ca (MT #4108) Notes in serial
The public and nonpublic notes was redundant with two areas in the page, one was inactive, and in edit subscription page, the subscription history area had two redundant blocks for notes, this fix it.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:47:25 +00:00
Alex Arnaud
ba8a2c7e8a (MT4068) Display callnumber & location in serials-collection.pl & serials-edit.pl.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:46:48 +00:00
Paul Poulain
44560fc73c Editing help for subscription-add
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:44:19 +00:00
Henri-Damien LAURENT
2f318ab841 MT3801: Serials not received issues cannot be claimed
position problem for claimst table
the table was displayed at right handside of the window

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:36:37 +00:00
Nicolas Morin
dade9a2a24 correct vocabulary
in GUI, changes technical vocab like "string" to proper user-friendly terms like "Title"

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:11:33 +00:00
Jean-André Santoni
b833e0a70d Fixed a bug about hidden checkboxes in claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:04:05 +00:00
Jean-André Santoni
159c586b3c Added table filter to claims.tmpl
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:02:51 +00:00
Jean-André Santoni
0efaa6a41c Replaced CGI dropdown box call wich is deprecated
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:00:13 +00:00
Jean-André Santoni
df6283ffe9 Fixed the checkall checkbox
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 11:56:20 +00:00
Jean-André Santoni
34673bf4ef Checks serials item form
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 11:41:12 +00:00
Colin Campbell
12100e13e4 Add jquery.uitablefilter.js
Add jquery plugin included in a number of templates modified by biblibre
Add as a separate commit rather than as part of a feature patch
as we may be merging out of sequence
2010-12-15 11:01:00 +00:00
Chris Cormack
be8f1f3343 Fix for 5143, now with IE debug removed
Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work

adds:
 - the subtitles into the title link (originally Chris Cormack)
 - barcodes for every listed hold
 - denoted which items were only item and which could be filled by any item on that bib.
 - added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)

[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-15 09:31:33 +13:00
Jane Wagner
f05bd5984c Bug 3789 Set off shelving location in staff and OPAC title display
Koha puts the shelving location immediately after the library name in the
"Location" column of the title display.  If the library name and/or shelving
location is wordy, the two can run together and a user can overlook the
shelving location.  I've added a new span class to the staff and OPAC .css
files and applied it to shelving location in both templates.  This puts the
shelving location on a separate line and in italics, to make it stand out from
the library name.

[Edit] Re-implemented some changes which wouldn't merge after so long

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-15 09:20:52 +13:00
Nicole Engard
5c8ca5129c bug 4977 add missing order links to 'no results found' page
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-15 09:13:39 +13:00
Chris Cormack
3705965cd7 Revert "Ergonomy improvement in smart rule management"
This reverts commit fefd158f42.

This was causing quite major errors, read the details at bug 5496
2010-12-15 09:03:11 +13:00
Chris Cormack
718473bdd2 Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506 2010-12-14 21:07:15 +13:00
Chris Cormack
e83beb0482 Fix for intranet-tmpl had one /TMPL_IF to many 2010-12-14 20:10:59 +13:00
Ian Walls
34155975fc Fixes bug 5125: Default focus on circulation-home page
Fix created by Owen Leonard, related over IRC chat (rather than a patch file).

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 20:00:14 +13:00
21c516601c Possible fix for Bug 2307, Calendar widget cannot be translated
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 19:38:52 +13:00
Katrin Fischer
872529cb11 Bug 2965: Allow due date in the past - small template fix
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 19:33:58 +13:00
Srdjan Jankovic
4d1762f5ec Bug 2965: Allow due date in the past
Raise warning rather than disallowing
Remove due date js validation when checking out

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:49:15 +13:00
21cdd2feb4 Fix for Bug 5000, Uncertain prices misses option to choose display language
- Adding missing footer include for language chooser
- Correcting markup and structure errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:44:21 +13:00
Nicole Engard
40e2b5421a bug 5255 change 'document type' to 'item type'
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:19:20 +13:00
Nicole Engard
a6799f95fb bug 4252 add authorites permission to menus
Added to more menu and to the main intranet page

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:16:32 +13:00