Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd8f379d70)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
- 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>
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>
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>
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>
The scanned barcode stayed in the checkout field instead of being
deleted after checkout or confirmation.
This patch reverts the template change, so the barcode is deleted.
Please test!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cf4d851907)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ubuntu 10.10 has all of Koha's Perl dependencies packaged (aside from a
couple small version issues); add a dpkg --set-selections compatible
file to reflect that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 88d3d09897)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
[1] Update all .po files in once with this command:
translate update
[2] For sysprefs, quoted text wasn't properly retrieved from .po file and so
quoted strings wasn't translatable.
[3] The install process (translate -p install de-DE) was rewriting syspref
.po file which isn't required anymore.
MUST be applied to [3.2] to get all syspref proper translation.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 814795da60)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work
adds:
- the subtitles into the title link (originally Chris Cormack)
- barcodes for every listed hold
- denoted which items were only item and which could be filled by any item on that bib.
- added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)
[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit be8f1f3343)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Koha puts the shelving location immediately after the library name in the
"Location" column of the title display. If the library name and/or shelving
location is wordy, the two can run together and a user can overlook the
shelving location. I've added a new span class to the staff and OPAC .css
files and applied it to shelving location in both templates. This puts the
shelving location on a separate line and in italics, to make it stand out from
the library name.
[Edit] Re-implemented some changes which wouldn't merge after so long
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f05bd5984c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0fc7e5bfdc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5c8ca5129c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This reverts commit fefd158f42.
This was causing quite major errors, read the details at bug 5496
(cherry picked from commit 3705965cd7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9c8f934a2c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fix created by Owen Leonard, related over IRC chat (rather than a patch file).
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 34155975fc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21c516601c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 872529cb11)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Prevents inactive funds from showing in the aquisitions module, they
still show in the administration.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 00dd0ae627)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Raise warning rather than disallowing
Remove due date js validation when checking out
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4d1762f5ec)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- Adding missing footer include for language chooser
- Correcting markup and structure errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21cdd2feb4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
lexical variable declared twice causing run time warnings
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 51dc5b060b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 40e2b5421a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Added to more menu and to the main intranet page
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a6799f95fb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Found an edit item link not subject to edit_items permission check
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c53c96fa57)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.
The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.
Revised for current HEAD
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd7cca935b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 96330a7b07)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1b36fafe8c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2b53b14bac)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
If the zebra server directories don't exist, zebra will spit the dummy.
This makes rebuild_zebra.pl smart enough to create them if they're not
there. If that fails, it'll scream loudly so you know zebra isn't
reindexing.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8de1ef7e94)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4f4c4eceb3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Credit for finding this bug and patching it goes to Fridolyn Somers,
but the patch in Bugzilla didn't apply for me so I duplicated the
changes and reformatted.
--
Owen
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 554b6ad340)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Minus links wasn't displayed as it should in order to allow cataloger to
delete (empty all subfields) a non repeatable subfield.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 565b780bec)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Adds back missing <!-- /TMPL_IF -->.
Without navigation tabs and holdigns are not displayed in staff detail.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd26d05628)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This delete an useless "use C4::Serials"(there are 2).
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 38a1526a74)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Showing "on hold" in the holdings list (as we used to do) is misleading
if it is a bibilo-level hold. However seeing that a title has holds
is important information for this view. This patch adds a line to the
biblio-level information display with a count of the title's outstanding
holds.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6466ac847f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Serhij Dubyk {Сергій Дубик}
Owen Leonard
Srdjan Jankovic
Galen Charlton
Nicole Engard
Chris Nighswonger
Frédéric Demians
Chris Cormack
Katrin Fischer
Jesse Weaver
Jane Wagner
Garry Collum
Robin Sheat
Ian Walls
Colin Campbell
Katrin Fischer
Nahuel ANGELINETTI