Commit graph

3471 commits

Author SHA1 Message Date
Joshua Ferraro
9e97a44417 Changing label from Overlay? to Match? since overlay is no longer
the only operation
2008-04-30 22:04:27 -05:00
Galen Charlton
60983cfeee kohabug 2026 - HTML-escape comments
This is a partial, perhaps temporary fix.  "<", ">",
and "&" characters in patron comments (AKA reviews)
are converted to "&lt;", "&gt;", and "&amp;" to avoid
certain attacks, e.g., a user entering a <script> tag
in a comment.

A more permanent fix should scrub all (or perhaps just
unsafe) tags from submitted comments entirely.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 21:59:01 -05:00
Galen Charlton
438ed23337 staging import - enhance record overlay behavior
Enhanced the ability of catalogers to specify how
bib and item records should be added, replaced, or
ignored during a staging import.

When an import batch of bib records is staged and commit,
the user can now explicitly specify what should occur
when an incoming bib record has, or does not have, a match
with a record already in the database.  The options are:

if match found (overlay_action):
  create_new (just add the incoming record)
  replace (replace the matched record with the incoming one)
  use_template (option not implemented)
  ignore (do nothing with the incoming bib; however, the
          items attached to it may still be processed
           based on the item action)

if no match is found (nomatch_action):
  create_new (just add the incoming record)
  ignore (do nothing with the incoming bib; in this
          case, any items attached to it will be
          ignored since there will be nothing to
          attach them to)

The following options for handling items embedded in the
bib record are now available:

  always_add (add the items to the new or replaced bib)
  add_only_if_match (add the items only if the incoming bib
                     matches an existing bib)
  add_only_if_add (add the items only if the incoming bib
                   does *not* match an existing bib)
  ignore (ignore the items entirely)

With these changes, it is now possible to support the following use cases:

[1] A library joining an existing Koha database wishes to add their
    items to existing bib records if they match, but does not want
    to overlay the bib records themselves.
[2] A library wants to load a file of records, but only handle
    the new ones, not ones that are already in the database.
[3] A library wants to load a file of records, but only
    handle the ones that match existing records (e.g., if
    the records are coming back from an authority control vendor).

Documentation changes:

* See description above; also, screenshots of the 'stage MARC records
for import' and 'manage staged MARC records' should be updated.

Test cases:

* Added test cases to exercise staging and committing import batches.

UI changes:

* The pages for staging and managing import batches now have
  controls for setting the overlay action, action if no match,
  and item action separately.
* in the manage import batch tool, user is notified when they
  change overlay action, no-match action, and item action
* HTML for manage import batch tool now uses fieldsets

Database changes (DB rev 076):

* added import_batches.item_action
* added import_batches.nomatch_action
* added 'ignore' as a valid value for import_batches.overlay_action
* added 'ignored' as a valid value for import_records.status
* added 'status' as a valid value for import_items.status

API changes:

* new accessor routines for C4::ImportBatch

    GetImportBatchNoMatchAction
    SetImportBatchNoMatchAction
    GetImportBatchItemAction
    SetImportBatchItemAction

* new internal functions for C4::ImportBatch to
  determine how a given bib and item are to be
  processed, based on overlay_action, nomatch_action,
  and item_action:

    _get_commit_action
    _get_revert_action

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 21:58:46 -05:00
Joshua Ferraro
d83a055504 Adding authorised value icons display in the search results
pages.
2008-04-30 21:07:29 -05:00
Andrew Moore
57b3b951c1 Bug 2047: adding images to arbitrary authorized values
I've refactored the subs I added in the previous commit so that they make a little
more sense and are in better places in the code base. I was really hoping to make use
of existing subs, but they all seemed so specific to particular uses.

The icons now show up on the OPAC item details page.

TODO: The icons still don't show up in the OPAC search results page.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 20:10:43 -05:00
Andrew Moore
5b5596a69d bug 2047: adding icons to authorized values
This patch adds the ability to associate icon images with authorized values.
They're not displayed anywhere yet, though. There's also a database update
in here. I took version "3.00.00.075", but I can change that later if it gets
taken before I commit these patches.

DOCUMENTATION CHANGES: When you add or edit authorized values, you can now
associate image icons with them. These icons come from the same icon sets
that you can have with your itemtypes, such as media type. They don't show
up anywhere yet, but that's coming. Keep an eye on
http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=2047
for more updates.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 20:10:31 -05:00
Andrew Moore
aef807a937 bug 2047: refactoring icon manipulation logic
I'm extracting some of the icon manipulation logic so that I can get to it from the authorized values pages.

There should be no functionality or documentation changes with this commit.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 20:10:09 -05:00
ecd05d3da1 Re-structuring shelf browser markup for improved robustness; Including GoogleJackets js only if pref is turned on.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 06:10:06 -05:00
0b399239e2 Fixes for Bug 2067 (terminology consistency)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 06:09:26 -05:00
5e8671477f Making label toolbars more consistent
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 06:09:24 -05:00
Joe Atzberger
e5cd4004b5 BUGFIX labels - Adding labels was failing because of faulty "type" selection.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 06:09:05 -05:00
a7b8359a45 Fixes for interface bugs 2064, 2065, 2066
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 06:09:03 -05:00
e1e50db557 Add a new Debian package and GoogleJacket on OPAC detail page
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 06:08:46 -05:00
Marc Chantreux
ca7dec79f5 fixed langauge typo
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 06:08:39 -05:00
Marc Chantreux
9daa5ffe84 fixed langauge typo
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 06:06:40 -05:00
a126170a27 Minor change to improve compatibility with IE7
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-28 05:56:02 -05:00
346d8d3679 Some fixes for bug Bug 2056, No Claim Letter Note Should Stand Out, and other markup corrections.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-28 05:56:00 -05:00
05600380fd Changes to improve compatibility with Internet Explorer 6 and 7
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-28 05:56:00 -05:00
c0a0e885b9 Removing duplicate NPL itemtype image icons from the staff client
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-28 05:55:59 -05:00
2d921804f1 Another OPAC popup page requiring ID
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-28 05:55:58 -05:00
cfc2b0e184 Adding a couple missing variables for opac login screen (opacheader,OpacUserCSS); Minor tweak to OPAC tags on opac-detail
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-28 05:55:57 -05:00
Joshua Ferraro
affaae1247 Normalizing s/On loan/Checked out/ 2008-04-25 15:28:14 -05:00
Polytechnic University Koha Installation
e62a74f305 Split Location and Call Number on OPAC detail page
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 14:59:23 -05:00
Frère Sébastien Marie
b9dee40fdd name error "opac-bottom.inc" in template
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:11:39 -05:00
230f813064 Removing duplicate itemtype icons.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:09:30 -05:00
894645336b Adding show/hide function to add tag form; fixing bug in series search link (Thanks Tim!)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:09:28 -05:00
cd2d9a82ca Tweaking returns interface and jquery-ing inline javascript.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:09:26 -05:00
a108f50a93 Enabling OPACURLOpenInNewWindow preference for "Search for this title in..." links
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:09:25 -05:00
f30e95e18a Fix for bug 2043 (Language Issues - OPAC)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:09:22 -05:00
22fb78faa5 Fix for Bug 2042 (Language Issues - Administration (pt 2)). Also adding tablesorter.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:09:21 -05:00
93132713c3 Minor markup changes, validation corrections.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:09:19 -05:00
235f9865a1 Adding IDs to popups to add flexibility to customization.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-25 07:09:16 -05:00
Andrew Moore
c41da00b4a Bug 2044: allowing multiuple icon sets
I've rearranged the two directories where media type icons live.
I've also added two more collections of icons, one from
http://apps.carleton.edu/campus/library/bridge_icons/
and one from liblime (Tina). The first has a license restriction that I added
to the "Licenses" tab on the "About" page.

Then, I've adjusted the Item Types Administration page so that it can deal
with multiple collections of icons.

I also added a test script to verify that the two identical icon directories
are actually identical.

DOCUMENTATION CHANGE: It's possible that we need to add something to the administration
documentation to indicate how you can add more sets of icons if you want. You simply add
directory to koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/ and to
koha-tmpl/opac-tmpl/prog/itemtypeimg. The icons should start showing up.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-24 11:54:18 -05:00
9cc74e265b Revised suggestions management interface, allows setting of one reason for all suggestions in a particular category (pending/accepted/rejected).
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-24 10:31:03 -05:00
d481a03fdf Some style changes following up on recent fix for Bug 2019. Hopefully improves readability. Converted up.png from 24-bit to 8-bit for IE6-friendliness (doesn't require alpha transparency).
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-24 10:31:01 -05:00
Joshua Ferraro
5bc996ff4b Validation of opac results and detail pages, normalization
of XSL stylesheets and display
2008-04-23 22:44:32 -05:00
Joshua Ferraro
ad0d08ef33 Improvements to the results display in the OPAC, merging style
between the XSL and non-XSL stuff. Refining style of tags display,
adding back links to place hold, add to list, and add to cart on
results page
2008-04-23 16:00:46 -05:00
Joshua Ferraro
dfe310868f Adding TagsEnabled to list of known sysprefs, adding 'my tabs'
to the OPAC user portal
2008-04-22 21:00:56 -05:00
Joshua Ferraro
d3675da9de Nomenclature cleanup for supplemental issues in serials 2008-04-22 20:06:37 -05:00
Joshua Ferraro
70c5aed218 Improving dialog for linking to a vendor, allow choice between
OK and Cancel for whether to link to a vendor rather than requiring
a vendor be added.
2008-04-22 19:53:14 -05:00
Joshua Ferraro
340dcb421e Nomenclature cleanup for subscription adding page 2008-04-22 19:43:34 -05:00
Joshua Ferraro
b46f98abcc Moving Tags tab into Enhanced Content to reduce the number
of tabs in sysprefs
2008-04-22 18:20:52 -05:00
Joshua Ferraro
3c6599a342 NOTE TO DOC TEAM: Moved FRBR, Amazon.com and Baker and Taylor
tabs in system preferences over to a new tab in sysprefs called
Enhanced Content
2008-04-22 18:17:14 -05:00
Joe Atzberger
c0cfbef28b Hack RSS to work. Just a temporary fix before XSL takes over.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 18:06:57 -05:00
Joe Atzberger
b4b06efa66 Copy skin.css from intranet-tmpl, resolve 404 in OPAC.
We should consider using a single yui directory w/ apache redirects to it.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 18:06:46 -05:00
Joe Atzberger
5a68c16194 Bugfix #1624 - remove problem w/ EXPR in template, minor cleanup of module.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 18:06:38 -05:00
Joe Atzberger
fa8005ccbc Remove redundant zip file.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 18:06:29 -05:00
Joe Atzberger
728b677c62 Cleanup code formatting for readability. No functional change.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 18:06:26 -05:00
Joe Atzberger
8e35c01d2d smart-rules.tmpl - cleanup display, remove units for zero/empty values
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 18:02:48 -05:00
Joe Atzberger
83b7624e13 DB and syspref update for Tags and BakerTaylor
Feel free to apply this before the other related Tags/B&T patches.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 18:02:46 -05:00