Owen Leonard [Mon, 20 Dec 2010 19:11:26 +0000 (20:11 +0100)]
Proposed fix for Bug 5106 - Simplify MARC view choices in the OPAC (Conflict marker fix 2nd try)
- Eliminates the "Extended MARC View" tab
- Points the "MARC View" tab to opac-MARCDetail.pl as it is when XSLT is off
- Offers a "view plain" link on opac-MARCDetail.pl. Clicking this link
replaces the standard labeled MARC view with an unformatted view similar to the
one displayed in the pop-up modal MARC view.
- When viewing the "plain view," clicking the "view labeled" link will return
you to the standard labeled MARC view.
- Adds a new XSL file for displaying MARC data in a slightly-more-formatted
manner (compared to one big <pre></pre> block).
Removed a conflict marker line from Owen's patch (Marcel).
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole Engard [Mon, 20 Dec 2010 13:22:42 +0000 (13:22 +0000)]
bug 5035 remove default opaccolorstylesheet value for new installs
Per the bug, the color.css file is blank and so this preference
should have no value by default. This patch only fixes this for
new installs. There is no way to know if people have added values
to the color.css file in existing installs, so removing that value
in those cases might break things.
This patch does not remove the blank color.css file, it only
edits the default system preference.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jesse Weaver [Sun, 19 Dec 2010 02:12:04 +0000 (19:12 -0700)]
Add .packages file for Ubuntu 10.10
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>
Colin Campbell [Thu, 16 Dec 2010 09:59:34 +0000 (04:59 -0500)]
Bug 4286 Allow receiving if subscription enddate not set
HasSubscriptionExpired is not a boolean return it may also
return that a valid subscription enddate is not set
This should not block receipting of issues
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 16 Dec 2010 02:30:38 +0000 (21:30 -0500)]
Fix for Bug 4946 - hold warning needs rewording
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:
- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out
I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
koha [Thu, 16 Dec 2010 01:41:52 +0000 (20:41 -0500)]
Bug 5283 NEWS ITEM FOR RECEIPT SLIP
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.
We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.
The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl
Darrell Ulm
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Wed, 15 Dec 2010 16:39:31 +0000 (16:39 +0000)]
Fix supplier loop in serials claims
Wrong parameter was being passed to GetLateOrMissingIssues
causing incorrect display of count
Remove superfluous loop creating array we dont use
No need to sort a sorted array
Paul POULAIN [Thu, 9 Sep 2010 18:37:29 +0000 (20:37 +0200)]
some display changes in subscription add
- removing librarian line
- displaying subscription number only if it's a modif
- some minor html tag changes
- putting month length on top, as default for subscription duration (it's from far the most usual case)
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
The public and nonpublic notes was redundant with two areas in the page, one was inactive, and in edit subscription page, the subscription history area had two redundant blocks for notes, this fix it.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
MT3667 followup MT3811 : unexpected issues not stored
As a consequence of previous MT3667 patch, the subscriptionid list was processed.
And unfortunately, since array order is the only relevant information from HTML processing,
it caused subscriptionid to be null for a double edition.
This patch only uses uniq for serials-collection and when passing information to serials-collection page.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Colin Campbell [Wed, 15 Dec 2010 11:01:00 +0000 (11:01 +0000)]
Add jquery.uitablefilter.js
Add jquery plugin included in a number of templates modified by biblibre
Add as a separate commit rather than as part of a feature patch
as we may be merging out of sequence
Chris Cormack [Tue, 14 Dec 2010 19:20:42 +0000 (14:20 -0500)]
Fix for 5143, now with IE debug removed
Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work
adds:
- the subtitles into the title link (originally Chris Cormack)
- barcodes for every listed hold
- denoted which items were only item and which could be filled by any item on that bib.
- added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)
[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jane Wagner [Tue, 14 Dec 2010 16:39:12 +0000 (11:39 -0500)]
Bug 3789 Set off shelving location in staff and OPAC title display
Koha puts the shelving location immediately after the library name in the
"Location" column of the title display. If the library name and/or shelving
location is wordy, the two can run together and a user can overlook the
shelving location. I've added a new span class to the staff and OPAC .css
files and applied it to shelving location in both templates. This puts the
shelving location on a separate line and in italics, to make it stand out from
the library name.
[Edit] Re-implemented some changes which wouldn't merge after so long
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 14 Dec 2010 06:24:16 +0000 (07:24 +0100)]
Possible fix for Bug 2307, Calendar widget cannot be translated
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
projects / koha.git / log