Commit graph

5890 commits

Author SHA1 Message Date
Chris Cormack
76184e1db0 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
2011-03-30 08:39:10 +13:00
Katrin Fischer
e8c43dbf3d Bug 5838: Format sql outout on guided reports
New suggestion: wrapping the sql output in <pre> with an unique id.

- sql can be formatted to be better readable
- sql can be hidden using css and the unique id
- pagination is pushed to its own line and better visible

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-29 09:53:02 +13:00
Jared Camins-Esakov
b853b79001 Bug 5817: Follow-up fixing callnum: on staff results
This patch changes the call number links on the staff results page so that
searching will work. The underlying problem described by bug 5274 remains an
issue, but this fixes some of the more problematic symptoms.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-29 08:45:28 +13:00
Chris Cormack
63541e4223 Merge remote branch 'kc/master' into new/bug_5817 2011-03-29 08:44:48 +13:00
Jared Camins-Esakov
36ca010cc4 Bug 4276: XSLT subject tracings only use subfield a
When XSLT is enabled, the subject tracings on the details view (both OPAC and
Intranet) previously only searched on the subfield 'a'. In addition, searches
failed when the tracing included parentheses, and the XSLT display did not
include subfields other than abcdvxyz, even for those 6xx tags that have other
subfields.

This patch adds a syspref: TraceSubjectSubdivisons. When
TraceSubjectSubdivisions is set to "Don't include" (default), the subject
tracings in the XSLT details view will only search on subfield 'a'. When
TraceSubjectSubdivisions is set to "Include", the subject tracings will search
on all subfields, not just subfield 'a'.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-28 09:47:05 +13:00
Chris Cormack
71e1218fe1 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-28 09:16:50 +13:00
Chris Cormack
a4b2280b6b Merge remote branch 'kc/new/bug_3670' into kcmaster
Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
2011-03-27 21:19:24 +13:00
Ian Walls
3884e1693f Bug 3670 Followup: fixes message preference form
Changing the database value from "Item DUE" to "Item Due" broke the matching performed in the
messaging-preferences-form.inc file, resulting it the notice being labeled as "Unknown".

This patch changes both the matching, and the display, to "Item Due"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 21:17:16 +13:00
Chris Cormack
4669a10776 Merge remote branch 'kc/new/enh/bug_1962' into kcmaster
Conflicts:
	circ/returns.pl
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	installer/data/mysql/pl-PL/mandatory/sysprefs.sql
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2011-03-27 21:12:40 +13:00
Katrin Fischer
b3866aff5d Bug 1962: Add new syspref FineNotifyAtCheckin
This patch adds a new syspref FineNotifyAtCheckin.

With syspref ON there will be a message when checking in books from
a patron with outstanding fines.

With syspref OFF (default) no message will be shown.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 21:06:37 +13:00
ruth@bywatersolutions.com
6e59b9a295 Bug 5954: 490$a not used to create search link in XSLT
This bug corrects a minor XSLT bug that is causing 490$t (which is not defined) to create
search links when XSLT is enabled

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 21:02:33 +13:00
Nicole C. Engard
2ecdf2fda9 Bug 5940: Catalog and Cataloging Help Files for 3.4
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 21:00:01 +13:00
Nicole C. Engard
b8f3120bf5 Bug 5940: Update Patron Help Files
This patch updates the help files in the patron area of Koha.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 20:57:51 +13:00
Paul Poulain
a898b69dcc Bug 5930 : improving/modifying authority display on OPAC
- changing some terms that are unclear for a patron
- removing tag & subfields values & indicators
- removing UNIMARC coded fields
- changing the search page (removing options useless for a patron)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 20:54:10 +13:00
Jared Camins-Esakov
1deadb34c3 Bug 5919: Display MARC21 fields 583, 586, 530
This patch adds the MARC21 fields 583 (Action note), 586 (Awards note), and
530 (Additional physical form available note) to the OPAC details display in the
XSLT-controlled portion of the page. In order to allow libraries to hide these
notes if they do not want them added, the notes have been given CSS classes.

Depends on patch for Bug 3098.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 20:16:33 +13:00
Jared Camins-Esakov
009036b537 Bug 3098 follow-up: Clean up formatting
This patch cleans up the formatting of the 856 display code in
MARC21slim2OPACDetail.xsl. Tabstops are correct, and the OPACURLOpenInNewWindow
syspref check is moved to control the use of a 'target="_blank"' attribute,
rather than having two blocks of almost-identical code.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 20:13:46 +13:00
Jared Camins-Esakov
b585b63ec7 Bug 5921: Add enumchron to the items detail page
This patch adds the Serial enumeration/chronology field to the items display in
moredetail.pl.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 13:29:37 +13:00
Chris Cormack
96f7cfabca Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
2011-03-23 21:47:03 +13:00
Jared Camins-Esakov
637cf26045 Bug 5641: Replace Favicon through staff client
This patch adds two sysprefs:
OpacFavicon
IntranetFavicon

The two sysprefs take full URLs to an alternate favicon.ico file for the OPAC
and Staff Client, respectively. Leaving them blank will use the favicon.ico file
that is included with Koha.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 21:41:32 +13:00
Chris Cormack
a0efd547de Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-23 21:15:59 +13:00
Jared Camins-Esakov
eeaf2e7c9e Bug 3382: Add CSS classes to OPAC XSLT <img> tags
This patch adds materialtype, format, and natureofcontents CSS classes to the
<img> tags produced by the OPAC XSLT stylesheets for use with CSS and jQuery.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 21:13:50 +13:00
Matthias Meusburger
c098c164ed Bug 5913 : Remove broken link from authorities search results
BibLibre bug #2949

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 19:58:56 +13:00
Chris Cormack
efbabbf2b8 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-23 19:50:02 +13:00
bf2fb98ea0 Bug 5931 Paging and sorting saved reports table
On Reports > Saved reports page, a table shows all saved reports.
Table's rows are sorted by report IDs. When there are a lot reports,
this table is difficult to read.

This enhancement add to Saved report page a paging bar and sort options on
column names, like in the framework table.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 17:02:36 +13:00
Chris Cormack
fbb48436b7 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-23 16:56:55 +13:00
Chris Cormack
e448aa155f Fixed another template error thanks Jared 2011-03-23 11:02:53 +13:00
Chris Cormack
551a192af9 Fixing template bug, once again unit tests rule! 2011-03-23 10:51:54 +13:00
Nicole C. Engard
1a870e4c23 Bug 5928 follow up remove branchcode label
Under Acq info it said 'Branchcode,' I've changed this to 'Library'
to match the style used in other places.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 10:35:19 +13:00
Srdjan Jankovic
670a262504 Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 10:35:16 +13:00
769faee11a Bug 5755: Syspref to control facets truncation
On OPAC/staff result page facets are truncated to 20 characters. On some OPAC
layout, it's not enough. A new syspref FacetLabelTruncationLength defines the
length to cut facets if necessary.

This patch add the syspref to searching.pref and add it to syspref various
language default values loaded into DB during installation process. It's not
necessary to update DB since length is fixed to 20 (as before) when this
syspref isn't defined in systemprefercences table.

Rebased to last HEAD: 2011.03.18

[Documentation] FacetLabelTruncationLength syspref in Searching tab

[3.2] It doesn't apply.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 21:06:35 +13:00
Chris Cormack
d3d821cf7c Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-22 20:59:06 +13:00
265ed53f12 3154 Preferences for building facets (functionality)
Based on patch from Fridolyn Somers with input of Frederic Demians.
Added new Searching preference maxRecordsForFacets.
This pref contains number of result records used in facet building.
Also added pref displayFacetCount (with thanks to Frederic).
Follow up patch takes care of install issues; functionality can already be tested with this patch only.

Updated on March 17 for changes in include files.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 20:53:28 +13:00
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