Commit graph

1107 commits

Author SHA1 Message Date
597240e878 Fix for Bug 6458 - incorrect parsing result in translation processing
Correction in opac holds template. Corrections made are logically
consistent, but I couldn't reproduce the combination of factors
to trigger the "disabled" attribute on the branch selector. In
that respect this hasn't been tested 100%.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-14 10:08:03 +12:00
Katrin Fischer
4530159ce1 Bug 6458: Incorrect translation processing / sco-main.tt
Patch removes templates directives from HTML tags in sco-main.tt

Problems were related to buttons for renewing items.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222

After, no errors

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:33:06 +12:00
Katrin Fischer
6d6c962627 Bug 6458: Incorrect translation processing / opac-detail.tt
Patch removes template directives from within HTML tags from OPAC detail view.

Problems were related to the items tabs for holdings, subscriptions, and serial collection.

Fixed the problem spotted by Frère Sébastien Marie - thx!

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:31:57 +12:00
Katrin Fischer
637953df93 Bug 6458: Incorrect translation processing - masthead.inc
Patch removes templates directives from HTML tags in masthead.inc

Problem was related to library pull down shown when
OpacAddMastheadLibraryPulldown is activated.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Before
opac-tmpl/prog/en/includes/masthead.inc: 83

After no errors

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:28:44 +12:00
Katrin Fischer
75bfa2a56a Bug 6458: Incorrect translation processing - doc-head-close/open.inc
Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:24:23 +12:00
Nicole C. Engard
a9eb0c658a Follow up to Bug 6857: Change language from 'reserve' to 'hold'
Reserves are called holds all throughout the OPAC so this follow up
updates the language in this patch to match the standard.

Also adds an id tag to the message for altering with JQuery.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-11 21:36:15 +12:00
Robin Sheat
4c1d203980 Bug 6857: display a charge warning alert for reserves
If a user is placing a reserve on the OPAC, this'll let them know that
it's going to cost them.

Author: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-11 21:35:52 +12:00
Chris Cormack
bf2ba7a764 Merge remote-tracking branch 'kc/new/bug_6863' into kcmaster 2011-09-10 21:40:09 +12:00
Ian Walls
b49534ebdc Bug 6863: Shelf Browser images not showing up
Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-10 21:39:15 +12:00
Ian Walls
156a849aa3 Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.

This patch fixes not only search results and shelf browsers, but also rarely-used parts of
opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-10 21:37:47 +12:00
Ian Walls
ba2c61b1b6 Enh 6165: Add OPACResultsSidebar system preference
Adds a system preference for displaying content under the "Refine your Search" menu
on OPAC search results.  Arbitrary HTML can be added, like OpacNav, opacheader, opaccredits
and other such system preferences

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-10 21:32:47 +12:00
ca16532ea8 Fix for Bug 5028 - Remove references to catmaintain.pl
catmaintain.pl doesn't exist anymore. References to it in the
templates should be removed.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 20:46:25 +12:00
Chris Cormack
e8f654fcd2 Revert "Bug 5630 CAS improvements"
This reverts commit 9a3950f673.
2011-09-02 13:22:20 +12:00
Chris Cormack
e39de04020 Bug 5524 : Cant delete list from the second page of lists
Includes follow up fixing deleting lists in OPAC

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-01 20:55:16 +12:00
Nicole C. Engard
57a0fcb475 Bug 6662: Remove Dewey Specific References in Sort
The sort option used to include tooltips for call number
that were Dewey specific.   This patch removes references
to Fiction and Nonfiction so that it can apply to any
classification.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-27 07:50:43 +12:00
666a2316d8 Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
Corresponding fix for the OPAC

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-26 14:58:47 +12:00
714c8b924e Fix for Bug 6640, Locations not showing in circ reports
An invalid template syntax for defining a variable's default
value is found in the circ report template and several
others:

[% DEFAULT LibraryNameTitle="Koha Online" %]

Based on the T:T docs this appears to be the correct way of defining
a default value:

[% LibraryNameTitle or "Koha Online" %]

Reference:

http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 20:57:32 +12:00
preprod34
e0eacd664c Bug 6714 : Removed the "en" in some paths of opac.css
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 20:53:56 +12:00
db44c217b2 Fix for Bug 6743 - displayFacetCount not working
T:T variable scope error.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 20:51:47 +12:00
b7985fb04f Fix for Bug 6309, subscription table sorter in the opac
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-08-14 20:21:01 +12:00
Nicole C. Engard
0a71367dc2 Bug 5252 - Phone labels on patron creation
The labels for emails on the patron forms say 'primary' and
'secondary.' This patch does the same thing for the phones.
phone is now 'Primary phone', mobile is now 'Secondary phone',
and 'phonepro' is now 'Other phone'. This way the type of phone
does not matter and the phone that the patron wants to be called
at the most is the 'primary.'

This is just a step in the direction of fixing Bug 5252, not a
complete fix.

This patch also updated a stray reference to Home Email.  Both the
OPAC and staff client are updated with this patch.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-14 20:06:03 +12:00
Chris Cormack
8f21144fb1 Merge remote-tracking branch 'kc/new/bug_6476' into kcmaster 2011-08-14 19:55:46 +12:00
Ian Walls
16cf1ed60e Bug 6476: Baker & Taylor Content Cafe link not showing
Another T:T issue.  Patch replaces 'BakerTaylorContenturl' with 'BakerTaylorContentURL'
universally in all occurences in the templates (only opac-detail.tt)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-14 19:55:05 +12:00
Janusz Kaczmarek
da7bcbd4e6 Bug 6468 - Authorities browsing error in OPAC
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-12 13:51:59 +12:00
Janusz Kaczmarek
9dafa2aada Bug 6461 - BiblioDefaultView has no impact on how record are displayed when going from results list
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-12 13:50:34 +12:00
da0a5b2bd6 Fix for Bug 6291, Cart printing truncated in Firefox
Implementing 100% width and height on <table>,<td>, and <th>
as suggested by this post:

http://www.piglets.org/serendipity/archives/45-Fixing-truncated-printing-with-Firefox.html

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-11 13:27:59 +12:00
6a1b7a3321 Fix for Bug 6260 - Missing space in availability information of OPAC XSLT results
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-11 12:32:06 +12:00
Chris Cormack
9a3950f673 Bug 5630 CAS improvements
Squashed commit of the following:

commit 0e13a5278e11b288e48190dc26f31e96d06598dd
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Wed Jan 19 21:24:39 2011 +0100

    Bug 5630 : fixing C4/Auth.pm

commit b55abc7a0dc1ca43b2610a27246293e9a9346e18
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Wed Jan 19 21:24:38 2011 +0100

    Bug 5630 : Adds CAS documentation

commit df0098a6a65465e6e734f99f65fb453dd3fa11d1
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Wed Jan 19 21:24:37 2011 +0100

    Bug 5630 : ilsdi service AuthenticatePatron doesn't with CAS syspref on

    Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

commit 31c8f0c0facfafae011ad24c9d458c50f2fad296
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Wed Jan 19 21:24:36 2011 +0100

    Bug 5630 : Adds the ability to authenticate against multiple CAS servers

commit 9d0def826135d5756533dc0dcf8e0a107d1ac8fc
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Wed Jan 19 21:24:34 2011 +0100

    Auth_with_cas : removing a warning

    $sth was defined twice in a function
    Removing the second definition

commit 5ee550e9a2bb7ab6bc09f14fced6ce0df8011eb0
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Wed Jan 19 21:24:33 2011 +0100

    Bug 6012 : MT 2270: CAS proxy

    CAS Proxy
    Examples included are now really usable

    Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-10 13:16:35 +12:00
7093f075a7 Fix for Bug 6534 - Duplicate opac renew buttons at the top of the checkouts list
This patch uses JS to add two links to the top of the checkouts
table: renew selected and renew all. Clicking each one submits
the respective form.

Also added is a small validation routine to warn the user if
they try to "renew selected" without having checked any boxes.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-07 22:55:12 +12:00
Jean-André Santoni
2c88e1e0f8 Bug 5639 (MT #3605) Fix escaping in ILSDI
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-08-05 09:07:15 +12:00
c04c4265ad Bug 5429 : Covers for detail page and database update
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-04 13:31:33 +12:00
cbf473d592 Bug 5429 : Open Library book covers
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-04 13:30:23 +12:00
4710fae55b 5662: Show control number without organization code in OPAC URLs
OPAC detail xsl adjusted at four places: 773 when leader19=c, 775, 780, 785.

Enable the pref UseControlNumber when testing this patch. And set pref OPACXSLTDetailsDisplay to using XSLT stylesheets.
Test by adding a control number ($w) in abovementioned fields.
Go to opac detail and check if the links work.
Add some orgcode between parentheses or brackets in front of the control number.
Test again in opac detail if the links still work.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works with and without orgCode in front of $w now.
No change to current behaviour, but closer to MARC21 standard.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:35:10 +12:00
Colin Campbell
b84276a3b1 Bug 6598 : ensure OPACFineRenewals can prevent opac renewals
patron_flagged was being passed at global scope to the template
but being checked as an element in other structures
Also although items could not be selected the Renew Selected
button was displayed, it too should check the flag
Amended the preference text which incorrectly suggested the
option could be turned off. (leading to the opposite to what
the user might expect)
In the script have explicitly assigned the value to a inumeric
variable rather than making an implicit conversion as it may be
that readers were missing that sleight of hand

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-01 13:21:13 +12:00
Ian Walls
238a050b31 Bug 6547: Add id attributes to messages in opac-reserve.tt
In order to allow easier styling with JQuery, including text substitution,
this patch adds id attributes to each div tag containing a holds message.
The following ids are added, corresponding to the template variables of the
same names:

too_much_oweing
too_many_reserves
bad_biblionumber
no_items_selected
no_branch_selected
no_biblionumber
bad_data
none_available

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 10:57:17 +12:00
203de2452e Fix for Bug 6484 - due date sorter on 'my summary' missing
Columns on the summary table are shown or hidden based on a
variety of different settings, leading to convoluted if/else
template constructions if we want to define header sorting
in the <script> block. Using the jQuery Metadata plugin
allows us to specify sorting options as classes on the
table header. This adds a dependency but simplifies the
template markup significantly.

I recommend continuing to specify header sort options in the
<script> block in cases where it is relatively simple to do
so and saving inclusion of the additional jQuery plugin for
pages which really need it.

Other changes: Moved common sorter configuration detalis to
default declaration; Moved the date due column so that it
could be set as the default sort without taking into account
multiple disappearing columns (default sort cannot be set
in the markup for a <th>).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-21 08:20:12 +12:00
Chris Cormack
408543294e Merge remote-tracking branch 'kc/new/bug_6476' into kcmaster 2011-07-16 20:21:47 +12:00
Ian Walls
94e3177983 Bug 6476 Followup: more Baker and Taylor bookcover fixes
The T:T variable was also wrong in 6 other instances, and needed to be updated from
'BakerTaylorBookstoreurl' to 'BakerTaylorBookstoreURL'.

Scoping issues also present on most all instances
2011-07-16 20:20:54 +12:00
f789331148 Fix for Bug 6531 - clicking print button in opac causes 404 error
opac-detail and opac-ISBDdetail both use window.print(), so I've
added that to opac-MARCdetail as well. I've also eliminated the
"javascript:" pseudo-protocol because it's pointless. I'd
prefer to have a real link for non-js users but that will have
to wait for another bug.

After applying this patch users with JS enabled should get a
print prompt after clicking the "Print" link on opac-MARCdetail.pl

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-10 21:18:29 +12:00
Ian Walls
90dc391e1a Bug 6476: Baker & Taylor content not working
Template Toolkit scope issue.

To Test:
1.  Disable Amazon and Google bookcovers
2.  Enable Baker and Taylor images
3.  put SOMETHING in the BakerTaylorBookstoreURL system preference
4.  check the source of opac-results.pl and opac-detail.pl, and see that SOMETHING in place between "https://" and the normalized ISBN

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-10 21:15:01 +12:00
Francois Marier
f44b674ed5 Bug 6298 : Show avatars on the recent comments page
Add smaller Libravatar-based images to the recent comments page.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 15:01:10 +12:00
Francois Marier
d3990031ed Bug 6298 : Add avatar picture of comment author in OPAC
Use Libravatar::URL to pull the avatar picture for comment authors
if we have an email address for them.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 15:01:09 +12:00
Chris Cormack
c78608483e Merge remote-tracking branch 'kc/new/bug_6497' into kcmaster 2011-06-19 22:14:15 +12:00
Ian Walls
59ac64db97 Bug 6497: MARC URLs not showing up in details pages under normal view
Part one:  followup to the original patch.  The variable name for the URL itself was wrong, so despite
getting the link to show up, the href was the catalog page itself, NOT the 856$u.  Updating "MARCurl.MARCurl"
to "MARCurl.MARCURL" fixes this issue.

To test:  go to the OPAC, and see that the URL in the link is the same as the URL in the MARC

Part two:  this problem is present on the staff side, as well.  This patch implements both parts of the fix
(renaming "MARCurlS" to "MARCURLS" and "MARCurl.MARCurl" to "MARCurl.MARCURL")

To test:  go to the staff client, and check that a)URLs show up and b)they link to the URL in the MARC record

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-19 22:13:40 +12:00
Chris Cormack
126d6247b2 Bug 6518 : Fixing XSS issues on opac
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-19 22:07:30 +12:00
Chris Cormack
abdd5e8ced Bug 5714 follow up removing the debugging message 2011-06-15 12:10:20 +12:00
Ian Walls
b5dcd096bf Bug 6497: MARC URLs not showing up in OPAC detail page with XSLT off
Renames T:T variable to match what's exported from opac-detail.pl.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-14 09:36:12 +12:00
Janusz Kaczmarek
3cf27546c9 Bug 6353: Erroneous prefixes before the singleBranchMode preference removed
Patch resent due to errors in formating in previous e-mail

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked:
- library facet
- library limit on advanced search
- library shown in item level hold table

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 15:45:18 +12:00
Janusz Kaczmarek
ead90e1179 Bug 6357 : Displaying the unavailability of items corrected
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 15:37:13 +12:00
Janusz Kaczmarek
1b5805e336 Bug 6462 - Authority type is not displayed in OPAC
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 11:08:42 +12:00