Commit graph

7484 commits

Author SHA1 Message Date
Fridolyn SOMERS
b48615dda5 Bug 8791: OPAC UNIMARC XSLT details: subject with subfield 3
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I can reproduce the bug, and confirm that this patch fix it. The issue arises
when $9 come first, and then $3, which is not that usual.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 23:01:17 +02:00
Marc Veron
b83050efab Bug 8873 - JavaScript error in Opac displaying tag cloud
On master (3.09.00.060), I get a JavaScript error on line 126 in opac-tags.pl while displaying tags cloud.

Reason: There are two lines with closing });

Patch removes one line.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 22:47:35 +02:00
Magnus Enger
8ec52a8e23 Bug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT
This patch fixes some issues with icons related to materialtypes in NORMARC:

Remove references to opac-tmpl in the *intranet* NORMARC XSLT files.

Add two new icons to koha-tmpl/intranet-tmpl/prog/img/famfamfam/ and
koha-tmpl/opac-tmpl/lib/famfamfam/
GR.png - Graphical materials
TD.png - Three dimentional objects

Copy PR.png from koha-tmpl/intranet-tmpl/prog/img/famfamfam/ to
koha-tmpl/opac-tmpl/lib/famfamfam/

Rename the XSLT variable materialTypeCode to typeOf008 for increased consistency
between stylesheets.

Make sure the XSLT uses icons that are actually available.

To test:
- No use testing all the different permutations of leader pos. 06 and 019b, I think.
- Set marcflavour = NORMARC and turn on default XSLT for OPAC and Intranet, details
  and results.
- Make sure you have a record with something relevant in leader position 6, like
  g for movies or c for music
- Check that the icon turns up in results and details, in the OPAC and Intranet
- Toggle DisplayOPACiconsXSLT and check that the results in the OPAC are as expected

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 22:28:16 +02:00
80f8c46dc6 Bug 8862 - merge.pl contains untranslatable strings
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:52:25 +02:00
782e1845f3 Bug 8869 - Duplicate member check doesn't disable submit button on bottom.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I confirm that after applying this patch, the submit button is removed from
patron edit page, avoiding accidentaly clicking on it, without responding to
the question about possible duplicate patron?

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:43:23 +02:00
Fridolyn SOMERS
5a38631838 Bug 8863: When clearing a patron attribute, they are all cleared
Signed-off-by: Marc Veron <veron@veron.ch>

Tested with a set of 2 additional patron attributes. Cleard both before applying the patch.
Cleared as expected after applying the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:39:53 +02:00
8308e2055a Bug 8851 - strange blue bar above serials results
Bug 5357 (Subscription search and displays) added an advanced
search form which adds a new interface featured: a collapsible
fieldset with the search form inside. Bug 8851 was filed
because it is not immediately obvious that the search form
is hidden and can be shown by clicking the fieldset's legend.

I contend that this new behavior is unnecessary: In many other
places we put a similar search form in the left-hand sidebar.

This patch amends the template to show the search form in the
main body of the page if no search has been performed. After
searching the form is moved to the sidebar. This keeps the page
consistent with other interfaces and eliminates the confusion
about the collapsed form.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:34:12 +02:00
63145eb3d2 Bug 8718 - Normal catalogue detail view in staff client doesn't show missing serials or subscription history note
Adds librariannote (staff subscription history note) and missing list to the normal catalogue detail view in staff client.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 16:35:58 +02:00
2420c4d85c Bug 8766 - OPACBaseURL still called as OPACBaseurl in many files
This patch fixes incorrect capitalization of the OPACBaseURL
variable in three templates. The fix can be confirmed in
opac-results.tt by inspecting the link attached to the RSS
icon on the OPAC's search results screen. The same fix is included
in opac-opensearch.tt and search/results.tt but I'm not sure
how you confirm that this change fixes anything, if it does.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 16:33:07 +02:00
Paul Poulain
65be03846d Merge remote-tracking branch 'origin/new/bug_7412' 2012-10-12 12:28:54 +02:00
Nicole C. Engard
884005db08 Bug 7412: Follow up: Update preference to sentence
This patch updates the preference question to a sentence
to follow the standard set with previous preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:28:27 +02:00
Paul Poulain
7886297f05 Merge remote-tracking branch 'origin/new/bug_7751' 2012-10-12 12:23:08 +02:00
Nicole C. Engard
65accc367b Bug 7751: Decrease loan length with many holds
This patch merges the three preferences in to one sentence
to make it clear that they are all linked together and to
eliminate confusion that can come by having them as
individual preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-10-12 12:21:17 +02:00
Chris Cormack
a4bf495f3b Bug 3652 XSS vulnerability in facets
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug with test plan on the bug and checked that
problem is fixed after applying the patch and that facets
still work.
2012-10-12 12:17:51 +02:00
Chris Cormack
2e30600a58 Bug 3652: XSS vulnerability in page numbering
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed the problem with test plan on the bug and checked that
paging works correctly after the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:17:47 +02:00
Chris Cormack
53309fab4b Bug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. After applying the patch, <blink>fish</blink>
is displayed on the page, but no blinking occurs.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:17:41 +02:00
Marc Veron
802dd7baf5 Bug 8812 - Staff Client: Patron search should display branch name instead of branch code in results table
Patch to display branchname instead of branch code.

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-11 11:17:06 +02:00
Nicole C. Engard
0c75d667d5 Bug 8831: relabel gstrate with Tax rate
This patch changes gstrate to Tax rate to match the standard set
on all other acq pages.

Signed-off-by: Marc Veron <veron@veron.ch>

Small text change. Label displays as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 18:00:02 +02:00
d51f822a5b Bug 8820 - Don't show orders table if there are no orders
This page removes the "basket empty" message in favor of
hiding the orders table altogether when a basket has no
orders. This patch also moves the "Show all details"
checkbox under the "Orders" heading to associate it more
closely with the area it affects.

Other textual changes:

- Correcting capitalization according to coding guidelines
- Correcting terminology (basket group instead of basketgroup)
- Replacing the "Order Details" heading with the more
  succinct "Orders"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:51:06 +02:00
Julian Maurice
39ad9abb74 Bug 8801: Add menu entry to delete items in batch
In catalogue/detail.pl you can now select "Delete items in batch" in
"Edit" menu. You are redirected to batchMod.pl for chosing which items
have to be deleted.
You need to have 'tools.items_batchdel' permission to see this menu
entry.

Signed-off-by: Marc Veron <veron@veron.ch>

Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:07:44 +02:00
Paul Poulain
a7714ed6c5 Bug 7873 follow-up s/tab/4spaces/ 2012-10-09 18:03:05 +02:00
Adrien Saurat
98d8e1609a Bug 7873: fixes sort on Title in OPAC basket
Signed-off-by: Marc Veron <veron@veron.ch>

Reproduced wrong title sort without patch.
Sort works as expected with patch.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 17:56:07 +02:00
Frédérick
9d38ff1e5f Bug 8570 - Add pagination to the Z39.50 results page
Add paginations to the Z39.50 search results.

http://bugs.koha-community.org/show_bug.cgi?id=8570
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 16:23:23 +02:00
94eae1df00 Bug 2930 [REVISED] Put other name on checkout screen
This patch adds other name to the include which is used
to display patron names and adds this include in several
places where it can be used in place of direct output.

The patron-title include has been modified to handle the
two possible variable scopes throughout patron-related
templates. This is a hack similar to having both
circ-menu.tt and circ-menu.inc, but keeping both in the
same file.

Changes to some scripts were necessary to make the
othernames variable available to the include.

This patch also corrects some <title> tags and fixes
some incorrect capitalization (see Bug 2780).

To test, view each of the pages affected by these
template changes and confirm that the patron's name
displays correctly, including their "other name."

Signed-off-by: Marc Veron <veron@veron.ch>
Followed instructions above, works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 12:23:39 +02:00
Joseph Alway
b769a3cda0 Bug 8680 Z39.50 ISBN Search is problematic and there is a missing ISSN field.
The changes here are duplicate fixes.
The cataloguing directory had the same bugs as the acqui directory.
The bugs in the cataloguing files of the same name were fixed in Bug 8550.
The bugs in the acqui files had not been fixed.
This will fix Bug 8680 which is in the Acquisitions Module.

Changes to the z3950_search.pl file:
Rather than treating ISBN and ISSN as the same, this patch breaks
them out into separate parts of the query, as well as changing
the truncation attribute to enable right truncation (the correct
behavior for the ISBN field in MARC21, and valid behavior in
UNIMARC).

Changes to the z3950_search.tt file:
Sometime in 2009 or so, the ISSN field was removed from the Z39.50 search
page, and the ISBN field replaced with a combined ISBN/ISSN field. Since
this breaks ISBN search for most Z39.50 targets (due to the
differing treatment of ISBN vs. ISSN), this is a bug not a feature.

Signed-off-by: Marc Veron <veron@veron.ch>

Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:56:36 +02:00
17298c2042 Bug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page
Extra </div> returned. Killing it again.

After applying the patch the validator should only warn of
invalid "autocomplete" attribute.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-08 17:11:12 +02:00
Marc Veron
510a7d7347 Bug 8796 - patron cards not starting on designated card
Better wording for the meaning of 'Position' to prevent mistakes on behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:16:01 +02:00
Marc Veron
624957bf21 Bug 8810 - Opac: Cart should display branchname instead of branchcode
In Opac, the cart should display the branchname instead of the branchcode.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:25:50 +02:00
Jonathan Druart
96e1c5d80b Bug 8370: Change term issues (smart-rules)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:12:41 +02:00
Paul Poulain
e5a24bbbdd Merge remote-tracking branch 'origin/new/bug_7621' 2012-10-05 11:58:28 +02:00
Nicole C. Engard
337fbb5e98 Bug 7621: Follow up to clarify preference language
This patch changes strings only, not functionality. It will
clarify the meaning of the  AgeRestrictionMarker preference.

Signed-off-by: Marc Veron <veron@veron.ch>

Better wording of preference instructions. No code echange involved.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:58:12 +02:00
Paul Poulain
81ee945a58 Merge remote-tracking branch 'origin/new/bug_8382' 2012-10-05 11:56:39 +02:00
d30a8ae220 Bug 8382 [Follow-up] It is not possible to cancel an order when receiving on a filtered page in parcel.pl
In order to be valid XHTML ampersands must be encoded ("&amp;").

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:56:24 +02:00
383e2c4270 Bug 8827 - YUI CSS files no longer found on Yahoo servers
This patch removes the [% yuipath %] variable from the link
to the YUI CSS files in the OPAC and adds a hard-coded path
to the local files.

To test, set your yuipath system preference to "from Yahoo's
servers," clear your browser cache, and view the OPAC. The
style and layout should look the same as if your yuipath
preference were set to "local."

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Fixes broken display.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:51:04 +02:00
Jared Camins-Esakov
461b0c4420 Bug 8623 follow-up: make sure CCSR theme loads YUI
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-05 11:49:22 +02:00
f7055bb901 Bug 8449 - Improve wording and styling for "cancelled holds" on Holds Awaiting Pickup screen
Return library name to message about hold requiring transfer.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 10:44:51 +02:00
e500433c3f Bug 8449 - Improve wording and styling for "cancelled holds" on Holds Awaiting Pickup screen
This patch re-implements and adapts the changes dcook@prosentient.com.au
submitted in a patch which no longer applies. I have changed the
"alert" style messages to "message" style to match the style
which is applied to "hold found" messages elsewhere.

I have also revised the language in a way that I think is more
clear and accurate.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
2012-10-05 10:44:49 +02:00
Paul Poulain
a8c5497b8d Merge remote-tracking branch 'origin/new/bug_7986' 2012-10-04 18:12:14 +02:00
Jonathan Druart
db4fddd31d Bug 7986: Followup: Hide the export link unless sysprefs are set
If at least one of both sysprefs (ExportRemoveFields and
ExportWithCsvProfile) is filled, the export link is displayed

Signed-off-by: Marc Veron <veron@veron.ch>

Tested with both sysprefs filled/not filled, patch behaves as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-04 18:09:00 +02:00
7f5583d549 Bug 8759 - Add labels for library and sorting on opac advanced search
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-03 15:53:16 +02:00
Paul Poulain
529bb9c2a4 Bug 8585 follow-up Passing syspref to template
Passing the syspref HoldsToPullStartDate to get the number of days displayed on the screen
(instead of "two" that was hardcoded)

Also s/tab/4 spaces/g
2012-10-03 15:28:43 +02:00
762ce7abe6 Bug 8585 : Add System Preference to specify Holds to Pull List Start Date
Currently, Koha creates a default value of 2 days ago (-2) for the start date of the Holds to pull List. This system preference allows users to specify their own default start date for this list, since users might not want to have to manually change the date all the time when they already know the set date period they want to view.

The system preference value is specified as a positive integer, which is then passed as a negative integer in the handler script. This saves users from having to include a qualifer to the sys pref value.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-03 15:18:40 +02:00
50be765eae Bug 8711 - alternating colors messed up on reports
Patch adds the "zebra-striping" option to the
table sorter initialization and changes the row
color CSS to match the tablesorter's to prevent
conflicts.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-02 18:04:21 +02:00
Frédérick Capovilla
77c2a02c8c Add a warning if a Z39.50 search is started from biblio edition page.
Warn the user that the current biblio record might be overwritten by
this action.

http://bugs.koha-community.org/show_bug.cgi?id=8583
Signed-off-by: Marc Veron <veron@veron.ch>

Woks as expected. I prefer this solution with an explicit warning,
since several times I acidentally changed a record  :-)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-02 18:00:54 +02:00
Lyon3 Team
2f875daa60 Bug_7913-Follow-up, hide button for subs with items
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-01 17:50:16 +02:00
Lyon3 Team
cd2fae07ae Receiving serials in a loop
generate the number of issues entered from a message box and apply
'arrived' status.

http://bugs.koha-community.org/show_bug.cgi?id=7913
Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
2012-10-01 17:50:12 +02:00
Robin Sheat
79e0fb6fd6 Bug 7642 - fix the lost display of tag sizes
This fixes the display of different sized words for differently popular
tags. It is a bit of a refactor of that part of the system, moving
logic to more sensible places (and removing an unused method on the
way.)

Note that it isn't an attempt to reproduce what was there previously,
just to do something similar, and in an easier to change fashion.

Sponsored-By: New Zealand Educational Institute
Signed-off-by: Marc Veron <veron@veron.ch>
Works as expected.
2012-10-01 17:38:27 +02:00
7a7e018ed3 Bug 3387 - WITHDRAWN items shouldn't check in
Adds a system preference BlockReturnOfWithdrawnItems to control
whether or not Koha should allow a withdrawn item to be returned
or not.

Also fixes the behavior where Koha will attempt to use a withdrawn
item to fill a hold.

Test Plan:
1) Set BlockReturnOfWithdrawnItems to "Block" ( this is the default )
2) Check an item out to a patron
3) Mark item as withdrawn
4) Attempt to return the item, you should still see the item on the
   borrower's record
5) Set BlockReturnOfWithdrawnItems to "Don't Block"
6) Attempt to return the item, you should see the item is no longer
   on the borrower's record.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-10-01 17:07:53 +02:00
Jared Camins-Esakov
5bf01284e3 Bug 8581: don't display parentheses when we don't have a type
Prior to this patch, see also references in certain authority records
(most notably GND records) were being followed by empty parentheses in
the search results display. This patch resolves that problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-01 16:34:04 +02:00
Jared Camins-Esakov
eb6effd2c2 Bug 8726: add CSS to CCSR theme 2012-09-28 17:14:19 +02:00
Jonathan Druart
b5659f6425 Bug 8726: Followup FIX save didyoumean syspref
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-09-28 17:14:17 +02:00
Jared Camins-Esakov
52f54eec1d Bug 8726 follow-up: fix QA issues
Fixes several perlcritic complaints, and some overflow in the
configuration page. Also notes that Did You Mean is not yet
enabled on the staff client.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Sorry about the problematic last attempt at uploading. I missed a
patch when squashing. It is now included.
2012-09-28 17:14:15 +02:00
Jared Camins-Esakov
ef87bb0a81 Bug 8726: ExplodedTerms suggestion plugin (jQueryUI)
When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds a suggestion plugin for
these "exploded" subject searches to Koha. Note that this patch depends on
both bug 8211 AND bug 8209.

To test (NOTE: this test plan covers both 8211 and 8726):
1) Make sure you have a bunch of hierarchical subjects. I created
   geographical subjects for "Arizona," "United States," and "Phoenix,"
   and linked them together using 551s, and made sure I had a half
   dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona," the
   records with the subject "United States," and the records with the
   subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
   whatever)
6) Use "Did you mean?" page in admin section to enable ExplodedTerms
   plugin
7) Do a keyword search on the OPAC, confirm that searching for exploded
   terms is suggested.
8) Do a subject search on the OPAC, confirm that searching for exploded
   terms is suggested.
9) Do a non-keyword, non-subject search on the OPAC, confirm that
   searching for exploded terms is NOT suggested.
10) Disable ExplodedTerms plugin and enable AuthorityFile plugin.
11) Do search on OPAC, confirm suggestions are made from authority file.
12) Sign off

Signed-off-by: wajasu <matted-34813@mypacks.net>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Split into two patches. This patch includes only the jQueryUI upgrade
2012-09-28 17:14:13 +02:00
Jared Camins-Esakov
d2cd2e09aa Bug 8726: ExplodedTerms suggestion plugin (functionality)
When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds a suggestion plugin for
these "exploded" subject searches to Koha. Note that this patch depends on
both bug 8211 AND bug 8209.

To test (NOTE: this test plan covers both 8211 and 8726):
1) Make sure you have a bunch of hierarchical subjects. I created
   geographical subjects for "Arizona," "United States," and "Phoenix,"
   and linked them together using 551s, and made sure I had a half
   dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona," the
   records with the subject "United States," and the records with the
   subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
   whatever)
6) Use "Did you mean?" page in admin section to enable ExplodedTerms
   plugin
7) Do a keyword search on the OPAC, confirm that searching for exploded
   terms is suggested.
8) Do a subject search on the OPAC, confirm that searching for exploded
   terms is suggested.
9) Do a non-keyword, non-subject search on the OPAC, confirm that
   searching for exploded terms is NOT suggested.
10) Disable ExplodedTerms plugin and enable AuthorityFile plugin.
11) Do search on OPAC, confirm suggestions are made from authority file.
12) Sign off

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Split into two patches. This patch includes only the functionality.
2012-09-28 17:08:21 +02:00
christophe croullebois
35b7162adf Bug 7351 : feature that allows to delete a range of dates
Four new options, one for single holidays, one for the repeatable holidays.
One to create exceptions on a range of dates, one to delete exceptions in a range of dates.
Note that the exceptions are not deleted if you delete a range of repeatable dates.
But if you delete a range of single holidays the exeptions inside will be deleted.

Signed-off-by: Stephane Delaye <stephane.delaye@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-28 12:19:45 +02:00
Paul Poulain
8e7df04301 Bug 5335 follow-up fixing template
There were 2 invalid T::T construction, with a [% IF %] inside a HTML tag
2012-09-28 11:26:23 +02:00
Maxime Pelletier
6d59dd5c60 Bug 8659 Remove and readd the inactive funds in javascript to make it work in all browsers
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-26 19:11:14 +02:00
Fridolyn SOMERS
9ee5c9ec1e Bug 8702: System preferences search does not allow accented letters
This bug enables accented/diacritic system preference text to be matched
when searching for sysprefs.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-26 19:02:18 +02:00
Jonathan Druart
1b4b78a136 Bug 5356: delivery place and billing place centralised in basket management
- adding 2 select option in basdketheader.tmpl (delivery and billing
   place)
- adding 2 more fields in basket csv export

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested together with patches for bug 7302.
2012-09-24 20:46:39 +02:00
Paul Poulain
b2bb0c78e5 Bug 8523 follow-up OPAC styles for ccsr theme 2012-09-21 16:35:20 +02:00
Jared Camins-Esakov
83370c519c Bug 8523: Display auth hierarchies w/all marcflavours
This commit adds support for displaying authority hierarchies for all
flavours of MARC, not just UNIMARC. Display now uses the jQuery
jstree plugin, selected with the help of Owen Leonard, resulting in a
much faster experience for users.

Be aware that the jstree file uses tabs rather than 4-space indentation,
which I left as-is so as to make it easier to integrate upstream
releases in the future.

To test:
1) Enable the AuthDisplayHierarchy syspref
2) Create authority records with a hierarchy of see also fields
   (in MARC21/NORMARC, you'll be using 5xx fields for this, with a
   subfield $w=g for broader terms and subfield $w=h for narrower
   terms)
3) View the authorities in the OPAC, noting the hierarchical view at
   the top of the page.

This initial patch does not create bidirection linkages from
unidirectional links in MARC21 authorities. This means that when moving
up the authority hierarchy, lower levels will disappear. This is
intentional, as the first patch is intended merely to ensure that
AuthDisplayHierarchy functions the same for all marcflavours. A future
patch will add a cron job to generate the bidirectional linkages, once
we are sure that the hierarchy functionality for UNIMARC and
MARC21/NORMARC coexists peaceably.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Resolved conflicts in updatedatabase.pl, sysprefs.sql and in one of
the CSS files.

Test plan:

1) Run t/AuthoritiesMarc.t
New tests complete without any errors.

2) Make sure updatedatabase works correctly.
Update works nicely, new system preference is also added to syspref.sql

3) Make sure new terms are translatable.
Created new po files for de-DE and checked for new terms.
All translations appear correctly.

4) Make sure everything works with AuthDisplayHieararchy OFF
- Add authority
- Edit authority
- Delete authority

5) Test feature with AuthDisplayHieararchy ON
- Add authority
- Edit authority
- Delete authority

6) Add a couple of hierarchically linked authorities
Note: links have to be created in both directions

Example:
151 $aGermany
  551 $a Baden-Württemberg $w h

151 $aBaden-Württemberg
  551 $a Konstanz $w h
  551 $a Germany $w g

151 $aKonstanz
  551 $a Baden-Württemberg $w g
  551 $a Fürstenberg $w h
  551 $a Paradies $w h

151 $a Fürstenberg
  551 $a Konstanz $w g

151 $a Paradies
  551 $a Konstanz $w g

Tree shows up nicely above the authority record
- in staff
- in OPAC
  - on the normal view tab
  - on the MARC view tab

7) Checking the logs for warnings
- no Javascript errors or warnings
- no warnings or errors in log files
2012-09-21 14:52:08 +02:00
Jonathan Druart
d7faf087a3 Bug 5335 - More granular VAT
Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 18:09:53 +02:00
Fridolyn SOMERS
dd2de85892 Bug 8692: Authorities search form does not correspond to current search query
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The correct tab is now visible on load. The problem with authtypecode
showing up in the search box is specific to UNIMARC, so I could not
check that it was gone, but I am comfortable signing off on this.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 14:06:41 +02:00
Paul Poulain
a42e5e6d3e Merge remote-tracking branch 'origin/new/bug_5339' 2012-09-20 10:19:44 +02:00
Paul Poulain
59c230e7fd Bug 5339 follow-up
* fix english error
 * if the invoice is closed, don't display a "finish receiving" link, but a "view invoice" one
2012-09-20 10:19:19 +02:00
Julian Maurice
8cf9f78702 Bug 5339: ergonomic changes
- "Finish receive" on parcel.pl now redirect to acqui/invoice.pl,
  allowing the librarian to modify invoice informations (freight,
  billing date, ...) and close invoice.
- The librarian can now close (or reopen) the invoice and modify invoice
  informations in 1 operation (instead of 2)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 09:46:50 +02:00
Jared Camins-Esakov
7ad5e203da Bug 2060: Update command line MARC import scripts
Expose authority import functionality to the command line import
scripts, and rename them from commit_biblios_file.pl and
stage_biblios_file.pl to commit_file.pl and stage_file.pl.

To test (note that these instructions assume you have a MARC21
installation and are using the provided sample file):
1. Find a file of authorities (a sample file with MARC21 authorities
   is attached to bug 7475) and download it to your server
2. Stage the file using the following command (replace <filename> with
   the name of the file you saved in step 1):
   > misc/stage_file.pl --file <filename> --authorities
3. Note the batch number the script assigns to your batch
4. Commit the records using the following command (replace <batchnumber>
   with the batch number you made note of in step 3):
   > misc/commit_file.pl --batch-number <batchnumber>
5. Index the authorities Zebraqueue (or wait)
6. Confirm that the new authorities appear.
7. Create a matching rule with the following settings:
   Code: AUTHTEST
   Description: Personal name main entry
   Match threshold: 999
   Record type: Authority record
   Search index: Heading-main
   Score: 1000
   Tag: 100
   Subfields: a
   Offset: 0
   Length: 0
   (note the ID of this matching rule)
8. Stage the authority file again, this time using the following
   command:
   > misc/stage_file.pl --file <filename> --authorities \
     --match <matchingrule>
7. Revert the import with the following command:
   > misc/commit_file.pl --batch-number <batchnumber> --revert
8. Index the authorities Zebraqueue (or wait)
9. Confirm that the records have been removed
10. Import an authority record with the Stage MARC/Manage staged MARC
    tools in exactly the way you would for a bibliographic record,
    but choose "Authority" instead of "Bibliographic" for the record
    type.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Testing plan delivers as it should.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
2012-09-19 17:16:18 +02:00
Jared Camins-Esakov
6e71b80ca3 Bug 7475: Teach matching rules to handle authorities
* Add the code necessary to handle authorities with matching rules and
  import batches.
* Update all the scripts that use the matcher and import batch code
  to use the new API.
* Add authority records to the matching rules interface in the staff
  client.

http://bugs.koha-community.org/show_bug.cgi?id=2060
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
2012-09-19 17:15:56 +02:00
Paul Poulain
2f8308cd49 A follow-up will be added though, because we understood why I had some javascript error and jonathan didn't. It's because I've plack + debug
Bug 8117 follow-up: explicitely list tables to dataTable


debug panel in plack adds a lot of <table> (without any id)
thus, when you call
$("table").dataTable(...)
there's a javacscript error because datatable can't handle the plack <table> !

The solution has been to explicitely name the tables to dataTable (which is a good thing anyway)
        $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, {
2012-09-19 17:02:14 +02:00
Jonathan Druart
f4dadc955c Bug 8117: Followup: remove h3 title (duplicate infos)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 16:17:22 +02:00
Jonathan Druart
4b312b141a Bug 8117: Divide budget periods into two tabs
Budget periods are now divided into two tabs : active and inactive
budget periods.

The original author of this patch is Julian Maurice

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-09-19 16:17:16 +02:00
Mirko Tietgen
1059c03b68 Bug 8185: Change some more strings from Italian to English
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Two additional corrections

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 15:45:29 +02:00
Zeno Tajoli
65e0a7d5a5 Bug 8185: plugin for linking records in MARC21
This plugin works like the unimarc plugin unimarc_field_4XX. It
 insert: $9 -> biblionumber $w -> 001 $t -> 245$a (title )
 $x -> 022$a (ISSN) $z -> 020$a (ISBN) The search is done on
 'any' index. Data are inserted only in the working record.
 To insert data in the connected record, you need to open
 the other record.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-09-19 15:45:27 +02:00
Jared Camins-Esakov
9b5a5224e6 Bug 8624: Move famfamfam out of theme directory
The patch moves the famfamfam image set out of the
koha-tmpl/opac-tmpl/prog/famfamfam into koha-tmpl/opac-tmpl/famfamfam

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 15:40:55 +02:00
f34e90f768 Bug 6689 [Follow-up] Improve styling of table pager
Small correction to add non-vendor-prefixed border
radius declaration to make style consistent on
newer browsers.

To test, view a page with a sorted table and pager controls,
like members/readingrec.pl. The pager controls "box" should
show rounded corners in Firefox 15+

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 14:29:11 +02:00
881ee1b1a1 Bug 7401 - Shelving Location facet
This patch enables the shelving location facet as an
alternative to the branches fact in two situations:
A) SingleBranchMode is enabled
B) There is only one branch in the branches table

Test Plan:
1) Catalog multiple items with different shelving locations.
2) Test enable by enabling SingleBranchMode
3) Test enable by deleting all but one branch

Based on initial patch by Ian Walls.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested cases 2) and 3) successfully in OPAC and staff client

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 14:25:04 +02:00
Paul Poulain
659a4aab57 Merge remote-tracking branch 'origin/new/bug_8597' 2012-09-19 11:43:04 +02:00
Paul Poulain
81ba4ca979 Bug 8597 follow-up translation issues
Replacing 2 french terms by the english one
2012-09-19 11:42:41 +02:00
Paul Poulain
3847f55cc7 Merge remote-tracking branch 'origin/new/bug_8597' 2012-09-19 11:36:51 +02:00
Jared Camins-Esakov
df104c331c Bug 8597 follow-up: add missing lib files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 11:36:36 +02:00
Julian Maurice
bf803c521f Bug 5339: Invoices management improvement
- New pages:
  - invoices.pl: allow to search in invoices on several criteria
  - invoice.pl: permit to view and modify invoice details
    - shipment date
    - billing date
    - shipment cost and budget used for shipment cost

Invoice informations are now stored in their own sql table and aqorders
have a link to it

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-09-18 22:42:15 +02:00
Katrin Fischer
8defeb2bd0 Bug 5357: Follow-up - layout and EAN search
1) EAN search should be hidden if marcflavour is not UNIMARC
2) Fixes layout to match the advanced search in acquisitions
- labels in front of the fields instead of separate lines
- adds a legend to the form and moves the toggle for the search form to it

To test:
- EAN search field should only show up when marcflavour system preference
  is set to UNIMARC
- Check layout is consistent and you like it
- Check toggle for advanced search still behaves the same

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 22:37:31 +02:00
Jonathan Druart
214fd0fbd1 Bug 5357: Adds a new page for searching subscriptions
Test plan:
- go on the serial module
- click on the 'Advanced search' link (right of subscriptions search in
the header)
- Search subscriptions (by ISSN, title, EAN, Publisher, Supplier and/or
  Branch)
- Check results are correct

Signed-off-by: Corinne HAYET <corinne.hayet@bulac.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 22:37:11 +02:00
Colin Campbell
537c746dc4 Bug 7751: Decrease Loans for Items in Demand for Holds
Rebase and merge based on Mark Gavillet's patch to reduce
the loan period given to items on renewal when they are
in high demand for holds

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-09-18 19:01:14 +02:00
Srdjan
42acfbf75b Bug 7993: Save reports with Group/Subgroup hierarchy
This should make saved reports more manageable.
Group/Subgroup hierarchy is stored in authorised_values,
categories REPORT_GROUP and REPORT_SUBGROUP, connected by
REPORT_SUBGROUP.lib_opac -> REPORT_GROUP.authorised_value

Database changes:
* authorised_values: expanded category to 16 chars
* created default set of REPORT_GROUP authorised values to match
  hardcoded report areas
* reports_dictionary: replaced area int with report_area text, converted
  values
* saved_sql: added report_area, report_group and report_subgroup;
  report_area is not currently used, saved for the record

C4/Reports/Guided.pm:
* Replaced Area numeric values with the mnemonic codes
* get_report_areas(): returns hardcoded areas list
* created get_report_areas(): returns full hierarchy (groups with belonging
  subgroups)
* save_report(): changed iterface, accepts fields hashref as input
* update_sql(): changed iterface, accepts id and fields hashref as input
* get_saved_reports():]
- join to authorised_values to pick group and subgroup name
- accept group and subgroup filter params
* get_saved_report():
- changed iterface, return record hashref
- join to authorised_values to pick group and subgroup name
* build_authorised_value_list(): new sub, moved code from
  reports/guided_reports.pl
* Updated interfaces in:
cronjobs/runreport.pl, svc/report, opac/svc/report: get_saved_report()
reports/dictionary.pl: get_report_areas()
reports/guided_reports.pl

reports/guided_reports_start.tt:
* Reports list:
- added group/subgroup filter
- display area/group/subgroup for the reports
* Create report wizard:
- carry area to the end
- select group and subgroup when saving the report; group defaults to area,
  useful when report groups match areas
* Update report and Create from SQL: added group/subgroup
* Amended reports/guided_reports.pl accordingly

Conflicts:

    C4/Reports/Guided.pm
    admin/authorised_values.pl
    installer/data/mysql/kohastructure.sql
    installer/data/mysql/updatedatabase.pl
    koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
    koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
    misc/cronjobs/runreport.pl
    reports/dictionary.pl
    reports/guided_reports.pl

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 17:49:08 +02:00
Julian Maurice
b0ab204bfd Bug 8210: add links to authorities in normal mode headings
Cherry-picked from BibLibre's work on bug 5888:
opac-detail subject/author links improvements

Added a link to opac-authoritiesdetail.pl when possible.

Only affects 'Normal view'. Does not affect XSLT display.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 17:39:41 +02:00
Jared Camins-Esakov
237a43b361 Bug 8210: add links to authorities to headings in OPAC
At the moment, there is no way to get to an authority record from a bib
record that uses it other than doing a new search on the authority file.
This patch adds a link (a cute little magnifying glass) to linked
authority records on the OPAC detail view for MARC21 and NORMARC
with XSLT enabled. A follow-up patch will add the link to regular mode.
Because UNIMARC handles authorities differently, the link is not added
to the XSLT.

Test plan:
1) Set OPACXSLTDetailsDisplay to 'default'
2) View a record that has some headings that are linked to authority
   records in the OPAC (easiest way to find a record like that is to
   edit a record and add some headings using the thesaurus plugin)
3) Observe the cute little magnifying glass links to the authority.

Revised version of the patch adds a space between the heading and the
magnifying glass.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works nicely.

If a library does not like to see the
magnifying glass/link to the authority, it's easy to disable it
by adding the line .authlink {display:none;} to OpacUserCSS.
2012-09-18 17:39:39 +02:00
Jared Camins-Esakov
4feb6a4736 Bug 8211: Add exploded search options
When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds support for these
"exploded" subject searches to Koha.

To test:
1) Make sure you have a bunch of hierarchical subjects. I created
   geographical subjects for "Arizona," "United States," and "Phoenix,"
   and linked them together using 551s, and made sure I had a half
   dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona," the
   records with the subject "United States," and the records with the
   subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
   whatever)
6) Sign off

Technical details:
This patch adds a shim in front of C4::Search::buildQuery in order to
preprocess the query and call the _handle_exploding_search callback.
This shim will allow us to gradually offload query parsing to a new
query parser module.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 15:20:48 +02:00
Frédérick
f913ebe49f Bug 8597: Add system preferences to configure the mobile view.
This patch adds the following system preferences:
* OpacMainUserBlockMobile - alternate content for the MainUserBlock for
  mobile
* OPACMobileUserCSS - custom CSS for mobile views only
* OpacShowFiltersPulldownMobile - whether or not to show the index
  dropdown on the mobile view
* OpacShowLibrariesPulldownMobile - whether or not to show the library
  dropdown on the mobile view

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-09-18 13:42:18 +02:00
Jared Camins-Esakov
2ab4398fcf Bug 8597: Add CSS, JS, and images to ccsr theme
In order for themes to work, they must include all CSS, Javascript, and
image assets that they use. This patch adds all CSS, Javascript, and
images from the prog theme to ccsr, EXCEPT for the famfamfam image set,
which needs to be moved outside of the theme directories, per bug 8624.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-09-18 13:41:51 +02:00
Jared Camins-Esakov
f536d3edf0 Bug 8597: fix hardcoded references to prog in ccsr
There were a few hardcoded references to the prog theme in the new
ccsr theme's files.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-09-18 13:41:49 +02:00
Frederick Capovilla
3229d8b194 Bug 8597: Add mobile functionality to ccsr theme
This patch adds the promised media query-based mobile view to the
ccsr theme. You can try the mobile view by resizing your browser window
until it is phone-sized.

Sponsored-by: Centre collégial des services regroupés (CCSR)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
All work was originally done by Frederick, but I converted his
modifications to the prog template into a new template called ccsr.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-09-18 13:40:30 +02:00
Frederick Capovilla
c7c2e9efbd Bug 8597: Create new CCSR theme
Creates a new theme for the OPAC called "ccsr." The new theme has a much
cleaner, more modern look than the prog theme, and is designed from the
ground up to work on mobile devices using media queries. A later patch
will include the mobile view.

In order to activate the theme, change the opacthemes syspref to 'ccsr'
and make sure that your opaccolorstylesheet is set to 'colors.css.'

Sponsored-by: Centre collégial des services regroupés (CCSR)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
All work was originally done by Frederick, but I converted his
modifications to the prog template into a new template called ccsr.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-09-18 13:38:28 +02:00
Frederick Capovilla
9f1860c01e Bug 8597: Improve template markup to prepare for mobile
The templates were missing classes on a number of elements that
will need classes in order for a mobile view to function.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-09-18 13:36:48 +02:00
b8edffe3d2 Bug 8693 - Sort biblio checkout history by checkout date instead of patron name
Adding a default sort on checkout date.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 12:25:38 +02:00
Adrien Saurat
adfbbfa0d1 Bug 8757: longer descriptions for authorised values
In the "suggestions" table, the "lib" and "lib_opac" sizes
has been raised from 80 chars to 200.
The GUI allowing the authorised values creation/update has
been changed accordingly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 12:22:49 +02:00
Paul Poulain
9acabe44a4 Bug 6151 follow-up, fix HTML4 coding guideline 2012-09-17 19:24:45 +02:00
7cbb0debf5 Bug 6151 - Followup - Display message for failed returns on circulation.pl when returning via issues table.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-09-17 19:19:13 +02:00
Ian Walls
850b4eeab9 Bug 6151: Add AllowReturnToBranch system preference
In order to solve the issue of IndependantBranches being incompatible with HomeOrHoldingBranchReturn,
this patch changes the mechanism by which the question "can I return this material here?" is answered.  Before,
the conditions were "if IndependantBranches is on, and this branch isn't HomeOrHoldingBranchReturn for the item,
then no, otherwise yes".  Now, the question is answered by consulting CanBookBeReturned (new subroutine)

New system preference:  AllowReturnToBranch
Possible values:
  - anywhere (default for new installs, and for existing systems with IndependantBranches turned off)
  - homebranch
  - holdingbranch (which is also the issuing branch in all normal circumstances)
  - homeorholdingbranch (default for existing systems with IndependantBranches turned on)

New subroutine:  CanBookBeReturned
Input:  $item hash (from GetItems), and $branchcode
Output: 0 or 1 to indicate "allowed" or not, and an optional message if not allowed.  Message is the 'correct' branchcode
to return the material to

To Test:
1.  Install patch and new syspref
2.  Check that default value of the preference:
    - if IndependantBranches was OFF at install time, should be 'anywhere'
    - if IndependantBranches was ON at install time, should be 'homeorholdingbranch'

Case:  'anywhere'
1.  Checkout a Library A book at Library A.  Return at Library A should be successful
2.  Repeat step 1, returning to Library B.  Return should be successful
3.  Checkout a Library A book at Library B.  Return to A should be successful
4.  Repeat step 3 with Library B and Library C

Case: 'homebranch'
1.  Checkout a Library A book at Library A.  Return at Library A should be successful
2.  Repeat step 1, returning to Library B.  Return should FAIL (returning message to return at A)
3.  Checkout a Library A book at Library B.  Return to Library A should be successful
4.  Repeat step 3 with Library B and Library C.  Both should FAIL (returning message to return at A)

Case: 'holdingbranch'
1.  Checkout a Library A book at Library A.  Return at Library A should be successful
2.  Repeat step 1, returning to Library B.  Return should FAIL (returning message to return at A)
3.  Checkout a Library A book at Library B.  Return to A should FAIL (returning message to return at B)
4.  Repeat step 3 with Library B. Return should be successful
5.  Repeat step 3 with Library C. Return should FAIL (returning message to return at B)

Case: 'homeorholdingbranch'
1.  Checkout a Library A book at Library A.  Return at Library A should be successful
2.  Repeat step 1, returning to Library B.  Return should FAIL (returning message to return at A)
3.  Checkout a Library A book at Library B.  Return to A should be successful
4.  Repeat step 3 with Library B. Return should be successful
5.  Repeat step 3 with Library C. Return should FAIL (returning message to return at A)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-09-17 19:17:41 +02:00
Paul Poulain
cbca4e8b0e Bug 8765 follow-up replace tabs by spaces 2012-09-17 19:00:05 +02:00