Commit graph

5221 commits

Author SHA1 Message Date
5f7946e4d8 Further fixes for Bug 4208, Many submit buttons are not translatable in 3.2
Again, not a fix for a submit button problem, but for a problem with
TMPL_IFs nested inside tags, a practice which will break the
translation script.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 11:50:52 -04:00
37e9cbc042 Fix for Bug 4416, renew all and return all buttons too close together
This patch removes the "return all" button altogether. Returning all items
is a step which one wouldn't take lightly or even regularly. Since the
interface has a means of selecting all checkboxes in the "Check in" column,
removing the "Return all" button wouldn't eliminate the means of doing so, it
would just require more deliberation.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:17:21 -04:00
7b11d2a281 Fix for Bug 4453, Improve formatting of batch item operations
- includes fix for Bug 4443
- includes some string changes, could resubmit without if these
  changes block inclusion in 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:14:07 -04:00
5d921cf51d Fix for Bug 2375, Serials holdings data does not display in opac-detail
- Removing markup to display serial data in the holdings table
  This functionality (if it worked) would seem to duplicate
  the data displayed under the 'Subscriptions' tab
- Revised again to merge item status display changes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:14:03 -04:00
Ian Walls
74afd1ca8e Fixes bug 4452: CircControl syspref listed as ItemHomeBranch rather than ItemHomeLibrayr
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 10:14:48 -04:00
9329c40b6b fix template translation issues
Alternative to Henri-Damien's patch that does not
require putting CSS style information in the Perl code.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 09:28:08 -04:00
6969fefe4c Use CSS3 box-shadow property for Cart tooltip
The OPAC Cart tooltip ("Your cart is empty," "1 item(s) added to your
Cart") currently uses a jQuery plugin to generate a drop shadow.
This works cross-browser, but has a high failure rate with regard
to hiding the shadow consistently, resulting in an orphan shadow
after the tooltip has been hidden. I propose to instead use the
new CSS3 property "box-shadow" (-moz-box-shadow and -webkit-box-
shadow for FireFox and Safari/Chrome). Currently Internet Explorer
does not support this property. I think this is an
acceptable tradeoff for more stable functionality.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 11:19:03 -04:00
38b16e34fd fix various errors reported by xt/author/translatable-templates.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 08:36:21 -04:00
9cb86aec3b copy new NPL icons from OPAC to staff
Fixes problem found by xt/author/icondirectories.t

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 07:57:51 -04:00
717223a236 fix template structure error found by xt/author/valid-templates.t
Also fixed XHTML validity error

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 07:50:34 -04:00
Nicole Engard
bf380b8964 bug 4442 rename batch edit tools
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 14:00:17 -04:00
4bfeac67ed Fix for Bug 4436, reserve should say 'hold'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 10:09:29 -04:00
Garry Collum
84dada43d3 Bug 2889: Added zebra striping to the table in dictionary.tmpl.
Also fixed a couple of minor XHTML errors.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:24:03 -04:00
Colin Campbell
cb031bace9 Bug 2889 Remove toggle in boraccount display
Also remove the reverse column if no contents to be displayed
( otherwise looks like a markup error )
Rationalize the main loop now toggle not required

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:20:50 -04:00
49eb7b7a68 followup - update SCO to recognize ITEMNOTSAMEBRANCH
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:18:58 -04:00
Michael Hafen
ea0c76af7f on checkout ask for confirmation if borrower from different branch
With IndependantBranches on check that the borrower is from the same branch as
the librarian.  If not then ask for confirmation.  This check is skipped for
SuperLibrarians.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:17:19 -04:00
d08cd6bfc0 Merge branch 'bug4036' of git://git.librarypolice.com/git/koha-galen into to-push 2010-05-03 07:46:33 -04:00
d575278cba bug 4036, 4405: overdue and fine day block improvements
* Adopted wording suggested by Kyle Hall for the
  USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE circulation blocks
* Updated IsMemberBlocked so that if a patron has accrued
  fine days, that will be tested for first before testing
  to see if the patron has current overdue items; this solves
  a problem introduced in the patch series for bug 4505 where
  accrued fine days would be ignored if (a) the patron has
  current overdue items but (b) the library has chosen to
  set the OverduesBlockCirc syspref to noblock.
* Now correctly assigns the USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE
  blocks; prior to this patch, they had been swapped.

FIXME: IsMemberBlock ought to be split into two functions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:46:26 -04:00
7bfd0461d4 bug 4396: remove reerences to bi_notforloan
These were causing the OPAC details place hold button to disappear
in circumstances where a bib-level item type was set to a non-loanable
item type even when item-level_itypes was on.

This change does mean that if item-level_itypes is not turned on,
the hold button will now appear for bibs whose bib-level item type
has its not-for-loan flag set; however, if this is a problem, a
better long-term fix would be to use CanBookBeReserved() instead.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:45:19 -04:00
0c39f1ac9b simplify logic for displaying item status
Flatten the tmpl_if tree for determining the item status
to display and tweaked the order in which statuses are checked to

1. (circ reality) item on loan
2. (circ reality) item in transit
3. (circ reality) item wating at hold shelf
4. (item status that makes circ impossible) item withdrawn
5. (item status that makes circ impossible) item lost
6. (policy that implies no circ but in-house use possible) item not-for-loan per item
7. (policy that implies no circ but in-house use possible) item not-for-loan per item type
8  (item status that *might* affect circ) damaged
8. (fallback) item available

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:45:19 -04:00
96a70655aa bug 4396: clarify return of itemtype-level notforloan flag
* GetItemsInfo now includes a notforloan_per_itemtype key
  with the value of the item type's notforloan setting, correctly
  set based on the value of the item-level_itypes syspref
* Adjusted OPAC details item status display to use that
  notforloan_per_itemtype key

NOTE: one of the assumptions of item-level_itypes is that
      you can have either bib-level item types or item-level
      item types, but not both in the same database.  In particular,
      it does not establish a hierarchy where Koha checks the
      item-level itemtype first, then the bib-level.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:45:19 -04:00
eb0196cda3 bug 4396: create new OPAC template include for item status
As part of preparing to work on bug 4396 (item level item types not
working correctly when biblioitem-level item type is not for loan),
moving the item status template logic to a separate include to make
it easier to work with.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:45:19 -04:00
Garry Collum
caec9fae40 Bug 4432: Fixes XHTML in serials-edit.tmpl.
Replaces a reference to an undefined variable, num, with a defined variable to create unique ids.

Also adds zebra striping to the table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:41 -04:00
Garry Collum
d2d2acd4a6 Bug 4200: Fixes adding a member to a routing list after filtering results.
Adds a hidden field for subscriptionid to the filter form.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:40 -04:00
b7a5bbefe8 bug 4505 followup - template changes
* fix syntax error
* adjust wording - "patron" instead of "borrower"
* handle case where overdue items should require
  confirmation of loan by operator
* fix typo in system preference template

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:59:05 -04:00
Chris Cormack
86fbe2ec21 Bug 4405 - Overdues block check out
[Documentation note by RM:

This patch adds a new system preference, OverduesBlockCirc,
that can take one of three values:

  - noblock:      checkouts permitted even if patrons
                  have overdue items (default)
  - confirmation: circ operator asked to confirm checkout
  - block:        checkouts to patrons who have overdue
                  items are forbidden

]

Squashed commit of the following:

commit 6a1f66e0686a14d8a89abfc3fe5978dabd0b7af7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:27:39 2010 +1200

    Tidy up ready to send patch

commit 4d1398df18dcce4fd888cf17a0e2955fdf6ee1e4
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:26:15 2010 +1200

    Bug 4405 - tidy up

commit 3daeb71bc6b690e18dda96aa3c767c2bb0521038
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:02:04 2010 +1200

    Bug 4405 - Overdues block checkout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:39:11 -04:00
Henri-Damien LAURENT
208b835310 MT3499 : cataloguing authid not reported
authid would not be correctly updated in bibliorecord.
Biblio record would not receive the correct authid in subfield 9
but some erroneous data

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:11:47 -04:00
Garry Collum
d85f607a6a Bug 4428: fixes minor XHTML errors in shelves.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:06:46 -04:00
3691a134e6 Fix for Bug 4409, I18N/L10N tab not highlighted
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 17:05:43 -04:00
23b52df1d7 Markup corrections to fix for Bug 4248
- Missing "=" in attribute
- TMPL_IF nested in HTML tag, which breaks translation script

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 17:05:41 -04:00
Matthias Meusburger
b0cd6429b0 Adds missing hint for upload-type syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 06:50:26 -04:00
Sébastien Hinderer
343cc42eea Fix typo admin/in brnaches template.
The branch notes were not displayed because the variable was called
branchnotesl rather than branchnotes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 06:47:46 -04:00
Mason James
79ce374fa4 Enhancment [3.4] Bug 4288: Hide circular 'Log in to Your Account' link in opac-auth.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 06:05:17 -04:00
Nahuel ANGELINETTI
ad01b57bcc (bug #3798) fix changing request branch
a variable was wrong in template.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 05:54:04 -04:00
Nicole Engard
50375be1f2 BUG 3715 added state to label
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 00:15:31 -04:00
Nicole Engard
f316cdc28f bug 3981 follow up change GST to 'Tax Rate' in EN-US
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:53:19 -04:00
Nicole Engard
8172699831 bug 4170 updated overdue rules
I added a note that this tool should not be used for
advanced notices. The fact that the Delay is required
is actually true based on the tests we did - which
is another bug.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:51:46 -04:00
Jean-André Santoni
a5273d7ebb Added "ordered" column in acqui-home budget display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:47:31 -04:00
668581b720 Improve detail page MARC21 XSL file for 505 and 520 tags
Some tags weren't displayed propertly:

505  If there is no indicator 1, content label is not displayed and
     then repeated 505 tags are also incorrecly displayed. This patch
     add a default label.
502  Wasn't displayed at all. Added in this patch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:36:24 -04:00
Paul Poulain
4ebf32b970 MT2588: minor changes in column order & display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:32:40 -04:00
Matthias Meusburger
1da207acf6 MT2345 : Changes on contracts
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:26:55 -04:00
Jean-André Santoni
06bd4fcae5 Hide basket actions if no basket
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:26:52 -04:00
Jean-André Santoni
5546383f70 New contract button
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:25:25 -04:00
04cafc1427 Improve OAI Server MARC21 and UNIMARC XSL
Dublin Core schema name space was repeated for each field
as attribute rather than at <oai_dc:dc> level. This reduces
significantly the size of OAI server responses.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:09:04 -04:00
Henri-Damien LAURENT
47805da9ac Fixing members order when string searched
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:59:02 -04:00
Garry Collum
8fd9eed2fc Bug 4285: Intranet bib display links to opac-search.pl, instead of catalogue/search.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:46:34 -04:00
Kyle M Hall
9a989c9e58 Circulation - Disable Barcode Field If Item Needs Confirmation
When issuing items, if a confirmation screen comes up,
another item can still be scanned into the barcode field.

If a librarian does not notice the confirmation dialog,
he or she may continue scanning items without confirming
the issue and thus give a patron an item without it actually
being issued to the patron.

This patch disables the barcode field until the confirmation
question is answered.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:44:49 -04:00
Matthias Meusburger
6532f712b7 MT2621 : Fix simple barcodes display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:42:10 -04:00
4d50b4f4f0 Fix for Bug 4271, Offer choice of destination for save biblio operation
A follow-up to the fix for Bug 4121, the user should be able to control whether
the action of saving a bibliographic record takes them to the add item screen
or the detail screen, independently of whether they are adding or modifying the
record.

The addition of a "split button" would leave the default action in place if the
user clicked the "main" part of the button. Clicking on the menu would give the
user specific choices.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:39:10 -04:00
Jared CAMINS-ESAKOV
a326217179 Bug 4371: Display MARC21 field 773 w/XSLT
Display MARC21 field 773 in the OPAC detail view when XSLT is enabled.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:32:24 -04:00