Commit graph

7714 commits

Author SHA1 Message Date
82d1fe4086 Bug 8559 - conflicting item statuses - Force cancel or revert
If a librarian checks out a waiting hold to a different patron
it gives the item conflicting statuses. The item will show as both
checked out to the different patron, and waiting for the original
patron.

This patch fixes this by not allowing this situation to occurr. If
a librarian attempts to issue an item that is waiting for a different
patron, the system will force the librarian to choose to
a) not issue the item
b) issue the item, and cancel the waiting hold
c) issue the item, and revert the waiting hold

In this scenario, reverting the waiting hold means to push it back
on the reserves queue as a hold with a priority of 1, which will push
the priorities of any existing holds back by 1 as well. It will become
an item level hold for the given item, as we cannot know if the hold
was item-level or bib-level given the data we have about the hold.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

All three cases tested, correct outcome each time

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 17:09:32 -05:00
d772d3af4d Bug 9137 - Focus when editing/adding new itemtypes/authorised values
This patch adds the "focus" class to the relevant inputs so
that the global staff client JS will move the focus to those fields.
Logic in the authorised_values template puts the focus on the
correct field whether you're adding a new category, a new value,
or performing an edit.

To test, try the following operations:
 - add an itemtype
 - edit an itemtype
 - add an authorised value category
 - add an authorised value value
 - edit an authorised value value

In all cases the focus should automatically be in the first
form field.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass and works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 16:52:36 -05:00
Jared Camins-Esakov
51b671224f Merge branch 'bug_9106' into 3.12-master 2012-11-28 15:42:43 -05:00
Nicole C. Engard
e7954504f3 Follow up to Bug 6680: tiny up download lists formats
Explains what uses RIS, and replaces iso2709 with 'MARC'.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simply change, all tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:31:22 -05:00
Robin Sheat
7d1d4b85db Bug 6680 - simple tidy-up of cart download format descriptions
Explains what uses RIS, and replaces iso2709 with 'MARC'.

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>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple change, all tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:31:22 -05:00
Jared Camins-Esakov
6081b94e3c Merge branch 'bug_7143' into 3.12-master 2012-11-28 08:24:54 -05:00
Katrin Fischer
bd63817139 Bug 7143: Small fix for About page
Adding missing version numbers:

Frédéric Demians (3.4, 3.6, 3.8, and 3.10 Translation Manager)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:24:26 -05:00
2bc5b29cc1 Bug 7143 About changes for 3.12
Proposing a new section for current release team.

Signed-off-by: Marc Veron <veron@veron.ch>

Section appears on about page as expected.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Looks ok to me, passes tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:24:26 -05:00
Fridolyn SOMERS
0682139bb8 Bug 9132: Paging through OPAC authority search results does not work (followup 1) input with and_ora instread of and_or
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:13:18 -05:00
Jared Camins-Esakov
081e1ba4c3 Merge branch 'bug_9025' into 3.12-master 2012-11-25 18:41:55 -05:00
Sophie Meynieux
00d7f44f98 Bug 9025: Adding new icons for itemtypes from Sudoc
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked that new images show up when managing itemtypes and
authorised values and can be selected and used.
Checked about page for license information.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:41:53 -05:00
Jared Camins-Esakov
db15627b7a Merge branch 'bug_9059' into 3.12-master 2012-11-25 18:34:00 -05:00
df1db0d4dc Bug 9059: Followup
Removes last occurrence of dependent= parameter. See also report 7368.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests.
Tested successfully in Chromium and Firefox in Ubuntu.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:32:47 -05:00
7ff10e2e14 Bug 9059: Increase size of opac-sendbasket window
Change window settings for opac-sendbasket. If you need to login
first, the window should be much larger.

Typo dependant should be dependent. Note that this setting is
ignored in much browsers. Will submit another patch to cover more occurrences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:32:47 -05:00
85c4cd4712 Bug 8515 - OPAC password change does not obey OpacPasswordChange
The OPAC change password template enforces the OpacPasswordChange
preference by preventing the form from appearing. However, the
script doesn't contain any check for OpacPasswordChange so it is
vulnerable to someone submitting data to it by some other means.

This patch adds a check for OpacPasswordChange to the script and
revises the template logic in order to show the right warning
in all circumstances.

To test, turn off OpacPasswordChange and navigate manually to
opac-passwd.pl. You should see a warning that you can't change
your password.

Turn on OpacPasswordChange load the change password page and
save the page to your desktop. Turn off OpacPasswordChange and
submit a password change via the saved page. Without the patch
this would result in a password change. After the patch it
should not.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug and made sure patch fixes it.
Passes all tests and perlcritic.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:30:14 -05:00
Jared Camins-Esakov
eb27e4084d Merge branch 'bug_7358' into 3.12-master 2012-11-25 18:20:32 -05:00
Jonathan Druart
d57194e24d Bug 7358: reaffect a closed basket to a closed basketgroup
The list of basketgroups when looking at a closed basket show all the
basketgroups.
It should not be possible to affect a basket to a closed basketgroup,
since this basketgroup should have been sent to a supplier.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:19:29 -05:00
Jared Camins-Esakov
de84bd9e46 Merge branch 'bug_9073' into 3.12-master 2012-11-25 18:09:14 -05:00
3a7488f874 Bug 9073 - Download option from the cart should match the menu button in lists
This patch moves the staff client Cart download choices into a toolbar
menu button instead of requiring that the user make the choice via a form
in the pop-up window.

To test, add items to Cart in the staff client. Open the cart and
choose a download option from the Download menu. Your download
should complete correctly without the page changing or reloading.

Unrelated edit: Eliminating duplicate document.ready() block by
consolidating a couple of lines of JavaScript.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked all export formats can be selected and downloaded, including
CSV profiles.
All tests and perlcritic pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:08:46 -05:00
3247c1774f Bug 9115 - basket window should close automatically when placing a hold
If you choose to place a hold from the Cart pop-up, the entire
holds process (possibly including login) takes place in the cart
window. Upon completion of the operation you're left with a second
window which has lost its context as the Cart.

This patch revises the hold process so that when you click the
hold link in the cart the operation is moved to the main window
and the Cart window closes.

Since the holdSel() function doesn't require interaction with
template variables I have moved it to basket.js along with the
described changes.

To test, put items in your Cart and open it. Select items to
place on hold and click the "Place hold" link. The cart
should close, and the items you selected should appear on the
place hold screen in the main window.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked in Firefox and Chromium in Ubuntu, works nicely.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:06:11 -05:00
Jared Camins-Esakov
f13b13dc16 Merge branch 'bug_8660' into 3.12-master 2012-11-23 16:39:37 -05:00
Fridolyn SOMERS
dd5ce614aa Bug 8660: follow-up: Porting changes to ccsr theme
Signed-off-by: Mason James <mtj@kohaaloha.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 16:39:13 -05:00
Fridolyn SOMERS
02755f6c55 Bug 8660: Tag status does not show on multiple tag add
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 16:38:32 -05:00
Jared Camins-Esakov
986a18c82b Merge branch 'bug_8986' into 3.12-master 2012-11-23 13:35:24 -05:00
Jonathan Druart
2b5000c7d4 Bug 8986: Followup FIX a JS error if there is no valid card number
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I can't reproduce the JS error but the template changes are correct
with regard to how the page should handle errors.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:35:03 -05:00
a6c0175967 Bug 8986: Batch patron modification template corrections
Many minor template changes:

- Correcting title and headings
- Adding translation to string in JavaScript
- Tweaking table sorter
- Wrapping card number in link to patron detail page
- Adding standard styles to "clear" links (see patron attributes)
- Terminiology corrections (borrower-> patron, cardnumber -> card number)
- Capitalization corrections
- Improve display of extended attributes

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:34:05 -05:00
Jared Camins-Esakov
83da56662d Merge branch 'bug_8899' into 3.12-master 2012-11-23 13:30:32 -05:00
cb535ea6f7 Bug 8899 [Revised] Remove unused CSS declarations from staff client CSS
Using an add-on for Firefox called CSS Usage I found some
instances of CSS in staff-global.css which are unused. Unused
selectors were confirmed by a search of the code.

Testers can't exactly check the whole staff client for things
which look off, but can confirm by their own search that
the removed CSS has no corresponding markup.

Revision adds back lines which were discoverd by QA to be in use.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:30:14 -05:00
4e97465463 Bug 5521 - item edit form appears if no items found
This patch changes the template so that if no items are
found the page doesn't show "The following barcodes were found"
and doesn't show the item edit form.

To test, submit a batch which contains no valid barcodes.
Compare to a batch which contains some or all valid barcodes.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests succeed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:06:04 -05:00
Jared Camins-Esakov
560e2d7f67 Merge branch 'bug_8546' into 3.12-master 2012-11-23 13:02:31 -05:00
8c1aa96d02 Bug 8546 - Error in description of OPAC Advanced Search Publication date range search
The publication date range search description in the OPAC suggests
that a search like "-1987" or "2008-" is not inclusive when it
actually is. This patch corrects the description.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:01:29 -05:00
Fridolyn SOMERS
19ce907384 Bug 8983: Typo in UNIMARCslim2OPACResults.xsl
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:59:04 -05:00
c5e91b8060 Bug 8163: Click to populate XSLT preferences with "default" or empty values
This patch adds markup and JavaScript to the system preferences
interface so that the user can click "default" or "empty" to populate
an XSLT-related pref with those vaules.

To test, open system preferences for the OPAC or staff client. In
the description for an XSLT-related preference click the "default"
link to populate the field with "default." Click the "leave empty"
link to empty the field.

Revised according to Julian Maurice's suggestion for a more
generic, flexible way to implement it.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:28:02 -05:00
Jared Camins-Esakov
48ce46e8fb Merge branch 'bug_8664' into 3.12-master 2012-11-23 12:12:59 -05:00
4fbadbaed4 Bug 8664 - Add floating toolbar with save button to system preferences editor
This patch adds a copy of the "save" button in a toolbar at
the top of the system preferences editor. The toolbar becomes
fixed at the top of the page when you scroll down, exactly like
the toolbar on addbiblio.pl.

Because multiple save buttons might appear when the system prefs
page displays search results, the toolbar does not appear in
this case.

To test, open the system preferences editor and change a setting.
Try saving both with the button in the toolbar and the button at
the top of the page. Test scrolling to confirm that the toolbar
"sticks" to the top of the page when you scroll down.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:12:37 -05:00
Jared Camins-Esakov
2512581533 Merge branch 'bug_8758' into 3.12-master 2012-11-23 11:44:55 -05:00
Jared Camins-Esakov
e93cc44941 Merge branch 'bug_2832' into 3.12-master
Conflicts:
	installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
	installer/data/mysql/updatedatabase.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 11:41:48 -05:00
Jared Camins-Esakov
6a265eb793 Merge branch 'bug_9008' into 3.12-master 2012-11-23 11:40:46 -05:00
91a88e6f00 Bug 9106 - Filtering list of uncertain price list by owner empties order information
The form which filters the list of orders with uncertain prices
includes a parameter which tells the script to modify the orders,
resulting in order information being lost. This patch removes
the unnecessary form field.

To test you must have orders with uncertain prices, preferably from
more than one user. Go to the uncertain prices page. Before applying
this patch, submitting the "orders from" form would cause the page
to refresh with no results. This is because the script cleared the
orders of price, quantity, etc. information.

After applying this patch the uncertain prices list should refresh
and show the correct results, either your orders ("me") or all
("Everyone").

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:40:36 -05:00
Marc Veron
abf72944dd Bug 9017 - Quote of the day: Table footer not translated
The strings for the table footer of the QOD feature are translated in /datatables-strings.inc, but they did not show up in staff client due to missing code in quotes.tt -> $(document).ready(function(), part "oLanguage"
Code added as appropriate.
See: http://datatables.net/usage/i18n

Additionally, quotes.tt had a stray </script> tag after [% INCLUDE 'datatables-strings.inc' %]

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:10:19 -05:00
29d1aa1be0 Bug 8971 - Sort holds queue report using DataTables
Replacing the old tablesorter plugin with DataTables on
this page will fix sorting bugs related to whitespace and
markup in table cells which tablesorter couldn't handle.

I have also taken the liberty of changing the default sort
from patron to call number, assuming that the librarian
uses this list to pull items from the shelf, and the shelf
is organized by call number.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:10:51 -05:00
7f45bb37dd Bug 7932 [Revised] Twitter share doesn't work with socialnetworks
The only way I can get this to work consistently is to use
Twitter's own code as documented here:

https://dev.twitter.com/docs/tweet-button

This requires that we use the tweet button generated by Twitter
rather than the smaller image we were using before. Using the
documented options for generating a custom button produced the
same inconsistent behavior this patch attempts to fix.

Because of the change of appearance I moved the Twitter button
to last in line so that similarly-sized buttons were grouped. I
also changed the configuration of the Google+ button to exclude
the count, saving some horizontal space.

Revision removes explicit declaration of share URL. I think when
testing this previously I assumed it was required when in fact
the share URL wasn't working because it was a localhost address.

Localhost addresses are apparently rejected by Twitter. Testers
beware.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:36:00 -05:00
d3b50910da Bug 7368: Removing occurrences of dependant= feature in javascript open calls
The window feature dependant= should have been written as dependent=
Note that this feature is ignored in most/current browsers.
Since the feature was misspelled, removing it will not change any
behavior or hurt anybody.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 07:23:03 -05:00
Jared Camins-Esakov
734dbff692 Bug 9107: Remove the obsolete DidYouMeanFromAuthorities syspref
Even though the DidYouMeanFromAuthorities syspref was replaced by a "Did
You Mean?" configuration page, the syspref was showing up in the
syspref editor on the Searching tab.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 06:56:22 -05:00
a7ff2a2e4d Bug 8968 "Add to cart" translatable on OPAC result page
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-13 10:01:14 -05:00
8b10505797 Bug 7500 [Lists follow-up] Use CSS Sprites for faster page loading
I just noticed there were a couple of instances where the lists
page referred to an image which was removed in a previous patch
for Bug 7500. This patch corrects it.

To test, edit a list in the OPAC. The breadcrumbs menu should
have no broken images.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-13 09:50:29 -05:00
Jared Camins-Esakov
94f361f9ea Merge branch 'bug_8945' into 3.12-master 2012-11-12 18:49:43 -05:00
Nicole C. Engard
18012c7443 Bug 8945: Add missing acq help file
This adds the missing order from staged file help doc
to Koha.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 18:46:34 -05:00
Fridolyn SOMERS
33403b61d7 Bug 8988: item status uses authorized value description for intranet
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Marcel de Rooy <M.de.Rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:13:15 -05:00
Jared Camins-Esakov
239a5f76cb Merge branch 'bug_8931' into 3.12-master 2012-11-09 20:08:49 -05:00
6f69e809b4 Bug 8931 [Follow-up] submit buttons have blue background
This follow-up removes the white background from fieldsets
with class "action" when they are embedded inside another
fieldset (Comment 4).

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:08:23 -05:00
1bf83bae84 Bug 8989 - Availability facet needs an id
This patch adds an id to the <li> which contains
the "limit to available" facet in the OPAC and
staff client.

To test, add custom CSS for the staff client and
OPAC to hide the id "availability_facet" and
confirm that the link is no longer visible.

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:23:25 -05:00
2a73ced61d Bug 8972 - Due Date set to 100 years ago
In order to prevent submission of dates with ambiguous two-digit
years this patch makes date-due input fields read-only so that
users must use date/time picker.

Other minor fixes:

- Adding missing labels
- Adding common class wrapper to datepicker for checkout and renewal
- Correcting focus handling on "specify due date" field (should
  focus on barcode field after a date has been selected).
- Removing trailing comma from JavaScript (breaks IE)

To test, try typing an invalid number in any of the date due entry
fields: Under 'specify due date,' 'renewal due date,' or the
confirm "invalid" date dialog (after specifying a date in the past).
Manual entry should not work. Choosing a date/time using the
widget should work.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:23:25 -05:00
Jonathan Druart
3ca887bed2 Bug 8832: Update the gist pref and hide the tax rate value if not needed
The gist system preference will be updated with the existing values and
with the supplier's gstrate values.
The "Tax rate" part becomes hidden if the syspref is not filled.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:12:09 -05:00
ff38060039 Bug 8872: Changes for intranet showmarc
Simplifies template (eliminating intranet-bottom include).
Makes encoding for card view more consistent with approach in Templates module.
Rearranges a few lines in script for consistency and performance.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-06 07:29:07 -05:00
8c6da900f4 Bug 8872: Changes for opac-showmarc
Simplifies template (eliminating opac-bottom include).
Makes encoding for card and html view more consistent with approach in Templates module.
Rearranges a few lines in script for consistency and performance.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-06 07:29:01 -05:00
98c6639aa9 Bug 8872 Add UTF-8 encoding to opac xslt files
Does also fix head and body tags in MARC21slim2OPACMARCdetail.xsl.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-06 07:28:33 -05:00
d8ca248848 Bug 8872: Add UTF-8 encoding to intranet xslt files
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-06 07:27:39 -05:00
Jonathan Druart
99ad10712e Bug 8758: Remove useless code in circ/returns.pl
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Before applying the patch I removed the [% IF %] from
around the markup which is removed by this patch. A table
of title and patron information appeared which I don't
remember ever seeing before. This tells me it's really
unused.

After applying the patch I performed some check-ins on both
checked out items and items which were on hold. All operations
completed normally.
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 12:12:58 -05:00
Magnus Enger
aafcebef8f Bug 2832 - Make alphabet localizable
Adds the "alphabet" syspref, which can hold a space separated list
of charachters, which can be expanded into browse links when needed.

To test:
- Make sure to run updatedatabase
- Check that the "alphabet" syspref was added under "I18N/L10N preferences"
- Check that browse links are displayed Home › Patrons
- Add some weird charachters like ÆØÅ to "alphabet" and check that the
  browse links are still displayed ok

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 09:25:29 -05:00
3f60328b4f Bug 9008 [Follow-up] Warn if librarian logged-in with mysql/admin account
- Correcting typo
- Adding markup tweaks
- Adjusting the wording of the warning

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 09:13:47 -05:00
Paul Poulain
5293bb5540 Bug 9008: warn if user is logged-in with admin account
Test plan:
* log-in staff interface with admin (mysql) account => there's a large warning on the homepage
* log-in with another account => nothing displayed

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 09:13:08 -05:00
Jared Camins-Esakov
369c5382a4 Merge branch 'bug_8945' into 3.12-master 2012-11-02 12:00:32 -04:00
Nicole C. Engard
be0f16aaac Bug 8945: Update Tags help files for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:58 -04:00
Nicole C. Engard
c075970daa Bug 8945: Tools Help Files
This patch updates the help files for 3.10 in the Tools
section and adds a help file for the patron modification tool

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed off patch includes one small fix:
Profilemarcfields -> Profile MARC fields
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:57 -04:00
Nicole C. Engard
fbc7b11d5d Bug 8945: Update lists help for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:56 -04:00
Nicole C. Engard
e15ea30899 Bug 8945: Update suggestion help file for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:55 -04:00
Nicole C. Engard
0d0d5c48bc Bug 8945: Serials Help Files for 3.10
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:54 -04:00
Jared Camins-Esakov
4db3611ee6 Merge branch 'bug_7455' into 3.12-master 2012-11-01 10:31:14 -04:00
Fridolyn SOMERS
9b55ebff65 Bug 7455: Authority subfields are cloned in the wrong field (follow-up 3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:56 -04:00
Fridolyn SOMERS
7cf5e2e954 Bug 7455: Authority subfields are cloned in the wrong field (follow-up 2)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:53 -04:00
Fridolyn SOMERS
eabe698705 Bug 7455: Authority subfields are cloned in the wrong field (follow-up)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:50 -04:00
Fridolyn SOMERS
2f860e36f6 Bug 7455: Authority subfields are cloned in the wrong field
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:32 -04:00
1ce2386e36 Bug 8931 - submit buttons have blue background
This patch specifies a transparent background for fieldsets
and divs with the class "action," which are typically containers
for the submit/cancel actions.

For testers, a good example page to view is the "set library" page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:32:15 -04:00
Lyon3 Team
43ba461f39 Bug 8978: Patron's dateexpiry erroneously updated when in UnwantedField
If dateexpiry field was absent because it has been included in
UnWantedField syspref list, the script assumed that the date has
been forgotten and updated it when clicking on 'save' button.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-31 18:33:44 -04:00
f191782d98 Bug 8707 - tags always say approved
Template scope error caused an incorrect state on the
approval/rejection buttons when viewing rejected tags.

To test, go to Tags and view the list of rejected tags.
In the "Actions" column, the "rejected" button should be
greyed out, and the "approve" button active.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-31 16:48:24 -04:00
715c52977a Bug 8980 - Untranslatable strings in modborrowers.pl
This patch removes the declaration of interface labels
from the script and puts it in the template where the
labels can be translated. The labels have been modified
to match those used on the patron entry form.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:28:35 +01:00
Fridolyn SOMERS
678c7c4230 Bug 8936: Search RSS feeds does not show there items when subscribing in Firefox
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:24:54 +01:00
Fridolyn SOMERS
d12f4e09ee Bug 8973: HTML and URL escape missing in OPAC templates
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:15:22 +01:00
Nicole C. Engard
b141a35692 Bug 8961: Fix typo in offline circ help
Signed-off-by: Marc Veron <veron@veron.ch>

Tiny typo fix in HTML text.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 12:36:21 +01:00
Magnus Enger
000605e939 Bug 8941 - Make title display properly for NORMARC OPAC detail view
Authors and materialtype were displayed to the right of the title.
This patch simly adds class="title" to the h1 that holds the title.

To test:
- Set marcflavour = NORMARC
- Check a detail view in the OPAC and see that the display is wrong
- Apply the patch
- Check that the detail view now looks good

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-28 19:39:44 +01:00
Paul Poulain
be3441d648 Bug 8939 follow-up welcome to Robert Williams 194th contributor
also fixing Mathieu Saby number (193th instead of a duplicate 192nd)
2012-10-26 17:31:31 +02:00
Marc Veron
47f62c0d0c Bug 8885 - OPAC with ccsr theme in IE9
Microsoft-specific filter statements removed from koha-tmpl/opac-tmpl/ccsr/en/css/opac.css

...now background colors show as expected...

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-25 17:45:28 +02:00
Adrien Saurat
eaa3c6f9c9 Bug 8234: fixes date sort on 'Transfers to receive' page
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-25 17:31:11 +02:00
Paul Poulain
2943530f25 Merge remote-tracking branch 'origin/new/bug_3652' 2012-10-24 15:44:33 +02:00
Chris Hall
d2de76d60d bug 3652 fixing XSS vulnerabilities in opac-search
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-24 15:44:07 +02:00
Nicole C. Engard
e242a3a696 Bug 8945: Update comments help file
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:50 +02:00
Nicole C. Engard
152605e319 Bug 8945: Hold help file
This patch updates the holds help file.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:45 +02:00
Nicole C. Engard
f893e2a5fb Bug 8945: Reports Help Files
This patch updates the reports help files for 3.10.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:39 +02:00
Nicole C. Engard
44811b92bb Bug 8945: Update patron card creator help files
Links to the manual updated, no other changes needed at this time.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:32 +02:00
Nicole C. Engard
8f842c7cb7 Bug 8945: Update offline circ help files
This patch adds in a help file for the FF offline processer and
updates the other help file.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:25 +02:00
Nicole C. Engard
5bbff8be8f Bug 8945: Add patron routing list help file
This patch adds a missing help file to the members folder.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:17 +02:00
Nicole C. Engard
cc748481d1 Bug 8945: Update patron help files
This patch adds two missing help files and updates the
existing help files in the members folder.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:10 +02:00
Nicole C. Engard
47492c9c73 Bug 8945: Label help files
This patch just updates the manual links in the label
folder becaue no other functionality has changed.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:02 +02:00
Nicole C. Engard
f4d1f9106c Bug 8945: Circulation help files
Updates circulation help files.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:57 +02:00
Nicole C. Engard
4399526be8 Bug 8945: Add missing detail help file to catalog
This patch adds a missing help file to the catalogue
folder.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:49 +02:00
Nicole C. Engard
e76c36a85d Bug 8945: Cataloging Help Files
This patch adds one missing help file for analytics and updates
the others.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:43 +02:00
Nicole C. Engard
9cc050bae2 Bug 8945: Catalogue Help Files
This patch updates the catalogue help files.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:37 +02:00
Nicole C. Engard
5a774b4a35 Bug 8945: Authority Help Files
This patch updates authority help files.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:29 +02:00
Nicole C. Engard
cb54358aed Bug 8945: Administration Help Files
This patch adds the help file for the transport cost matrix
and updates all others. Still needed is a help file for
'did you mean'.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:19 +02:00
Nicole C. Engard
a1225ba9d1 Bug 8945: Acquisitions Help Files for 3.10
This patch adds a few missing help files and updates all
of the existing help files for 3.10.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:07 +02:00
Nicole C. Engard
1a92ab45d1 Bug 8945: Update help files for 3.10
This patch updates help files that are not in any
specific module folder.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:13:59 +02:00
Nicole C. Engard
17c097a71e Bug 8944: Fix invoices search wording
When the invoices page has no results it asks the user
to use the form on the left to search. This patch fixes the
wording to make it a bit clearer.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:59:00 +02:00
c76d6fe3f1 Bug 8912 - Remove unused hold-menu.inc
hold-menu.inc is not used on any page in Koha and
can be safely removed.

To confirm, search the Koha source for "hold-menu.inc." No
instances should be found.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:55:26 +02:00
af68717016 Bug 8935 - transport cost matrix could be prettier
Correcting the template so that it follows established
interface patterns and coding guidelines:

- Form contents in a fieldset
- Submit button in a fieldset with class "action" and
  with a "Cancel" link.
- Errors displayed in a <div class="dialog alert">
  (no custom error classes necessary).
- Valid markup.
- No JavaScript errors (to that end, the patch removes a
  call to a non-existent function, show_transport_cost_matrix)

http://bugs.koha-community.org/show_bug.cgi?id=8936
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
still works as expected and is much more visually appealing.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:51:11 +02:00
492dd7dc7f Bug 8870 UNIMARC authorities search doesn't display information properly
- Note field (3xx) are not displayed on search result page. We get
  'HASH()' text.
- Parallel/Other forms (7xx) are not displayed, with language name in front of
  heading, both on result and detail page.
- Note are not displayed.
- On result page, seealso form are displayed, but end with a superfluous '--'
- Style the result page, with condensed block, and space between them.
- Done both on OPAC/staff

To be applied on 3.8.x after bug 8523.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:50:06 +02:00
Nicole C. Engard
d50edb9a8f Bug 8934: Fix transport cost matrix help language
The transport cost matrix has a typo (arbitrarymax) and the help
text could be worded better. This patch makes those changes.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:48:18 +02:00
b9f4082f1b Bug 8923 [Revised] Add ids to repeated pagination menus to allow for CSS customization
This patch adds ids to each pagination menu on the OPAC search
results page so that they can be customized via CSS or JavaScript.

To test, modify OpacUserCSS to hide ids "top-pages" and "bottom-pages"
and confirm that they are hidden.

Also fixed is an unescaped ampersand introduced by Bug 8209.

Revision removes debugging changes to an unrelated file.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:44:42 +02:00
Nicole C. Engard
bbcef720a5 Bug 8933: Update transport cost matrix styles
The transport cost matrix is capitlized wrong (based on our
rules). This patch fixes capitalization errors and adds the
matrix to the admin menu where it was missing before.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:33:04 +02:00
Paul Poulain
3ebb36e67a Bug 8916 follow-up adding Mathieu Saby to contributors list
Also adding 3.8.6 release
2012-10-22 17:30:41 +02:00
Mathieu Saby
e0cd4f898f Bug 8916: Hide Curriculum index in advanced search if marcflavor = unimarc
This patch hides curriculum option value in koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc and koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt if marcflavor = UNIMARC

To test
- set marcflavour to UNIMARC, this option should be hidden in the index list in opac and staff interface advanced search
- set marcflavour to MARC21, this option should be visible, as before

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:23:29 +02:00
fc78d1c268 Bug 8898 - Remove unused mainmenu include and related styles in the staff client
This patch removes the mainmenu and additem-menu includes and #navigation
references in staff-global.css which were used by those includes.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:17:56 +02:00
Jonathan Druart
2b9ba0fd0a Babeltheque: Remove the unused tab on the opac detail page
http://bugs.koha-community.org/show_bug.cgi?id=8792
Signed-off-by: Marc Veron <veron@veron.ch>
Babeltheque tab is removed as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:10:22 +02:00
Paul Poulain
fc49b7a3b5 Bug 7483 follow-up replacing tabs by 4 spaces in both templates 2012-10-22 17:07:37 +02:00
Adrien Saurat
d27c8210ae Bug 7483: fixes on breadcrumbs in Authority administration
Better breadcrumbs for the following pages:
- auth_tag_structure.pl
- auth_subfields_structure.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:01:08 +02:00
8626a5bebb Bug 8724 - Upgrade from NoZebra installs is broken
Properly set the relevant NoZebra and QueryRemoveStopwords sysprefs to 0 to fix issues on upgrades.
Also removes the sysprefs from preferences/searching.pref

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 14:55:17 +02:00
Paul Poulain
ee3eee451d Merge remote-tracking branch 'origin/new/bug_8525' 2012-10-19 18:03:36 +02:00
Nicole C. Engard
1571139839 Follow up: Bug 8525: Update preference description
The feature in bug 8525 added highlighting to the detail
pages in the opac. This patch updates the preference to
note this change.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 18:03:21 +02:00
Paul Poulain
8a53d28490 Merge remote-tracking branch 'origin/new/bug_7986' 2012-10-19 18:03:02 +02:00
Nicole C. Engard
f03712d37b Bug 7986 Follow Up: Fix ExportRemoveFields
This preference was in the code as a choice but should be a list
of fields to exclude. This patch makes that change and updates
the description to fit more with the standard set by other
preferences.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 17:54:25 +02:00
Nicole C. Engard
3a4129e6a3 Bug 7986 Follow Up: Update ExportWithCsvProfile
The ExportWithCsvProfile preference was on its own file
(tools.pref) when in reality it belonged on the circulation
tab. This patch removes the tools.pref file and moves the
ExportWithCsvProfile preference and updates the text
around it to make it clearer.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-10-19 17:54:23 +02:00
Mirko Tietgen
4ccf4181bb Bug 4177 opaccloud missing from the system preferences interface
There is no option to toggle the (existing) syspref OpacCloud. This patch adds one.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Inserted tags manually, enabled system preference, tag subject cloud displays nicely.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 17:52:37 +02:00
Katrin Fischer
ac66d224ad Bug 3652: [SIGNED-OFF] XSS fixes - follow up
Fixes a typo in the html filter that causes a problem when using the
paging in the OPAC result lists.

(forgot to commit my change when testing the original XSS patches)

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I triggered the error with this query string:
/cgi-bin/koha/opac-search.pl?idx=kw&q=o'reilly&offset=40&sort_by=author_az
After applying the patch the error is gone.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-17 17:35:04 +02:00
Paul Poulain
5cea05831a Merge remote-tracking branch 'origin/new/bug_8585' 2012-10-17 17:31:09 +02:00
Nicole C. Engard
9ca17830d8 Follow up to Bug 8585: add missing word to preference
The preference added in this bug is missing the word
'day(s)'. This patch adds it in.

http://bugs.koha-community.org/show_bug.cgi?id=4118
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-17 17:30:44 +02:00
Paul Poulain
a327747c10 Bug 7143 follow-up replace tabs by 4 spaces 2012-10-16 18:18:13 +02:00
Chris Cormack
9fd6082ca9 Bug 7143 : New committer to history 2012-10-16 18:17:26 +02:00
Chris Cormack
971c872419 Bug 7143: Adding new developers to the history file
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
2012-10-16 18:17:25 +02:00
Paul Poulain
23de370b2d Merge remote-tracking branch 'origin/new/bug_7751' 2012-10-16 18:13:51 +02:00
Nicole C. Engard
7d2dc13db0 :x
The preference used to read 'loan period by' but it's
actually reducing the checkout period 'to' the number
of days entered in the preference.  This patch changes
'by' to 'to'.

Signed-off-by: Marc Veron <veron@veron.ch>

Tiny patch, text change only, text apears as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-16 18:13:16 +02:00
Fridolyn SOMERS
b48615dda5 Bug 8791: OPAC UNIMARC XSLT details: subject with subfield 3
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I can reproduce the bug, and confirm that this patch fix it. The issue arises
when $9 come first, and then $3, which is not that usual.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 23:01:17 +02:00
Marc Veron
b83050efab Bug 8873 - JavaScript error in Opac displaying tag cloud
On master (3.09.00.060), I get a JavaScript error on line 126 in opac-tags.pl while displaying tags cloud.

Reason: There are two lines with closing });

Patch removes one line.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 22:47:35 +02:00
Magnus Enger
8ec52a8e23 Bug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT
This patch fixes some issues with icons related to materialtypes in NORMARC:

Remove references to opac-tmpl in the *intranet* NORMARC XSLT files.

Add two new icons to koha-tmpl/intranet-tmpl/prog/img/famfamfam/ and
koha-tmpl/opac-tmpl/lib/famfamfam/
GR.png - Graphical materials
TD.png - Three dimentional objects

Copy PR.png from koha-tmpl/intranet-tmpl/prog/img/famfamfam/ to
koha-tmpl/opac-tmpl/lib/famfamfam/

Rename the XSLT variable materialTypeCode to typeOf008 for increased consistency
between stylesheets.

Make sure the XSLT uses icons that are actually available.

To test:
- No use testing all the different permutations of leader pos. 06 and 019b, I think.
- Set marcflavour = NORMARC and turn on default XSLT for OPAC and Intranet, details
  and results.
- Make sure you have a record with something relevant in leader position 6, like
  g for movies or c for music
- Check that the icon turns up in results and details, in the OPAC and Intranet
- Toggle DisplayOPACiconsXSLT and check that the results in the OPAC are as expected

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 22:28:16 +02:00
80f8c46dc6 Bug 8862 - merge.pl contains untranslatable strings
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:52:25 +02:00
782e1845f3 Bug 8869 - Duplicate member check doesn't disable submit button on bottom.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I confirm that after applying this patch, the submit button is removed from
patron edit page, avoiding accidentaly clicking on it, without responding to
the question about possible duplicate patron?

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:43:23 +02:00
Fridolyn SOMERS
5a38631838 Bug 8863: When clearing a patron attribute, they are all cleared
Signed-off-by: Marc Veron <veron@veron.ch>

Tested with a set of 2 additional patron attributes. Cleard both before applying the patch.
Cleared as expected after applying the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:39:53 +02:00
8308e2055a Bug 8851 - strange blue bar above serials results
Bug 5357 (Subscription search and displays) added an advanced
search form which adds a new interface featured: a collapsible
fieldset with the search form inside. Bug 8851 was filed
because it is not immediately obvious that the search form
is hidden and can be shown by clicking the fieldset's legend.

I contend that this new behavior is unnecessary: In many other
places we put a similar search form in the left-hand sidebar.

This patch amends the template to show the search form in the
main body of the page if no search has been performed. After
searching the form is moved to the sidebar. This keeps the page
consistent with other interfaces and eliminates the confusion
about the collapsed form.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:34:12 +02:00
63145eb3d2 Bug 8718 - Normal catalogue detail view in staff client doesn't show missing serials or subscription history note
Adds librariannote (staff subscription history note) and missing list to the normal catalogue detail view in staff client.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 16:35:58 +02:00
2420c4d85c Bug 8766 - OPACBaseURL still called as OPACBaseurl in many files
This patch fixes incorrect capitalization of the OPACBaseURL
variable in three templates. The fix can be confirmed in
opac-results.tt by inspecting the link attached to the RSS
icon on the OPAC's search results screen. The same fix is included
in opac-opensearch.tt and search/results.tt but I'm not sure
how you confirm that this change fixes anything, if it does.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 16:33:07 +02:00
Paul Poulain
65be03846d Merge remote-tracking branch 'origin/new/bug_7412' 2012-10-12 12:28:54 +02:00
Nicole C. Engard
884005db08 Bug 7412: Follow up: Update preference to sentence
This patch updates the preference question to a sentence
to follow the standard set with previous preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:28:27 +02:00
Paul Poulain
7886297f05 Merge remote-tracking branch 'origin/new/bug_7751' 2012-10-12 12:23:08 +02:00
Nicole C. Engard
65accc367b Bug 7751: Decrease loan length with many holds
This patch merges the three preferences in to one sentence
to make it clear that they are all linked together and to
eliminate confusion that can come by having them as
individual preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-10-12 12:21:17 +02:00
Chris Cormack
a4bf495f3b Bug 3652 XSS vulnerability in facets
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug with test plan on the bug and checked that
problem is fixed after applying the patch and that facets
still work.
2012-10-12 12:17:51 +02:00
Chris Cormack
2e30600a58 Bug 3652: XSS vulnerability in page numbering
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed the problem with test plan on the bug and checked that
paging works correctly after the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:17:47 +02:00
Chris Cormack
53309fab4b Bug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. After applying the patch, <blink>fish</blink>
is displayed on the page, but no blinking occurs.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:17:41 +02:00
Marc Veron
802dd7baf5 Bug 8812 - Staff Client: Patron search should display branch name instead of branch code in results table
Patch to display branchname instead of branch code.

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-11 11:17:06 +02:00
Nicole C. Engard
0c75d667d5 Bug 8831: relabel gstrate with Tax rate
This patch changes gstrate to Tax rate to match the standard set
on all other acq pages.

Signed-off-by: Marc Veron <veron@veron.ch>

Small text change. Label displays as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 18:00:02 +02:00
d51f822a5b Bug 8820 - Don't show orders table if there are no orders
This page removes the "basket empty" message in favor of
hiding the orders table altogether when a basket has no
orders. This patch also moves the "Show all details"
checkbox under the "Orders" heading to associate it more
closely with the area it affects.

Other textual changes:

- Correcting capitalization according to coding guidelines
- Correcting terminology (basket group instead of basketgroup)
- Replacing the "Order Details" heading with the more
  succinct "Orders"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:51:06 +02:00
Julian Maurice
39ad9abb74 Bug 8801: Add menu entry to delete items in batch
In catalogue/detail.pl you can now select "Delete items in batch" in
"Edit" menu. You are redirected to batchMod.pl for chosing which items
have to be deleted.
You need to have 'tools.items_batchdel' permission to see this menu
entry.

Signed-off-by: Marc Veron <veron@veron.ch>

Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:07:44 +02:00
Paul Poulain
a7714ed6c5 Bug 7873 follow-up s/tab/4spaces/ 2012-10-09 18:03:05 +02:00
Adrien Saurat
98d8e1609a Bug 7873: fixes sort on Title in OPAC basket
Signed-off-by: Marc Veron <veron@veron.ch>

Reproduced wrong title sort without patch.
Sort works as expected with patch.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 17:56:07 +02:00
Frédérick
9d38ff1e5f Bug 8570 - Add pagination to the Z39.50 results page
Add paginations to the Z39.50 search results.

http://bugs.koha-community.org/show_bug.cgi?id=8570
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 16:23:23 +02:00
94eae1df00 Bug 2930 [REVISED] Put other name on checkout screen
This patch adds other name to the include which is used
to display patron names and adds this include in several
places where it can be used in place of direct output.

The patron-title include has been modified to handle the
two possible variable scopes throughout patron-related
templates. This is a hack similar to having both
circ-menu.tt and circ-menu.inc, but keeping both in the
same file.

Changes to some scripts were necessary to make the
othernames variable available to the include.

This patch also corrects some <title> tags and fixes
some incorrect capitalization (see Bug 2780).

To test, view each of the pages affected by these
template changes and confirm that the patron's name
displays correctly, including their "other name."

Signed-off-by: Marc Veron <veron@veron.ch>
Followed instructions above, works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 12:23:39 +02:00
Joseph Alway
b769a3cda0 Bug 8680 Z39.50 ISBN Search is problematic and there is a missing ISSN field.
The changes here are duplicate fixes.
The cataloguing directory had the same bugs as the acqui directory.
The bugs in the cataloguing files of the same name were fixed in Bug 8550.
The bugs in the acqui files had not been fixed.
This will fix Bug 8680 which is in the Acquisitions Module.

Changes to the z3950_search.pl file:
Rather than treating ISBN and ISSN as the same, this patch breaks
them out into separate parts of the query, as well as changing
the truncation attribute to enable right truncation (the correct
behavior for the ISBN field in MARC21, and valid behavior in
UNIMARC).

Changes to the z3950_search.tt file:
Sometime in 2009 or so, the ISSN field was removed from the Z39.50 search
page, and the ISBN field replaced with a combined ISBN/ISSN field. Since
this breaks ISBN search for most Z39.50 targets (due to the
differing treatment of ISBN vs. ISSN), this is a bug not a feature.

Signed-off-by: Marc Veron <veron@veron.ch>

Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:56:36 +02:00
17298c2042 Bug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page
Extra </div> returned. Killing it again.

After applying the patch the validator should only warn of
invalid "autocomplete" attribute.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-08 17:11:12 +02:00
Marc Veron
510a7d7347 Bug 8796 - patron cards not starting on designated card
Better wording for the meaning of 'Position' to prevent mistakes on behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:16:01 +02:00
Marc Veron
624957bf21 Bug 8810 - Opac: Cart should display branchname instead of branchcode
In Opac, the cart should display the branchname instead of the branchcode.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:25:50 +02:00
Jonathan Druart
96e1c5d80b Bug 8370: Change term issues (smart-rules)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:12:41 +02:00
Paul Poulain
e5a24bbbdd Merge remote-tracking branch 'origin/new/bug_7621' 2012-10-05 11:58:28 +02:00
Nicole C. Engard
337fbb5e98 Bug 7621: Follow up to clarify preference language
This patch changes strings only, not functionality. It will
clarify the meaning of the  AgeRestrictionMarker preference.

Signed-off-by: Marc Veron <veron@veron.ch>

Better wording of preference instructions. No code echange involved.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:58:12 +02:00
Paul Poulain
81ee945a58 Merge remote-tracking branch 'origin/new/bug_8382' 2012-10-05 11:56:39 +02:00
d30a8ae220 Bug 8382 [Follow-up] It is not possible to cancel an order when receiving on a filtered page in parcel.pl
In order to be valid XHTML ampersands must be encoded ("&amp;").

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:56:24 +02:00
383e2c4270 Bug 8827 - YUI CSS files no longer found on Yahoo servers
This patch removes the [% yuipath %] variable from the link
to the YUI CSS files in the OPAC and adds a hard-coded path
to the local files.

To test, set your yuipath system preference to "from Yahoo's
servers," clear your browser cache, and view the OPAC. The
style and layout should look the same as if your yuipath
preference were set to "local."

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Fixes broken display.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:51:04 +02:00
Jared Camins-Esakov
461b0c4420 Bug 8623 follow-up: make sure CCSR theme loads YUI
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-05 11:49:22 +02:00
f7055bb901 Bug 8449 - Improve wording and styling for "cancelled holds" on Holds Awaiting Pickup screen
Return library name to message about hold requiring transfer.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 10:44:51 +02:00
e500433c3f Bug 8449 - Improve wording and styling for "cancelled holds" on Holds Awaiting Pickup screen
This patch re-implements and adapts the changes dcook@prosentient.com.au
submitted in a patch which no longer applies. I have changed the
"alert" style messages to "message" style to match the style
which is applied to "hold found" messages elsewhere.

I have also revised the language in a way that I think is more
clear and accurate.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
2012-10-05 10:44:49 +02:00
Paul Poulain
a8c5497b8d Merge remote-tracking branch 'origin/new/bug_7986' 2012-10-04 18:12:14 +02:00
Jonathan Druart
db4fddd31d Bug 7986: Followup: Hide the export link unless sysprefs are set
If at least one of both sysprefs (ExportRemoveFields and
ExportWithCsvProfile) is filled, the export link is displayed

Signed-off-by: Marc Veron <veron@veron.ch>

Tested with both sysprefs filled/not filled, patch behaves as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-04 18:09:00 +02:00
7f5583d549 Bug 8759 - Add labels for library and sorting on opac advanced search
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-03 15:53:16 +02:00
Paul Poulain
529bb9c2a4 Bug 8585 follow-up Passing syspref to template
Passing the syspref HoldsToPullStartDate to get the number of days displayed on the screen
(instead of "two" that was hardcoded)

Also s/tab/4 spaces/g
2012-10-03 15:28:43 +02:00
762ce7abe6 Bug 8585 : Add System Preference to specify Holds to Pull List Start Date
Currently, Koha creates a default value of 2 days ago (-2) for the start date of the Holds to pull List. This system preference allows users to specify their own default start date for this list, since users might not want to have to manually change the date all the time when they already know the set date period they want to view.

The system preference value is specified as a positive integer, which is then passed as a negative integer in the handler script. This saves users from having to include a qualifer to the sys pref value.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-03 15:18:40 +02:00
50be765eae Bug 8711 - alternating colors messed up on reports
Patch adds the "zebra-striping" option to the
table sorter initialization and changes the row
color CSS to match the tablesorter's to prevent
conflicts.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-02 18:04:21 +02:00
Frédérick Capovilla
77c2a02c8c Add a warning if a Z39.50 search is started from biblio edition page.
Warn the user that the current biblio record might be overwritten by
this action.

http://bugs.koha-community.org/show_bug.cgi?id=8583
Signed-off-by: Marc Veron <veron@veron.ch>

Woks as expected. I prefer this solution with an explicit warning,
since several times I acidentally changed a record  :-)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-02 18:00:54 +02:00
Lyon3 Team
2f875daa60 Bug_7913-Follow-up, hide button for subs with items
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-01 17:50:16 +02:00
Lyon3 Team
cd2fae07ae Receiving serials in a loop
generate the number of issues entered from a message box and apply
'arrived' status.

http://bugs.koha-community.org/show_bug.cgi?id=7913
Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
2012-10-01 17:50:12 +02:00
Robin Sheat
79e0fb6fd6 Bug 7642 - fix the lost display of tag sizes
This fixes the display of different sized words for differently popular
tags. It is a bit of a refactor of that part of the system, moving
logic to more sensible places (and removing an unused method on the
way.)

Note that it isn't an attempt to reproduce what was there previously,
just to do something similar, and in an easier to change fashion.

Sponsored-By: New Zealand Educational Institute
Signed-off-by: Marc Veron <veron@veron.ch>
Works as expected.
2012-10-01 17:38:27 +02:00
7a7e018ed3 Bug 3387 - WITHDRAWN items shouldn't check in
Adds a system preference BlockReturnOfWithdrawnItems to control
whether or not Koha should allow a withdrawn item to be returned
or not.

Also fixes the behavior where Koha will attempt to use a withdrawn
item to fill a hold.

Test Plan:
1) Set BlockReturnOfWithdrawnItems to "Block" ( this is the default )
2) Check an item out to a patron
3) Mark item as withdrawn
4) Attempt to return the item, you should still see the item on the
   borrower's record
5) Set BlockReturnOfWithdrawnItems to "Don't Block"
6) Attempt to return the item, you should see the item is no longer
   on the borrower's record.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-10-01 17:07:53 +02:00
Jared Camins-Esakov
5bf01284e3 Bug 8581: don't display parentheses when we don't have a type
Prior to this patch, see also references in certain authority records
(most notably GND records) were being followed by empty parentheses in
the search results display. This patch resolves that problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-01 16:34:04 +02:00
Jared Camins-Esakov
eb6effd2c2 Bug 8726: add CSS to CCSR theme 2012-09-28 17:14:19 +02:00
Jonathan Druart
b5659f6425 Bug 8726: Followup FIX save didyoumean syspref
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-09-28 17:14:17 +02:00
Jared Camins-Esakov
52f54eec1d Bug 8726 follow-up: fix QA issues
Fixes several perlcritic complaints, and some overflow in the
configuration page. Also notes that Did You Mean is not yet
enabled on the staff client.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Sorry about the problematic last attempt at uploading. I missed a
patch when squashing. It is now included.
2012-09-28 17:14:15 +02:00
Jared Camins-Esakov
ef87bb0a81 Bug 8726: ExplodedTerms suggestion plugin (jQueryUI)
When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds a suggestion plugin for
these "exploded" subject searches to Koha. Note that this patch depends on
both bug 8211 AND bug 8209.

To test (NOTE: this test plan covers both 8211 and 8726):
1) Make sure you have a bunch of hierarchical subjects. I created
   geographical subjects for "Arizona," "United States," and "Phoenix,"
   and linked them together using 551s, and made sure I had a half
   dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona," the
   records with the subject "United States," and the records with the
   subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
   whatever)
6) Use "Did you mean?" page in admin section to enable ExplodedTerms
   plugin
7) Do a keyword search on the OPAC, confirm that searching for exploded
   terms is suggested.
8) Do a subject search on the OPAC, confirm that searching for exploded
   terms is suggested.
9) Do a non-keyword, non-subject search on the OPAC, confirm that
   searching for exploded terms is NOT suggested.
10) Disable ExplodedTerms plugin and enable AuthorityFile plugin.
11) Do search on OPAC, confirm suggestions are made from authority file.
12) Sign off

Signed-off-by: wajasu <matted-34813@mypacks.net>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Split into two patches. This patch includes only the jQueryUI upgrade
2012-09-28 17:14:13 +02:00
Jared Camins-Esakov
d2cd2e09aa Bug 8726: ExplodedTerms suggestion plugin (functionality)
When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds a suggestion plugin for
these "exploded" subject searches to Koha. Note that this patch depends on
both bug 8211 AND bug 8209.

To test (NOTE: this test plan covers both 8211 and 8726):
1) Make sure you have a bunch of hierarchical subjects. I created
   geographical subjects for "Arizona," "United States," and "Phoenix,"
   and linked them together using 551s, and made sure I had a half
   dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona," the
   records with the subject "United States," and the records with the
   subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
   whatever)
6) Use "Did you mean?" page in admin section to enable ExplodedTerms
   plugin
7) Do a keyword search on the OPAC, confirm that searching for exploded
   terms is suggested.
8) Do a subject search on the OPAC, confirm that searching for exploded
   terms is suggested.
9) Do a non-keyword, non-subject search on the OPAC, confirm that
   searching for exploded terms is NOT suggested.
10) Disable ExplodedTerms plugin and enable AuthorityFile plugin.
11) Do search on OPAC, confirm suggestions are made from authority file.
12) Sign off

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Split into two patches. This patch includes only the functionality.
2012-09-28 17:08:21 +02:00
christophe croullebois
35b7162adf Bug 7351 : feature that allows to delete a range of dates
Four new options, one for single holidays, one for the repeatable holidays.
One to create exceptions on a range of dates, one to delete exceptions in a range of dates.
Note that the exceptions are not deleted if you delete a range of repeatable dates.
But if you delete a range of single holidays the exeptions inside will be deleted.

Signed-off-by: Stephane Delaye <stephane.delaye@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-28 12:19:45 +02:00
Paul Poulain
8e7df04301 Bug 5335 follow-up fixing template
There were 2 invalid T::T construction, with a [% IF %] inside a HTML tag
2012-09-28 11:26:23 +02:00
Maxime Pelletier
6d59dd5c60 Bug 8659 Remove and readd the inactive funds in javascript to make it work in all browsers
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-26 19:11:14 +02:00
Fridolyn SOMERS
9ee5c9ec1e Bug 8702: System preferences search does not allow accented letters
This bug enables accented/diacritic system preference text to be matched
when searching for sysprefs.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-26 19:02:18 +02:00
Jonathan Druart
1b4b78a136 Bug 5356: delivery place and billing place centralised in basket management
- adding 2 select option in basdketheader.tmpl (delivery and billing
   place)
- adding 2 more fields in basket csv export

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested together with patches for bug 7302.
2012-09-24 20:46:39 +02:00
Paul Poulain
b2bb0c78e5 Bug 8523 follow-up OPAC styles for ccsr theme 2012-09-21 16:35:20 +02:00
Jared Camins-Esakov
83370c519c Bug 8523: Display auth hierarchies w/all marcflavours
This commit adds support for displaying authority hierarchies for all
flavours of MARC, not just UNIMARC. Display now uses the jQuery
jstree plugin, selected with the help of Owen Leonard, resulting in a
much faster experience for users.

Be aware that the jstree file uses tabs rather than 4-space indentation,
which I left as-is so as to make it easier to integrate upstream
releases in the future.

To test:
1) Enable the AuthDisplayHierarchy syspref
2) Create authority records with a hierarchy of see also fields
   (in MARC21/NORMARC, you'll be using 5xx fields for this, with a
   subfield $w=g for broader terms and subfield $w=h for narrower
   terms)
3) View the authorities in the OPAC, noting the hierarchical view at
   the top of the page.

This initial patch does not create bidirection linkages from
unidirectional links in MARC21 authorities. This means that when moving
up the authority hierarchy, lower levels will disappear. This is
intentional, as the first patch is intended merely to ensure that
AuthDisplayHierarchy functions the same for all marcflavours. A future
patch will add a cron job to generate the bidirectional linkages, once
we are sure that the hierarchy functionality for UNIMARC and
MARC21/NORMARC coexists peaceably.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Resolved conflicts in updatedatabase.pl, sysprefs.sql and in one of
the CSS files.

Test plan:

1) Run t/AuthoritiesMarc.t
New tests complete without any errors.

2) Make sure updatedatabase works correctly.
Update works nicely, new system preference is also added to syspref.sql

3) Make sure new terms are translatable.
Created new po files for de-DE and checked for new terms.
All translations appear correctly.

4) Make sure everything works with AuthDisplayHieararchy OFF
- Add authority
- Edit authority
- Delete authority

5) Test feature with AuthDisplayHieararchy ON
- Add authority
- Edit authority
- Delete authority

6) Add a couple of hierarchically linked authorities
Note: links have to be created in both directions

Example:
151 $aGermany
  551 $a Baden-Württemberg $w h

151 $aBaden-Württemberg
  551 $a Konstanz $w h
  551 $a Germany $w g

151 $aKonstanz
  551 $a Baden-Württemberg $w g
  551 $a Fürstenberg $w h
  551 $a Paradies $w h

151 $a Fürstenberg
  551 $a Konstanz $w g

151 $a Paradies
  551 $a Konstanz $w g

Tree shows up nicely above the authority record
- in staff
- in OPAC
  - on the normal view tab
  - on the MARC view tab

7) Checking the logs for warnings
- no Javascript errors or warnings
- no warnings or errors in log files
2012-09-21 14:52:08 +02:00
Jonathan Druart
d7faf087a3 Bug 5335 - More granular VAT
Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 18:09:53 +02:00
Fridolyn SOMERS
dd2de85892 Bug 8692: Authorities search form does not correspond to current search query
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The correct tab is now visible on load. The problem with authtypecode
showing up in the search box is specific to UNIMARC, so I could not
check that it was gone, but I am comfortable signing off on this.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 14:06:41 +02:00
Paul Poulain
a42e5e6d3e Merge remote-tracking branch 'origin/new/bug_5339' 2012-09-20 10:19:44 +02:00
Paul Poulain
59c230e7fd Bug 5339 follow-up
* fix english error
 * if the invoice is closed, don't display a "finish receiving" link, but a "view invoice" one
2012-09-20 10:19:19 +02:00
Julian Maurice
8cf9f78702 Bug 5339: ergonomic changes
- "Finish receive" on parcel.pl now redirect to acqui/invoice.pl,
  allowing the librarian to modify invoice informations (freight,
  billing date, ...) and close invoice.
- The librarian can now close (or reopen) the invoice and modify invoice
  informations in 1 operation (instead of 2)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 09:46:50 +02:00
Jared Camins-Esakov
7ad5e203da Bug 2060: Update command line MARC import scripts
Expose authority import functionality to the command line import
scripts, and rename them from commit_biblios_file.pl and
stage_biblios_file.pl to commit_file.pl and stage_file.pl.

To test (note that these instructions assume you have a MARC21
installation and are using the provided sample file):
1. Find a file of authorities (a sample file with MARC21 authorities
   is attached to bug 7475) and download it to your server
2. Stage the file using the following command (replace <filename> with
   the name of the file you saved in step 1):
   > misc/stage_file.pl --file <filename> --authorities
3. Note the batch number the script assigns to your batch
4. Commit the records using the following command (replace <batchnumber>
   with the batch number you made note of in step 3):
   > misc/commit_file.pl --batch-number <batchnumber>
5. Index the authorities Zebraqueue (or wait)
6. Confirm that the new authorities appear.
7. Create a matching rule with the following settings:
   Code: AUTHTEST
   Description: Personal name main entry
   Match threshold: 999
   Record type: Authority record
   Search index: Heading-main
   Score: 1000
   Tag: 100
   Subfields: a
   Offset: 0
   Length: 0
   (note the ID of this matching rule)
8. Stage the authority file again, this time using the following
   command:
   > misc/stage_file.pl --file <filename> --authorities \
     --match <matchingrule>
7. Revert the import with the following command:
   > misc/commit_file.pl --batch-number <batchnumber> --revert
8. Index the authorities Zebraqueue (or wait)
9. Confirm that the records have been removed
10. Import an authority record with the Stage MARC/Manage staged MARC
    tools in exactly the way you would for a bibliographic record,
    but choose "Authority" instead of "Bibliographic" for the record
    type.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Testing plan delivers as it should.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
2012-09-19 17:16:18 +02:00
Jared Camins-Esakov
6e71b80ca3 Bug 7475: Teach matching rules to handle authorities
* Add the code necessary to handle authorities with matching rules and
  import batches.
* Update all the scripts that use the matcher and import batch code
  to use the new API.
* Add authority records to the matching rules interface in the staff
  client.

http://bugs.koha-community.org/show_bug.cgi?id=2060
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
2012-09-19 17:15:56 +02:00
Paul Poulain
2f8308cd49 A follow-up will be added though, because we understood why I had some javascript error and jonathan didn't. It's because I've plack + debug
Bug 8117 follow-up: explicitely list tables to dataTable


debug panel in plack adds a lot of <table> (without any id)
thus, when you call
$("table").dataTable(...)
there's a javacscript error because datatable can't handle the plack <table> !

The solution has been to explicitely name the tables to dataTable (which is a good thing anyway)
        $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, {
2012-09-19 17:02:14 +02:00
Jonathan Druart
f4dadc955c Bug 8117: Followup: remove h3 title (duplicate infos)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 16:17:22 +02:00