Commit Graph

12886 Commits

Author SHA1 Message Date
Chris Nighswonger 48fa2dbea4 Removing OPACNoResultsFound Enhancement Syspref
This pref was accidentally added during non-English syspref updates.
It is properly a part of enh bug 1997 which will not be included in
the 3.2.x branch.
2011-01-06 14:24:30 -05:00
Owen Leonard 54aedd795a 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: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-06 14:12:57 -05:00
Owen Leonard 2e6afe34af 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: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-06 13:54:01 -05:00
Owen Leonard e6ac25ea06 Fix for Bug 5571 - tags as bulleted list too long
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-06 13:53:53 -05:00
Nicole Engard 9260bbe991 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>
(cherry picked from commit f379638c9d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-04 15:27:43 -05:00
Galen Charlton 7779896064 bug 5497: make all library fields available to circ receipt/slips
This allows the receipt template to be more readily customized
to include the library's address, phone number, email address, etc.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4daef50c7a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-04 15:15:16 -05:00
Owen Leonard 67a8a5301e 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>
(cherry picked from commit 562653bc8d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-04 15:14:58 -05:00
Marcel de Rooy f444490cc2 Bug 5375 (Update date/time last transaction (MARC 005) when saving authority record)
Update 005 date/time when saving authority record for MARC21 and UNIMARC.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1190833149)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-04 15:14:42 -05:00
Marcel de Rooy 68e8f0937f Bug 5374 (update transaction date when saving biblio) RESENT with small fix
Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.

I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 76338220dd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-04 15:14:27 -05:00
Nicole Engard 0a2c78a803 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>
(cherry picked from commit c71a36fd27)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:27:24 -05:00
Nicole Engard 8c39ecf65e 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>
(cherry picked from commit 606f978419)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:27:08 -05:00
Owen Leonard b7b1b292ad 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>
(cherry picked from commit 4e1f49097c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:26:53 -05:00
Owen Leonard ece67a57d5 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>
(cherry picked from commit 6a61750bf0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:26:36 -05:00
Chris Nighswonger a92dae3cc7 Updating Version Number to 3.02.02.001 2011-01-03 12:25:30 -05:00
Nicole Engard c002a76cd0 bug 5040 fix misspelling of distance in marc21 framework
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:24:44 -05:00
Robin Sheat 358e6cd545 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>
(cherry picked from commit 7d0212cf38)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:22:53 -05:00
Robin Sheat 809b24e48c 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>
(cherry picked from commit 980de26320)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:22:28 -05:00
Robin Sheat b8c43d7250 Bug 5550 - correct filename referenced in docs
Spotted by Reed Wade.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e88cee5326)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:20:21 -05:00
Chris Cormack f54689f729 Bug 5526: Follow up patch removing a warn statement
(cherry picked from commit c5b55d1c40)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:20:03 -05:00
Owen Leonard 2c4a71b4cc Fix for Bug 5526, List of lists should be in alphabetical order by list name
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cdbf872bd5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:19:52 -05:00
Chris Cormack 78326694fe Bug 5542: Availability code commented out - Uncommenting
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 79fb4a8134)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-01-03 12:18:50 -05:00
Owen Leonard 819b5fc308 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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

(Corrected to apply to 3.2.x)
2010-12-23 23:36:01 -05:00
Chris Cormack e298b5e3be Bug 5531: adding some missing sysprefs
(cherry picked from commit 2124887428)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:24:19 -05:00
Chris Cormack 92adf8d040 Bug 5531: Updated Polish, Ukranian and Russian syspref files
Retrieved from
http://git.koha-community.org/gitweb/?p=wip/koha-chris_n.git;a=commit;h=f23969c7e1cb87d4bd9552e3d6bc85cc948dedd9
(cherry picked from commit 0482e53451)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:24:19 -05:00
Chris Cormack fe4ed2507c Bug 5531: further fix for fr-FR files
(cherry picked from commit c9db18bf0b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:24:19 -05:00
Henri-Damien LAURENT e173f2ba89 Based on Chris Nighswonger french unimarc_standard_sysprefs.sql
(cherry picked from commit 409dcdfe6a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:23:35 -05:00
Chris Cormack 0c507b2eb3 Bug 4473: Making a change to TmplTokenizer.pm to stop translation error
(cherry picked from commit f5e65148ac)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:19:43 -05:00
Liz Rea df31659c2a 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>
(cherry picked from commit c25aaf1ca4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:19:15 -05:00
Amit Gupta 9f8722d8f2 Bug 5489: Send hold email to branch email address if it exists instead of koha email address
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21cae2609d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:18:15 -05:00
Owen Leonard db26c21e11 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>
(cherry picked from commit 75762a63e9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:46 -05:00
Frédéric Demians 8bd49794a9 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>
(cherry picked from commit 9a048e2b12)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:06 -05:00
Colin Campbell be38fadf15 Bug 4286 Allow receiving if subscription enddate not set
HasSubscriptionExpired is not a boolean return it may also
return that a valid subscription enddate is not set
This should not block receipting of issues

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 74e63fe0e6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:06 -05:00
Owen Leonard 908a023fce 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>
(cherry picked from commit 276e1c3430)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:05 -05:00
Owen Leonard 984a6e62b8 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>
(cherry picked from commit c4f8b9d636)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:05 -05:00
Owen Leonard 3443cd38f0 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>
(cherry picked from commit be70444f68)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:05 -05:00
Robin Sheat 2ed66165bf bug4891 - sort facets in search sidebar (OPAC and staff client)
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 13bc505c5f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:05 -05:00
Owen Leonard c7b13ef0e4 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>
(cherry picked from commit 396c2143d9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:04 -05:00
Srdjan Jankovic c705c3f61c Bug 5510: prepend output with system name
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1c86e93cec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:04 -05:00
Serhij Dubyk {Сергій Дубик} 4ef03eb5b5 Deleted old sample budget sql-data for Ukrainian and Russian
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd8f379d70)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:04 -05:00
Owen Leonard eda5105edf 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>
(cherry picked from commit 402240bbe2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:03 -05:00
Owen Leonard 7bd9e223e9 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>
(cherry picked from commit 324991fefd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:03 -05:00
Owen Leonard 31548e0f62 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>
(cherry picked from commit d6e83087a4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:03 -05:00
Srdjan Jankovic f491326296 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>
(cherry picked from commit 750a8a8dae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:17:03 -05:00
Galen Charlton a9c98acac7 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>
(cherry picked from commit 0560aa768c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:04:58 -05:00
Nicole Engard 2202f1b6b9 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>
(cherry picked from commit 07834371f2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-23 23:04:33 -05:00
Chris Nighswonger eac7c17e9f Updating Version Number to 3.02.02.00
Updating version number for 3.2.2 release.
2010-12-21 18:58:29 -05:00
Frédéric Demians 403eea2c1c Bug 5506 Shorten .po file comment lines
In opac/staff templates .po files, we have comment lines contextualizing
extracted text in templates. Path to template are absolute. For example, we can
have:

  #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/...
     modules/cataloguing/addbiblio.tmpl:585

The first part of the pathname is useless. With this patch, we just keep
relative path to tempalte from Koha template main directory. The above example
becomes:

  #: intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:585

To be applied on [3.2]

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f460afbad6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-21 17:02:37 -05:00
Chris Cormack 228695c7fe Bug 5331, fixing Italian sysprefs.sql
(cherry picked from commit 2814b535e6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-21 17:02:14 -05:00
Chris Cormack f45a91e66c Bug 5531: Fixing german sysprefs file
(cherry picked from commit e20895a9a7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-21 17:01:57 -05:00
Nicole Engard efa0c8ccbe bug 5035 remove default opaccolorstylesheet value for new installs
Per the bug, the color.css file is blank and so this preference
should have no value by default. This patch only fixes this for
new installs. There is no way to know if people have added values
to the color.css file in existing installs, so removing that value
in those cases might break things.

This patch does not remove the blank color.css file, it only
edits the default system preference.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a45eb8fb78)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-21 17:01:28 -05:00