Commit graph

18825 commits

Author SHA1 Message Date
Katrin Fischer
0454377380 Bug 8200: Follow up - Removing unused file stats.pl
Patch removes misc/translator/stats.pl that is no
longer used and references deleted script
update.pl in same directory.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:38:06 -04:00
3e72ec4acc Bug 8200 - removing misc/translator/update.pl - deprecated file
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch removes unused file.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:38:06 -04:00
Jared Camins-Esakov
f063dad5f2 Merge branch 'bug_7853' into 3.12-master 2013-04-07 13:34:15 -04:00
11caedbf19 Bug 7853 - opac-maintanance.pl should correctly redirect back to opac-main.pl, if no updates are outstanding
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Works exactly as it should according to the test plan. This is a nice
improvement.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Check OpacMaintenance!

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:34:12 -04:00
Jared Camins-Esakov
88eaa19bf0 Merge branch 'bug_9459' into 3.12-master 2013-04-07 13:30:57 -04:00
ec8758aab5 Bug 9459 [Revised] Use DataTables on hold ratios report page
Replace the tablesorter plugin with the DataTables plugin on the
hold ratios report page.

To test, open the hold ratios report (Circulation -> Hold ratios).
Confirm that table sorting works correctly.

Revision adds correct pagination options and natural sort for 'items
needed' column.

Patch now depends on Bug 9431
(http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9431) which
introduces the natural sort plugin.

Further revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: On top of Bug 9431. Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:30:54 -04:00
Jared Camins-Esakov
dae5b8d1a4 Merge branch 'bug_9850' into 3.12-master 2013-04-07 13:28:19 -04:00
Nicole C. Engard
f6b936d50c Bug 9850: FOLLOW UP: Add Missing Plugin Help for 3.12
This patch is a follow up to the one that adds the plugin help.

To test:

Visit the upload a plugin page and review the help and links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixed capitalization issues.
2013-04-07 13:28:05 -04:00
Nicole C. Engard
40a24e1eed Bug 9850: Update Tools Help for 3.12
Update the text and links in the Tools help files.

To test:

Check the text and links on all help files under Tools.

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

I fixed one instance of a link to 3.10 instead of 3.12.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:29 -04:00
Nicole C. Engard
ddbeb04faa Bug 9850: Add Plugin Help File for 3.12
This adds a help file to the new plugins module.

To test:

Activate the plugin module and check the text and links in the help file

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:29 -04:00
Nicole C. Engard
a6afd8d1e4 Bug 9850: Update Circ Help Files for 3.12
This updates the text and links for the Circulation Help Files.  It also removes
an unused help file 'billing.tt'.

To test:

Visit the help files on all circ pages and confirm links and text are right.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:29 -04:00
Nicole C. Engard
48242d4a03 Bug 9850: Offline Circ Help Files for 3.12
This updates the text and links in the offline circulation tool help files.

To test:

Visit all offline circulation pages in the staff client and review the text and links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:28 -04:00
Nicole C. Engard
4aadbdbc6d Bug 9850: Suggestion Help File for 3.12
This updates the text and link on the suggestions help file.

To test:

Visit the manage suggestions page and review the help file.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:28 -04:00
Nicole C. Engard
4409a1a6a2 Bug 9850: Serial Help Files for 3.12
Update text and links for Serials help files.

To test:

Visit all serial related pages and check the text of the help and
test the links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:28 -04:00
Nicole C. Engard
f820f3f323 Bug 9850: Update Reports Help for 3.12
This updates the reports help for Koha 3.12.

To test:

Visit all reports pages and review the help for textual changes
and correct links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:28 -04:00
Nicole C. Engard
bdd27cdfe2 Bug 9850: Cataloging Help for 3.12
This updates just the links in the cataloging help, no text changes where made.

To test:

Visit help in cataloging and click the manual links and make sure they're right.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:28 -04:00
Jared Camins-Esakov
38d48ad7c3 Merge branch 'bug_9902' into 3.12-master 2013-04-07 13:20:40 -04:00
9f2189d0c5 Bug 9902 - item subfields not populating
Test Plan:
1) Create a new serial with a default location, call number, and library
   ( the library will need to be any but the one you are logged in as )
2) Click the "Recieve" button for this serial
3) Click "Click to add item"
4) Note those values are not populated
5) Apply the patch
6) Reload the page
7) Click "Click to add item"
8) Note those values are now populated

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass!

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

This seems to restore the former behaviour.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:20:07 -04:00
Jared Camins-Esakov
b38a3126e1 Merge branch 'bug_7449' into 3.12-master 2013-04-07 13:08:31 -04:00
Fridolyn SOMERS
8297a2d424 Bug 7449: billingplace and freedeliveryplace not saved when creating a new basketgroup
billingplace and freedeliveryplace are missing in C4::Acquisition::NewBasketgroup.

Test plan :
- Go to a vendor basket groups
- Create a new basket group
- Enter a name
- Choose a billing place
- Do not choose a delivery place in combobox but enter a text in delivery place textarea
- Enter a comment
- Save
- Edit created basket group
=> Check that billing place and free delivery place are ok

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works according to test plan, delivery place is now
correctly saved into the databas and was before lost.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:08:28 -04:00
Jared Camins-Esakov
c490421407 Merge branch 'bug_8061' into 3.12-master 2013-04-07 12:52:23 -04:00
Karam Qubsi
7f48829c50 Bug 8061: Follow Up (Opac-Prog) - enhancement to D Ruth's patch
In this Patch I added some changes to the rtl.css file
I made some changes in the file opac-bottom.inc and add css
classes to the lang list and I define the class value in
the opac.css
I add If statment to the opac-detail.tt to chose the rtl.css
when rtl lang.

http://bugs.koha-community.org/show_bug.cgi?id=8061

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Reformatted commit message and added bug number.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with po files for Arabic from 3.8.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04:00
Karam Qubsi
6fd6c024a4 Bug 8061: Follow up - RTL CSS overrides (staff client)
I think this patch is good for th rtl langs.
and based on what D.Ruth send before, I added some edits
as a right to left reader.

Tested on master with Arabic
I used the updated po files for v. 3.8 (because the 3.12 )
need some revision ...

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04:00
D Ruth Bavousett
2880e76e8f Bug 8061: RTL CSS overrides (OPAC)
This patch repairs a few things in templates and CSS to allow
for the injection of right-to-left CSS, also in this patch.
It should apply to 3.8 and master.

To test, install and enable a right-to-left language for the
OPAC, currently Hebrew or Arabic.
The Arabic OPAC translations for 3.6 are mostly-complete, so
they are a good test case.

It's helpful to have a reader of the language handy, but the
layout should be easy enough to figure out, even for
non-readers.

Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended patch adding back author and adding sign off.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04:00
D Ruth Bavousett
8c130eede3 Bug 8061: RTL CSS overrides (staff client)
This patch tweaks a few templates, and enables right-to-left
flipping via CSS in the staff client.

Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended patch, putting back author and adding sign off.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04:00
Jared Camins-Esakov
815a6b62bd Merge branch 'bug_9980' into 3.12-master 2013-04-07 12:15:11 -04:00
ae06a83cf0 Bug 9980: Fix for anonymous searches
To test
Search in the OPAC both logged and logged out

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
When I turn off XSLT for the OPAC I can recreate the problem.
After applying the patch things work as expected for all
combinations of:
- Search results and detail view
- Logged in and not logged in
- XSLT and non-XSLT view

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests, QA script and test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:11:37 -04:00
Jared Camins-Esakov
7b1a091a80 Merge branch 'bug_9981' into 3.12-master 2013-04-03 07:16:08 -04:00
ae0d137436 Bug 9981: Handle sort1 field when duplicating patron
It is noted in Bug 5432 that during a duplicate operation one field,
'Sort1' does not automatically clear when the cursor moves into it. This
patch corrects this.

Edit a patron record to have data in the Sort1 and Sort2 fields. Perform
a duplicate operation on this patron and confirm that the Sort1 and
Sort2 fields show the information from the original patron record. When
you click on each field the contents should disappear.

Signed-off-by: David Cook <dcook@prosentient.com.au>

Works as described.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 07:16:06 -04:00
Jared Camins-Esakov
19d042a833 Merge branch 'bug_4862' into 3.12-master 2013-04-03 07:09:22 -04:00
Liz Rea
17b38f15a7 bug 4862 - Change label of Browse by subject or author to Authority search
Replicate:
Load the OPAC
You should see "Browse by Subject or Author right below the search box

To test:
Apply patch
Load the OPAC
You should see "Authority search" where "Browse by Subject or Author" was .

Signed-off-by: Mason James <mtj@kohaaloha.com>
Amended patch: change strings in opac-authorities-home.tt

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 07:08:52 -04:00
Jared Camins-Esakov
87a070d74a Merge branch 'bug_9683' into 3.12-master 2013-04-03 07:03:52 -04:00
Fridolyn SOMERS
b9c2c58fe6 Bug 9683: Allow disable rewrite apache mod
In Apache config koha-httpd.conf, URL-rewriting is enabled and does not
allow to disable mod_rewrite. Also, first rewriting rule
"RewriteRule (.+) $1?%1%2 [N,R,NE]" is enabled by default. This rule
rewrites nearly every URL. I propose to comment it in sources so that is
must be intentionally enabled.

This patch sets rewriting options into a conditional tag.

Test plan :
Test OPAC and intranet with and without mod_rewrite activated.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The new Apache configuration seems to work fine (or at least as "fine"
as Apache gets) both with and without mod_rewrite enabled.
2013-04-03 07:02:54 -04:00
Jared Camins-Esakov
cb86132048 Merge branch 'bug_9877' into 3.12-master 2013-04-03 06:16:29 -04:00
Jonathan Druart
09b8622b4e Bug 9877: Followup: FIX if the table is empty.
If there is no data, we don't display the table.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 06:16:15 -04:00
09af6d03f5 Bug 9877 - Use DataTables on funds administration page
Replace the tablesorter plugin with the DataTables plugin on the funds
administration page.

To test, open the funds administration page (Administration ->
Funds). Confirm that table sorting, paging, and searching works
correctly.

Note that the table is sorted only when hierarchical display of parent
and child funds is not enabled. When the hierarchicial display is
enabled the table sorter is not triggered.

Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>

Post-QA revision adds handling for empty table: "No funds" row must have
same number of cells as the rest of the table (including hidden cell);

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 06:16:14 -04:00
Jared Camins-Esakov
aad7490058 Merge branch 'bug_9970' into 3.12-master 2013-04-03 06:12:14 -04:00
93db077cb2 Bug 9970 - Add datepicker default configuration to OPAC patron entry form
The datepicker on the OPAC patron entry/update form
(opac-memberentry.pl) doesn't show a calendar icon. This is because
although there is in-page JS to trigger the widget, the page doesn't
include the file which sets some widget defaults, including the path to
the calendar icon and the translatable strings for calendar labels.

This patch simply adds calendar.inc to the template.

To test, load the patron entry/update form (click "personal details" for
an existing patron or a start new patron registration). The date of
birth entry field should show a calendar icon.

Signed-off-by: David Cook <dcook@prosentient.com.au>

Test plan works as described. Looks much better.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 06:12:11 -04:00
Jared Camins-Esakov
f531af3b13 Merge branch 'bug_9535' into 3.12-master 2013-04-03 06:09:08 -04:00
Chris Nighswonger
c70c7185dc Bug 9535 - Patron card creator "Remove duplicates" function doesn't work
This bug was due to a difference in field names used in the item data
for items versus patrons. This patch adds a ternary to discern between
the two.

To test:

Before applying patch:

1. Create a batch of patroncards with one duplicate.
2. Run the de-duplication on the batch.
3. Note that all patrons beyond the first in the batch are now
   deleted.

After applying patch:
4. Repeat steps 1-2.
5. Note that only the duplicate patron is removed.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested successfully with both patron card batches and label batches.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Add indentation for readability
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 06:09:06 -04:00
Jared Camins-Esakov
9d784c57de Merge branch 'bug_9971' into 3.12-master 2013-04-03 06:02:13 -04:00
86f7f58992 Bug 9971 - Plugins system is broken!
Trying to run a plugin results in the following error:

Software error:

Undefined subroutine &Koha::Plugins::Base::get_template_and_user called
at /home/koha/kohaclone/Koha/Plugins/Base.pm line 108.

The is caused by the change from 'use C4::Auth' to 'require C4::Auth'
which does not export get_template_and_user.

Test Plan:
1) Install the KitchenSink plugin
2) Try to run the report, tool or configuration for the plugin
3) Note the error
4) Apply the patch
5) Try again

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 06:02:09 -04:00
Jared Camins-Esakov
f3d5bd5aa6 Merge branch 'bug_2835' into 3.12-master 2013-04-02 09:03:46 -04:00
1b3b942409 Bug 2835 - Inconsistent use of colon at the end of sentences
Labels which precede a text input or select typically have a colon
before them:

Name: [____]

This patch cleans up templates where labels in this context lack a
colon. Exceptions to this rule include radio buttons, checkboxes, and
labels inside tables.

To test, view the affected pages and confirm that labels look
consistent.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch adds more consistency.
Work for translators could be made easier using CSS instead
of whitespace after colon.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-02 09:03:42 -04:00
Jared Camins-Esakov
d802961ccb Merge branch 'bug_9947' into 3.12-master 2013-04-02 08:58:54 -04:00
Fridolyn SOMERS
2643f0ec39 Bug 9947 - Creating item for received serial prefills enumchron subfield
In serial receiving :
When creating an item for an issue, a javascript prefilles the $h subfield with issue number.
This is for MARC21, in UNIMARC serial number is on $v.

This patch replaces hard-coded value with the subfield mapped with "items.enumchron".

Test plan :
- Set "Koha to MARC mapping" of "items.enumchron" on a subfield other than $h, ie $z
- Go to a serial subscription detail with "Serial receipt creates an item record"
- Click on "Receive"
- On an issue, click on "Click to add item"
=> Check that issue number is copied into selected subfield, ie $z
You may test that with no mapping of "items.enumchron" there is no javascript error

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Nice catch! Works as advertised.
All tests pass after fixing tabulation characters in serials-edit.tt.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-02 08:58:52 -04:00
Jared Camins-Esakov
eed93f9af0 Merge branch 'bug_9572' into 3.12-master 2013-04-02 08:56:44 -04:00
Jared Camins-Esakov
6dfe8e1ee3 Bug 9572 follow-up: duplicate jQueryUI upgrade in CCSR
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-02 08:56:23 -04:00
0ef11f893f Bug 9572 - Opac info tooltip from branches is not well positioned
This patch removes the jQuery plugin previously used to display the
library information tooltip on opac-detail.pl and implements the
functionality using jQueryUI's tooltip widget. jQueryUI has been
upgraded to 1.9.2 in the process, which required some ammendments to
jQueryUI-related CSS.

To test, make sure at least one of your libraries has "OPAC info" stored
as part of its configuration. View a record in the OPAC which is owned
by that library. Hover over the library's name in the holdings table and
you should see a properly-positioned tooltip showing the "OPAC info."

Also test other jQueryUI-related functionality to confirm that the
upgrade didn't break anything: Tabs and datepickers should still work
correctly.

Signed-off-by: Frederic Durand <frederic.durand@unilim.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely in prog theme, feature seems not to be available
for ccsr yet.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-02 08:56:23 -04:00
Jared Camins-Esakov
f737119e76 Merge branch 'bug_9609' into 3.12-master 2013-04-02 08:41:43 -04:00