Commit graph

5021 commits

Author SHA1 Message Date
Jonathan Druart
4293901baf Bug 5888: Followup add a syspref (OPACPopupAuthorsSearch)
New syspref OPACPopupAuthorsSearch.
If it is disabled, the development has no effect.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:48:42 -05:00
81c90ba3bf Bug 8913 [Revised] Improve acquisitions navigation
This patch adds a new menu for vendor-related pages in which
vendor related "views" can be linked to: baskets, basket groups,
contracts, invoices, uncertain prices.

The acquisitions toolbar is pared down to vendor-related actions:
New basket, contract, or vendor; edit vendor, delete vendor,
receive shipment.

Other small improvements have been made to other pages: corrections
to breadcrumbs and title tags, adding useful links betweeen pages.

Vendor menu and toolbar are added to booksellers.pl
when there is only one "search result" (i.e. a vendor id is passed).

- Menu appears when booksellerid variable is present
- Redundant heading removed
- Additional variables added to enable proper display of the toolbar

- Revision corrects broken links pointed out by QA.
- Revision adds check of existing baskets and subscriptions as a
  condition on display of the vendor delete button.

TODO: Add coverage of Basket groups page.

To test, navigate Acquisitions pages and test as many links and buttons
as you can, confirming that nothing is broken on vendor pages, invoice
pages, contract pages, uncertain price pages, etc.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

All tests pass - I like this very much!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
1) New toolbar - vendor search
  - no results = button to create new vendor shows
  - 1 result = additional new options show
  - more than one result = button to create new vendor shows

2) Vendor views
  - acq toolbar consistent with 1 result in vendor search
  - new tabs on the left
  - checked all links have the needed parameters and work correctly

3) New toolbar - different pages
  - Toolbar is formatted consistently
  - Delete vendor shows only up when it should - no baskets or
    subscriptions
  - Links work correctly

Works nicely, great groundwork for further improvements.

TODO Add new toolbar to (new) invoices page.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:17:21 -05:00
Vitor FERNANDES
a7eb883282 Bug 8347 - Koha forces UNIMARC 100 field code language to 'fre'
Forget to add the system preference to the template.

Signed-off-by: Rolando Isodoro <rolando.isidoro@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:06:31 -05:00
Vitor FERNANDES
2b5067b0f9 BUG 9145: Authorities: standard language for UNIMARC
New Authority system preference created UNIMARCAuthorityField100 with default value "afrey50      ba0".
AuthoritiesMarc.pm uses the system preference instead of label "afrey50      ba0".

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, all tests and QA script pass.

1) Check system preference is created correctly.
2) Change pref.
3) Catalog a new authority.
4) Change framework to make 100 show in frameworks or check in the
   the database, that now 100 has the new defined value.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:42:10 -05:00
0cdef9334d Bug 9615 - Combine staff home page images into single sprite
In order to reduce the number of concurrent downloads on the staff
client home page the images representing the various modules (circ,
patrons, etc) could be combined into one sprite.

This patch creates a new sprite containing all images and corrects the
CSS for the default and hover states of each link to match the previous
version. The separate images have been removed. Also added is a
GIMP-compatible Photoshop file from which the sprite is generated.

To test, apply the patch, clear your browser cache, and view the staff
client home page. Each module icon should look correct in its default
and hover states.

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

Comment: Work as described, Good idea! No errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:29:22 -05:00
d60c282ba0 Bug 9625 - Replace YUI buttons and menus on reports pages with Bootstrap
This patch converts the toolbar include file used by guided/SQL report
pages to Bootstrap, replacing YUI button and menu code with Bootstrap
markup.

To test, view any page in reports/ which uses reports-toolbar.inc
(Saved reports, Guided reports, SQL reports). Buttons and menus should
look correct and work correctly.

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

Comment: Works as described. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, logic is correct. Toolbar differs, depending
on the action: show report, list of reports, edit report.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:27:15 -05:00
a03c6ce587 Bug 9650 - Show message if there are no notices
When there are no notices for the selected library, the
interface displays a table header with an empty table.

This patch adds a message which appears when there are no
notices for the selected library, or if no library selected
and there are no notices at all.

To test, visit the notices and slips page and
select a library for which there are no notices. A message
should be displayed, "There are no notices for this library."

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

Comment: Work as described. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:25:33 -05:00
Jared Camins-Esakov
aeb61b7528 Bug 9658: Incorrect breadcrumb on report dictionary
Prior to this patch, the breadcrumb on the reports dictionary looks
like this: Home > Reports > Guided reports wizard Dictionary (notice
the lack of punctuation between "wizard" and "Dictionary").
This patch makes it consistent with the rest of the system so it looks
like this: Home > Reports > Guided reports wizard > Dictionary

I left dictionary bolded, since that seems to have been intentional,
even if I can't find a good reason for it.

To test:
1) View reports dictionary page before and after patch is applied,
   observing difference.

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

Comment: Trivial patch. Work as described. No errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:21:56 -05:00
Bernardo Gonzalez Kriegel
d2c627fff7 Bug 9655 - Capitalization wrong on 'Close and Print' button in basket groups
This patch fix button capitalization on basket groups for a vendor.

To test:
1) Go to Acquisitions, search for a vendor, click on vendor name,
Manage orders > Basquet groups
2) On Open tab, action button "Close and Print" has incorrect capitalization.
3) Apply the patch
4) Reload or repeat 1-2, capitalization fixed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works perfectly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:20:47 -05:00
Bernardo Gonzalez Kriegel
663f92f1b7 Bug 9651 - When deleting a fund, button is wrongly labelled with 'Delete this budget'
This patch change legends to approve/cancel deletion of a fund.
Changed to Delete/Cancel, same messages to delete a Budget.

To test:
1) When deleting a fund, confirmation messages said:
'Delete this budget XXX?' to approve
'No, do not delete' to cancel
2) Apply the patch
3) Now the messages are 'Delete'/'Cancel'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works perfectly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:00:40 -05:00
Jared Camins-Esakov
2b61128842 Merge branch 'bug_7969' into 3.12-master 2013-02-19 11:04:52 -05:00
d9deb165db Bug 9646 - Replace YUI button on the printers administration page with Bootstrap
This patch converts the toolbar on the printers administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the printers administration page and confirm that the "New
printer" button looks correct and works correctly.

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

Comment: Works well. No errors.
Off-topic: How do you access this page? I can't find a link
(tested using .../cgi-bin/koha/admin/printers.pl)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works well, no problems found.
Accessed printers page manually: /cgi-bin/koha/admin/printers.pl
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:11:25 -05:00
f2da479668 Bug 9645 - Replace YUI buttons on the quotes management page with Bootstrap
This patch converts the toolbar include file used by the quotes editor
to Bootstrap, replacing YUI button and menu code with Bootstrap markup.

To test, view any page in the quotes editor. Buttons and menus should
look correct and work correctly. Test save, delete, and upload buttons
on the summary page, and save and delete buttons on the upload page.

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

Comment: All buttons work. Tested add, delete and upload.
You are using icon-remove and not icon-remove-circle,
which I prefer but is different of Bug 9627.
Question: "Import quotes" takes you to "Quotes uploader",
would not it be more consistent to use "Upload quotes" or
"Quotes importer"?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
I think the difference to 9627 is, that this really deletes
quotes, while the icon-remove-circle is used for closing subscriptions.
Closed subscriptions remain in the system, it's just a way to indicate
that there will be no new issues. There is a separate option to really
delete subscriptions.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:09:57 -05:00
fe13e889ee Bug 9644 - Replace YUI button on the suggestions management page with Bootstrap
This patch converts the toolbar on the suggestions page to to Bootstrap,
replacing YUI button code with Bootstrap markup.

To test, view the suggestions page and confirm that the "New purchase
suggestion" button looks correct and works correctly.

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

Comment: Another confirmation. Button looks and works. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:08:33 -05:00
389cb14012 Bug 9643 - Replace YUI button on the road types administration page with Bootstrap
This patch converts the toolbar on the road types administration
page to to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the road types administration page and confirm that
the "New road type" button looks correct and works correctly.

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

Comment: Confirmed, button works and looks correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:07:33 -05:00
775ed7d0bc Bug 9642 - Replace YUI button on the patron attribute types page with Bootstrap
This patch converts the toolbar on the patron attributes administration
page to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the patron attribute types administration page and confirm
that the "New patron attribute type" button looks correct and works
correctly.

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

Comment: Button looks and works correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:06:49 -05:00
f566e7f89b Bug 9641 - Replace YUI button on the Koha news management page with Bootstrap
This patch converts the toolbar include file used by the Koha news
editor to Bootstrap, replacing YUI button and menu code with Bootstrap
markup.

To test, open the Koha news editor and test the "New entry" button. It
sould look correct and work correctly.

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

Comment: The button works and looks correct. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:05:51 -05:00
41dc6c962f Bug 9640 - Replace YUI button on record matching rules page with Bootstrap
This patch converts the toolbar on the matching rules administration
page to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the matching rules administration page and confirm that
buttons look correct and work correctly.

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

Comment: Button look and work correctly. No errors.
There's only one button.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:04:46 -05:00
0e8f896e85 Bug 9639 - Replace YUI button on MARC tag structure toolbar with Bootstrap
This patch converts the toolbar used on the MARC tag structure toolbar
to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view marctagstructure.pl for any framework. Confirm that the
'New tag' button looks correct and works correctly.

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

Comment: Confirmed that 'New tag' looks and works correctly.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:03:33 -05:00
9c5796de72 Bug 9637 - Replace YUI button on local use system preferences page with Bootstrap
This patch converts the toolbar on the local use system preferences page
to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the local use system preferences page (the "local use" tab
on the main System preferences page) and confirm that the "New
preference" button looks correct and works correctly.

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

Comment: Works and looks very well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Removed incorrect Javascript comment about YUI.
2013-02-18 08:59:41 -05:00
d0d2a961db Bug 9636 - Replace YUI buttons on labels pages with Bootstrap
This patch converts the toolbar include file used by the label manager
to Bootstrap, replacing YUI button and menu code with Bootstrap markup.

This patch converts the previous menu buttons to plain buttons,
removing the redundant links to the manage pages, which are in the
left-hand sidebar. This keeps toolbar buttons within the general
category of "action" (as opposed to "view").

This patch also removes an unused include file, labels-new-toolbar.inc

To test, view the labels home page and any of the label manage pages
(layouts, templates, profiles, batches). Buttons should look correct
and work correctly.

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

Comment: Work as described. No errors.
Nicole is not going to be happy, images in Label creator section
of manual needs to change :)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, I was wondering if we should have the plus icon
on those buttons like we have on the other 'New' buttons.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:57:34 -05:00
fd680afc6f Bug 9635 - Replace YUI buttons on label batches pages with Bootstrap
This patch converts the toolbar used by label batches pages to
Bootstrap, replacing YUI button and menu code with Bootstrap markup.

This patch also consolidates the include file and main template. The
include file was used in only one template.

To test, create a label batch and test all functions related to that
batch: adding and removing items, de-duplicating the batch, exporting
individual items, exporting the batch, and deleting the batch. Buttons
should look correct and work correctly.

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

Comment: Work as described, no errors.
Tested all functions (add, del, de-duplicate, export item, export batch)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:55:55 -05:00
f0efd4de31 Bug 9633 - Replace YUI button on the itemtypes administration page with Bootstrap
This patch converts the toolbar on the itemtypes administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

Small unrelated edit: Button label text case correction.

To test, view the itemtypes administration page and confirm that the
'New item type' button looks correct and works correctly.

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

Comment: Work and look correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:53:11 -05:00
3e45a2fde1 Bug 9632 - Replace YUI button on the currencies administration page with Bootstrap
This patch converts the toolbar on the currencies administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the currencies and exchange rates administration page. The
'New currency' button should look correct and work correctly.

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

Comment: Work and look correctly. No errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:51:45 -05:00
c4631937f3 Bug 9631 - Replace YUI buttons on classification sources administration page with Bootstrap
This patch converts the toolbar on the class sources administration page
to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the class sources administration page. Buttons should look
correct and work correctly.

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

Comment: Works as described. Change "rules" to singular.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.

http://bugs.koha-community.org/show_bug.cgi?id=9613
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:50:22 -05:00
5d14cef0cc Bug 9630 - Replace YUI button on cities and towns administration page with Bootstrap
This patch converts the toolbar button on the cities
administration page to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, view the cities administration page and confirm that the
"New city" button looks correct and works correctly.

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

Comment: Works as described, looks correct and works correctly.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:48:36 -05:00
11546a2ee1 Bug 9629 - Replace YUI button on patron category administration page with Bootstrap
This patch converts the toolbar used by the patrons
[category] administration to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, view the patrons [category] administration page and confirm that
the button looks correct and works correctly.

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

Comment: Work as described, looks correct and works correctly.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:47:28 -05:00
8b648c94f9 Bug 9628 - Replace YUI buttons and menus on budgets administration pages with Bootstrap
This patch converts the toolbar include file used by budgets
administration pages to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, create, view, and edit budgets. Buttons and menus should look
correct and work correctly. Functions include:

- New budget
- New fund
- Edit budget
- Duplicate budget
- Plan by (months, libraries, etc)

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

Comment: Work as described. No error.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:24:37 -05:00
aa3ff32c9d Bug 9627 - Replace YUI buttons and menus on serials pages with Bootstrap
This patch converts the toolbar include file used by Serials pages to
Bootstrap, replacing YUI button and menu code with Bootstrap markup.

To test, view any page in serials/ which uses serials-toolbar.inc
(subscription-detail.pl, serials-home.pl, etc).
Buttons and menus should look correct and work correctly, including:

- New subscription
- Edit subscription
- Edit as new (duplicate)
- Delete subscription
- Renew
- Receive
- Close

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

Comment: Work as described. No errors.
For me it would be better to use icon-remove, because icon-remove-circle
shows a little cross, think that a bigger cross is more clear.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
I think there is a point in differentiating between closing and deleting,
so the icon-remove-circle is maybe not ideal, but the icon-remove
would falsely indicate a delete. Maybe we can find another icon that
expresses the functionality a bit better later on.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:22:59 -05:00
629bd2f813 Bug 9624 - Replace YUI button on reports dictionary page with Bootstrap
This patch removes the toolbar include file used by the reports
dictionary and embeds the toolbar markup directly in the main
template since it's the only instance where it is used.
Toolbar is converted to use Bootstrap, replacing YUI button code
with Bootstrap markup.

To test, view the reports dictionary and confirm that the "New
definition" button looks correct and works correctly.

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

Comment: Work as described. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:08:15 -05:00
e299c69d43 Bug 9623 - Replace YUI button on authority types administration page with Bootstrap
This patch converts the toolbar on the authority types administration
page to to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the authority types administration page and confirm that
the "New authority type" button looks correct and works correctly.

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

Comment: Work as described. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:07:13 -05:00
65d46ca2d1 Bug 9622 - Replace YUI button on MARC fameworks page with Bootstrap
This patch converts the toolbar on the MARC frameworks administration
page to to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the MARC frameworks administration page and confirm that
the "New framework" button looks correct and works correctly.

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

Comment: Work as described. No errors. Look good.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:05:33 -05:00
dfae3fd997 Bug 9621 - Replace YUI menu on lists pages with Bootstrap
This patch converts the toolbar include file used by lists pages to
Bootstrap, replacing YUI button and menu code with Bootstrap markup.

To test, view any page in virtualshelves/ which uses
virtualshelves-toolbar.inc (shelves.pl). Buttons and menus should look
correct and work correctly when viewing own lists, others' lists, etc.

Revised: corrected bug number and title
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. No error. Looks very good.
As well as Bug 9616 the result is 10px downward from the original.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, on problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:03:42 -05:00
fc394a3e05 Bug 9619 - Replace YUI buttons on libraries administration page with Bootstrap
This patch converts the toolbar used by libraries administration
to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, view any the branches administration page and confirm
that the buttons to add a library and add a category look
correct and work correctly.

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

Comment: Both buttons, Library and Group, works and look well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 07:59:15 -05:00
380564e534 Bug 9616 - Replace YUI menu on patrons page with Bootstrap
This patch converts the toolbar include file used to create the "New
patron" menu to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, view any page which uses patron-toolbar.inc (members-home.pl or
circulation.pl after searching for a non-existent patron). Button and
menu should look correct and work correctly with the AddPatronLists
preference in both states.

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

Comment: Works as described. No errors. Looks very good!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 07:57:38 -05:00
eedd8a8d4b Bug 9648 - Replace YUI buttons on authorized values administration page with Bootstrap
This patch converts the toolbar on the authorised values administration
page to to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the authorised values administration page and confirm that
the "New authorized value..." and "New cateogry" buttons look correct
and works correctly.

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

Comment: Both buttons works and look correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 07:55:33 -05:00
0c8a760a83 Bug 9647 - Replace YUI buttons on Z39.50 servers administration page with Bootstrap
This patch converts the toolbar on the Z39.50 administration
page to to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the Z39.50 administration page and confirm that
the "New Z39.50 server" button looks correct and works correctly.

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

Comment: Works and looks very well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 07:52:31 -05:00
Vitor FERNANDES
6dcd8f235f Bug 9395: Problem with callnumber and standard number searches
This problem happens because there isn't a operator "phr" in the values
of callnumber and standard number search. So many results aren't the
corrects ones.

Test plan:

- Apply the patch
- In the dropbox search menu of OPAC main page header, the callnum
  should have only callnum
- In OPAC advanced search the callnumber and standard number options
  shouldn't have "phr"
- In staff client advanced search the callnumber and standard number
  options shouldn't have "phr"
- Change OPACNumbersPreferPhrase and IntranetNumbersPreferPhrase to "use"
- The options listed before should use now the operator "phr"
- This will resolve the problems with the searches of callnumbers and
  standard numbers in OPAC and staff client (spaces problems, no
  results, inconsistent results, etc...)

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

I don't know how to reproduce the searching problems described in the
bug, but I can confirm that the patch works correctly to enable/disable
the use of 'phr' in the searches described in the test plan.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
System preferences work as described, switching indexes in
OPAC and staff.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 18:30:15 -05:00
e362644218 Bug 7969 - select all / unselect all on fines page
This patch adds "select all" and "clear all" links to the pay fines page
so that checkboxes which are all checked by default can be easily
unchecked and selected individually.

This patch also moves the column of checkboxes to the start of the table
in order to conform to common practices.

To test, vew the "Pay fines" page for a patron who has outstanding
charges on their account. Confirm that the "select all" and "clear all"
links work correctly and that payment and writeoff functionality is not
changed.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 09:11:48 -05:00
Jonathan Druart
32584801df Bug 8906: Followup replace 'Clear' with 'Delete'
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 09:08:10 -05:00
Jonathan Druart
82daf63b05 Bug 8906: Followup FIX hardcoded localhost url
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 09:08:10 -05:00
f958f83106 Bug 8906 - Improve OAI management interface
Revising OAI configuration interface to conform to
existing interface patterns:

- Properly-formatted form rows
- "clone" and "clear" links consistent with other
  forms which use these conventions
- Improved title and breadcrumbs
- Standard save and cancel markup

New to the mappings interface: A "clear" button
to remove or empty the contents of a row. This replaces
the help text about emptying fields.

To test: view, add and edit OAI sets and mappings. Try adding
and removing multiple set descriptions and mappings.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 09:08:10 -05:00
2244905303 Bug 9420 [Revised] Work on Bootstrap for Koha: Circ toolbar
This patch converts the toolbar include file used by Circ and
Patron pages to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, view any page in circ/ or members/ which uses
members-toolbar.inc (circulation.pl, moremember.pl, etc).
Buttons and menus should look correct and work correctly.

This version adds icons to the toolbar from the icon sprite included
with Bootstrap and revises the sprite to include two new ones, for
"copy" and "place hold" (for use in later patch). This customized
version is left in intranet-tmpl/img in order to keep
koha-tmpl/lib/bootstrap free of customized files.

Also added in this patch, a CSS tweak to override a style in the default
Bootstrap CSS for a class "close" which is already in use by Koha. To
replicate the Boostrap "close" class use "closebtn"

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

Comment: All buttons works, and they look good.
Tested with Chrome and Firefox. In Chrome I see the buttons with
drop-down a little (1px) below the others.
In Firefox the alignment is ok.
No errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 09:04:17 -05:00
ecf42ffbd0 Bug 9420 [Revised] Work on Bootstrap for Koha
YUI JS is deprecated as far as Koha is concerned, and jQueryUI menus
don't seem to be as robust as they should be. This makes Twitter
Bootstrap very attrative for its menus features as well as other
aspects.

This patch revises the staff client header menu to include features from
Bootstrap, including replacement of the YUI-driven "More..." menu with a
Bootstrap version, and a new user menu taken from Corey Fuimaono's
similar patch.

To test, be sure to clear your cache after applying the patch. Load any
page in the staff client and confirm that the menu at the top of the
screen looks correct and works as normal, including functionality of the
"more" menu. Confirm that the username/logged-in branch triggers a menu
with "set library" and "log out" options. Confirm that Cart operations
trigger the correct confirmation popup.

Revision moves the Bootstrap assets out of the prog template into
koha-tmpl/intranet-tmpl/lib.

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

Works great. No errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 09:04:17 -05:00
04152027d6 Bug 9460 - Use DataTables on transfers to receive report page
Replace the tablesorter plugin with the DataTables plugin on the
transfers to receive report page.

To test, open the transfers to receive report page (Circulation ->
Transfers to receive). Confirm that table sorting works correctly on
each of the tables. In this configuration there is no filtering or
pagination.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 08:47:43 -05:00
ebab8dcdfe Bug 9461 [Revised] Use DataTables on holds awaiting pickup report page
Replace the tablesorter plugin with the DataTables plugin on the
holds awaiting pickup report page.

To test, open the holds awaiting pickup report (Circulation
-> Holds awaiting pickup). Confirm that table sorting works correctly on
all tables.

Revision makes default result count (20) match options for number of
pagination entries (10,20,50,100,all).

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 08:44:14 -05:00
e6de6828dd Bug 9465 - Use DataTables on update child to adult patron page
Replace the tablesorter plugin with the DataTables plugin on the
update child to adult patron page.

Added default sort by patron category description (ascending).

To test, open a patron with a child category type. Choose the 'Update
child to adult patron' item from the 'More' menu. Confirm that
table sorting works correctly in the popup.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 08:41:46 -05:00
e1b590ed92 Bug 9467 - Use DataTables on catalog by item type report page
Replace the tablesorter plugin with the DataTables plugin on the
catalog by item type report page.

To test, run the catalog by item type report (Reports -> Catalog by
item type). Confirm that table sorting works correctly.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 08:36:10 -05:00
71b338044b Bug 9385 - patron add labels right aligned in chrome
The <legend> element has been given right alignment which seems to only
be respected by WebKit-based browsers. Users of Chrome and Safari see a
right-aligned legend while others see a left-aligned one. Given that the
legend is often applied to fieldsets spanning much of the screen it
seems wiser to have them left-aligned.

This patch removes "text-align:right" from the CSS so that <legend> will
inherit the default left alignment. To test, view any page with a legend
element, for instance the patron add form. In Firefox, Chrome, Safari,
IE, etc. the legend ("Patron identity," "Main address," etc.) should be
left-aligned in the fieldset.

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

Comment: Works as described. Tested in IE, Chrome, Firefox, Opera.
No errors.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 08:30:22 -05:00
Jonathan Druart
51ea29316d Bug 9545 - Followup Fix import MARC bibliographic framework text label
The export action for the default framework did not work.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 08:27:40 -05:00
a24eda9914 Bug 9545 - Fix import MARC bibliographic framework text label
This patch improves the labeling of import controls on the
MARC frameworks page by making import options more explicit. Other
changes:

- Form markup fixed to match standard form constructions
- JavaScript corrected to make more embedded English strings
  translatable.
- Form labels made clickable by making "for" attributes match unique
  form field ids.
- Some warning re-worded for readability and translatability.
- Large "loading" icon replaced with more proportional smaller one.

To test, view the MARC frameworks page (admin/biblio_framework.pl) and
test Export and Import functionality. Clicking each should display a
form with options clearly labeled. Import and Export operations should
complete correctly.

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

Works as described, although I see what Owen means about it being a good candidate for replacement with a modal dialog box in the future.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 08:27:39 -05:00
f068328e33 Bug 9608 - White background on header on check in
The white background behind the header search form on the checkin
page appears because the search include is missing a <div> which carries
the background gradient CSS. This patch adds the missing markup to the
checkin search header include file and 6 others.

To test, view the following pages and confirm that the normal gradient
background appears behind the header search form:

- Checkin
- Contracts administration
- Currencies administration
- Notices and slips
- Printers administration (admin/printers.pl)
- Stop words administration (admin/stopwords.pl)
- Adding an order to a basket from a suggestions (Acquisitions -> Basket
  -> Add order to basket -> From a suggestions).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-15 07:49:13 -05:00
Jared Camins-Esakov
6d75a4c714 Bug 7608: Manual history should not always be enabled
When editing a subscription, the "manual history" block is visible even
if the subscription was created with manual history off.

To test:
1) Create a subscription and do not check the "Manual history" checkbox.
2) Save the subscription.
3) Edit the subscription. Note that the manual history section does not
   appear.
4) Enable manual history. Note the appearance of the manual history
   section.
5) Save the subscription.
6) Edit the subscription. Note that the manual history section appears.
7) Click "[cancel manual history]". Note the disappearance of the manual
   history section, and the unchecking of the "Manual history" checkbox.
8) Sign off on patch.

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-02-15 07:46:51 -05:00
Fridolyn SOMERS
5c627db14f Bug 7253: followup : manage toolbar for fastcataloging
During fast cataloging, hide some toolbar menus of biblio edition page :
- Save and view record
- Z3950 Search
- Framework change
Also display "(fast cataloging)" in biblio and item editon.

Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

Tested:
- adding a fast add with duplicate and without
- adding a new record, checked toolbar showed up correctly
- editing existing record, checked toolbar showed up correctly
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 10:00:37 -05:00
Fridolyn SOMERS
67af102586 Bug 7253: fast cataloging not always checking out
When using fast cataloguing to create a biblio and item on the fly, workflow looses datas when a duplicate is detected.
This comes from the use of a mix of circborrowernumber and borrowernumber in forms.

This patch corrects by using always circborrowernumber in fast cataloguing workflow.
Also adds html and uri escape for barecode where necessery.

Test plan :
With duplicate :
- Go to a borrower circulation page
- Enter a non existing barcode
- Enter a due date
- Click on "Check Out"
=> a message says the barcode was not found
- Click on "Fast cataloguing"
=> The biblio edition page appears with fast cataloguing framework
- Fill mandatory fields by using an existing ISBN
- Click on "Save"
=> a yes/no message says "Duplicate record suspected"
(Choosing yes will brake fast caloguing workflow, in this case librarian should create an item and checkout again)
- Click on "No"
=> The item edition page appears with barcode already filled
- Fill mandatory datas
- Click on "Add item"
=> Borrower circulation page appears again, check that item has been checked out with the specified due date

You may test without duplicate

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested following the plan and by fast cataloging a non-duplicate.
All works as expected.

Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 10:00:37 -05:00
a4d1fd124b Bug 9471 - Use DataTables on serials claims page
Replace the tablesorter plugin with the DataTables plugin on the
serials claims page.

This patch replaces some custom table fitlering code with code which
uses DataTables' built-in table fitlering. A minor correction to markup
has also been made to properly align inputs in the filter form.

To test, run the serials claims report for a vendor with data which will
populate results. Confirm that table sorting works correctly. Confirm
also that filtering by title and branch works.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Works as advertised. I have compared side by side the both pages, with
tablesorter, and with DataTables. The both work. No regression. With
DataTables, no more sorting on Begin clam column, which is great. A new sort
option may be usefull on the Library column (wasn't the with tablesorter
neither).

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 09:14:46 -05:00
2cf41d31ff Bug 9462 [Revised] Use DataTables on patron detail page
Replace the tablesorter plugin with the DataTables plugin on the
patron detail page.

To test, open a patron detail page for a patron who has checkouts,
holds, and relatives' checkouts. Confirm that table sorting works
correctly for each of those three tables.

Revision adds some JavaScript designed to handle table-sizing for tables
which are hidden initally in tabs. DataTables has an approved method for
handling these cases:
http://www.datatables.net/examples/api/tabs_and_scrolling.html

This should prevent the table of existing holds from looking squeezed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 09:04:52 -05:00
3c0b1f6225 Bug 9469 - Use Datatables in serials statistics wizard
Replace the tablesorter plugin with the DataTables plugin on the
serials staitsics wizard report.

To test, run the serials statistics wizard (Reports -> Serials). Confirm
that table sorting works correctly.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Works with DataTables as it used to work with tablesorter.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 08:59:43 -05:00
33c4c574f3 Bug 9323 [Counter-proposal] Untranslatable string in serials search
The translator seems to have a problem with the _() function inside
HTML. Rather than move only the translatable string to the <script>
block, why not move all of the JavaScript to the <script> tag? This
keeps things a little more organized and lets us follow the guideline to
always use double quotes with _().

Same test plan as Jonathan's patch:

- translate update LANG
- Check in your po file that the string "Are you sure you want to
  reopen this subscription?" does not exist.
- Apply the patch
- translate update LANG
- Check in your po file that the string is translatable

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String is now translatable.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 08:44:54 -05:00
Fridolyn SOMERS
4a5795e320 Bug 9222: manual history reversed in subscription-detail.pl
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-10 13:15:43 -05:00
d68b8357d7 Bug 9283 - Change structure of export checkouts form
This patch changes the structure of the export checkouts form
so that it is a little more linear. This change moves generation of the
export options from JavaScript to the markup, eliminating an instance
of dependence on YUI menus.

To test, enable checkout exports by specifying a value for
ExportWithCsvProfile or  ExportRemoveFields. Load a patron with
checkouts in circulation. Try the various checkout export options. Each
should function correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-08 09:48:10 -05:00
0131b9e697 Bug 9417 - Allow number of results per page to be selectable for guided reports
This patch adds the ability to select the number of row to show per page while
retaining the default rows per page as 20.

Test Plan:
1) Apply patch
2) Run a guided report that will have many resultant rows
3) Try the various rows per page options
4) Verify the rows per page selected is retained when paging through results

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-02-08 09:34:54 -05:00
Adrien Saurat
8bae2c9916 Bug 9332: Display call number in "Holds waiting" notice
When checking out from a patron page, a notice "Holds waiting" appears
if a biblio (on hold) is waiting for this borrower.
This patch adds the call number information to this warning.

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

Nice little improvement, thanks.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-08 09:23:51 -05:00
Julian Maurice
47cf483f57 Bug 9034: Filters are disabled by default
A small link above the table allow to enable this feature.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Replace single quote strings with double quote strings
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 19:36:15 -05:00
715826b799 Bug 9034 [Follow-up] Add sorting and filtering on items table (catalogue/detail.pl)
This follow-up to the original patch offers an alternative method
to handle the width of the table and form fields:

- Reduce the font size of the filter input fields
- Make the filter inputs' width 100% instead of fixed
- Add "'bAutoWidth': false" to the datatables initialization
  to prevent the table width from being set to the browser window
  width on load. This allows the browser to be re-sized and have
  the table re-flow with it.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 19:35:51 -05:00
Julian Maurice
3e69121299 Bug 9034: Add CSS rule to reduce width of items table
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 19:35:51 -05:00
Julian Maurice
74d11c4b80 Bug 9034: Add sorting and filtering on items table (catalogue/detail.pl)
This patch introduces a new javascript plugin for dataTables
(columnFilter).

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 19:35:51 -05:00
Galen Charlton
9912e38404 Bug 9556: fix setting messaging prefs when changing patron category
As a result of accumulated changes to field names returned
by the members/default_messageprefs.pl service, the JavaScript
to change the patron messaging preferences to the category default
when changing a patron's category in the patron editor stopped
working.

To test:

[1] Turn on the EnhancedMessagingPreferences feature.
[2] Set message preference defaults for at least two
    patron categories.
[3] Before applying the patch, create a new patron record
    using one of the categories you set prefs for, then
    change the category, then change it back again.  You
    will see that numeric settings like the number of days
    for advanced notices will change, but checkboxes won't change.
[4] Apply the patch, then create a new patron record and
    try changing the patron category.  You will see that all of
    the preferences will get updated to the category default
    each time you change the category.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
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-02-07 08:37:17 -05:00
a63960acc7 Bug 9473: Use DataTables on tags list page
Replace the tablesorter plugin with the DataTables plugin on the tags
list page.

To test, got to tags moderation and click on a term which tags
multiple titles. On the tags list page, confirm that table sorting works
correctly.

Revision makes default result count (20) match options for number of
pagination entries (10,20,50,100,all).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 07:48:05 -05:00
6070f753b5 Bug 9476: Use Datatables on Koha news page
Replace the tablesorter plugin with the DataTables plugin on the
Koha news page.

To test, open the Koha news page (Tools -> News). Confirm that table sorting
works correctly.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 07:39:48 -05:00
85dea1a68a Bug 9477 - Use DataTables on notices page
Replace the tablesorter plugin with the DataTables plugin on the
notices page.

To test, open the notices page (Tools -> Notices and Slips). Confirm
that table sorting works correctly.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: add the no-wrap style in order to keep the same display
as before.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 07:36:57 -05:00
bc4fd0710f Bug 5790 - Prevent deletion of records with holds - QA Followup
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
fixes qa concerns, feature still works

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 07:29:45 -05:00
700f9980bb Bug 5790 - Prevent deletion of records with holds
Test Plan:
1) Apply patch
2) Create a record
3) Create an item for the record
3) Place a hold on the bib
4) Attempt to 'Delete all items', you should recieve
   an error message stating to delete all holds before
   deleting all items.

Also, it is possible to get into a situation where a record has
holds but no items. In this situation, it is not possible to
view/delete the holds without adding an item back to the record.
In this case, attempting to delete the bib causes a warning, but
does not prevent deletion.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Passes tests - do note that it was a design decision to leave the delete links clickable even though they are grey.
The reasoning is that librarians will want to be able to know *why* they cannot delete a given item or bib - I like this.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 07:29:45 -05:00
5431fa07d3 Bug 9529 - Adding a patron shows javascript on screen under login section
A typo in my patch for Bug 9265 (HTML5 switch) left an extra quotation
mark in a  <script> tag on the patron entry form, causing JavaScript
code to be output as text instead of interpreted. This patch corrects
it.

To test, apply the patch, enable EnhancedMessagingPreferences, and load
the patron entry form. You should see no JavaScript on screen around
the 'Patron messaging preferences' fieldset.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 07:20:35 -05:00
a88b2b2670 Bug 9521: Move common jQuery assets to koha-tmpl/intranet-tmpl/lib
Assets which are not theme-specific can now be placed in
koha-tmpl/intranet-tmpl/lib. This patch moves jQuery assets referenced
by doc-head-close.inc to this location and corrects the path in the
include.

To test, load any page in the staff client which uses jQuery and confirm
that there are no JavaScript errors. Test keyboard shortcuts (Alt-r,
Alt-u, Alt-q), Search to hold functionality, and search term
highlighting to confirm that jQuery plugins are working correctly.

Revision corrects some additional instances in help-top.inc and removes
a redundant call to the highlight script in preferences.tt

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 00:36:27 -05:00
Jared Camins-Esakov
6f2949f272 Bug 8733: Add IDreamBooks.com enhanced content
Adds the following enhanced content to the OPAC, all controlled by
separate sysprefs:
1) A "Readometer" which summarizes reviews on the OPAC detail page
2) A tab with snippets of critical reviews on the OPAC detail page
3) A computed rating on the results page

To test:
Find a book that is listed on IDreamBooks.com (you may have to make
sure that you have the first edition), and one that is not. Try
each of IDreamBooksReadometer, IDreamBooksReviews, and
IDreamBooksResults sysprefs, taking note of the content appearing (or
not) as appropriate.

Updated to add missing CSS to new theme.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased to latest master 2012-12-31

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-04 08:01:19 -05:00
Jonathan Druart
a00946e48c Bug 9503: Followup remove unused parameters passed to parcel.pl
The booksellerid and datereceive parameters are useless.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-04 07:45:57 -05:00
Colin Campbell
4a9ea1c632 Bug 9503 Correct name of parameter passed to parcel.pl
invoiceid was being passed as invoice causing GetInvoiceDetails
to silently fail and a system error downstream when
accessing the 'orders' element of the undefined invoice

Added an error message if GetInvoiceDetails called on undef

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-04 07:45:57 -05:00
0839645894 Bug 9439 - Enforce superlibrarian mutual exclusivity of other permissions
Basically, when you check the checkbox for the superlibrarian permission
in the patron record, it will disable and uncheck all the other
permission checkboxes. When you uncheck the checkbox for the
superlibrarian permission, it will renable those boxes. There is also
some JS code there to ensure that the other boxes are disabled when
returning to the change permission screen (i.e. the patch is not just a
click handler).

In the event that the checkboxes for superlibrarian and other
permissions are already checked, the user will be shown a pop-up window
explaining that the superlibrarian permission is mutually exclusive to
the others (since it already includes the others) and that the
permissions for that patron will then be reset to just include the
superlibrarian permission.

Comment: Tested on master. Works as described.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-01 11:30:35 -05:00
Vitor FERNANDES
e4f4566c05 Bug 9418: Some corrections and additions to about.tt
Test plan:

- Apply patch
- See if KEEP SOLUTIONS and C & P Bibliography Services
- Software Coop should be now software.coop

Bug 9418: Some corrections and additions to about.tt

Replaced & with &amp; according codelines.

Sponsored-by: KEEP SOLUTIONS

Combined to patches into one.
Reorder C-entries as per sort order.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-01 11:26:21 -05:00
4284cbf206 Bug 9526 - Patron statistics table is not pretty, needs circ toolbar
This patch adds the circ/members toolbar, corrects page title and
breadcrumbs, and adds some handling for column names which are coming
from the database. The table of statistics can display any items table
column specified in the StatisticsFields preference, but we can at least
embed the most obvious cases in the template for human readability: item
type, collection code, location, home library, and holding library.

To test, view the patron statistics page. For a patron with no
statistics you should see a message saying so. For a patron with
statistics you should see human-friendly labels for the columns
referenced above.

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

Comment: Works as described. No errors.
Wouldn't be better with centered cell contents?

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
FIX a typo:
- <h3>Statistcs for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
+ <h3>Statistics for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-01 11:19:37 -05:00
Galen Charlton
6c1da551ea bug 9401: remove direct reads of CGISESSID cookie by JavaScript
Having embedded JavaScript read the session cookie directly
is unnecessary and prevents the CGISESSID cookie being marked
httpOnly as a security measure.  The only Koha JS attempting
this was the AJAX tags code.

To test:

- In general, verify that there are no regression withs
  adding tags in the OPAC or reviewing them in the staff interface.
- In specific, for the OPAC
  - log into the OPAC
  - retrieve a bib record
  - add a tag
  - refresh the bib details page to verify that the
    tag was added
  - make sure the TagsInputOnList syspref is on
  - perform a search
  - add a tag to more than one record from the search results page
  - repeat the preceding using the CCSR theme
- And in the staff interface
  - Go to the review tags tool
  - Reject a tag
  - Refresh to verify that the tag was rejected

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-01 11:05:35 -05:00
47609920b7 Bug 9265 - Switch to HTML5 doctype in OPAC and staff client
This patch replaces the XHTML DOCTYPE with an HTML5 one. The HTML5
validator seems to be significantly different than the XHTML one,
so I'm seeing lots of new errors. This patch includes corrections
for one: Deprecation of the "language" attribute of <script>
tags.

To test, view pages in the OPAC and staff client. They should
appear as normal. Numerous validation follow-ups will be required,
but I suggest these be handled incrementally.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
test on some intranet pages and I found no regression. (chromium and
firefox).
The w3c page about the doctype: http://www.w3.org/TR/html5-diff/#doctype

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:47:04 -05:00
9b9580bab9 Bug 9483 - Use DataTables on batch patron modifications page
Replace the tablesorter plugin with the DataTables plugin on the
batch patron modifications page.

To test, submit multiple patron barcodes for batch modification
(Tools -> Batch patron modification). Confirm that table sorting
works correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:42:54 -05:00
Liz Rea
60a86dcc31 Bug 9268 - Scanning in barcode or ISBN in Acquisitions -> new order submits the form unexpectedly
To Test:

* Go to Acquisitions - Manage Orders
* Search for a vendor
* Click New Basket.
* Fill required fields
* Press Save.
* Click on "From a new (empty) record"
* Type in title Private Oz, Author Patterson, James.
* Scan (or type) ISBN - 9781864711875.
* (If not scanning, PRESS ENTER HERE)
* Nothing should happen. Form should not be submitted, no error message
  should appear.

Sponsored by: Hauraki District Libraries, New Zealand

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan in Firefox and Chromium on Ubuntu.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:40:03 -05:00
Liz Rea
1b2132fb76 Bug 9382 - updating permission labels
first, replicate:
go to More -> permissions on any user. Notice that it says various things "privileges, flags, permissions" they are interchangeable and inconsistent.
also note that some of the permissions are nonsensical and/or not descriptive enough, or not using canonical terminology (borrowers instead of patrons, for example)

To test:
interface consistency changes

-> means "turns into"

- page title - privileges -> permissions
- breadcrumbs - privileges -> permissions
- headings - privileges -> permissions
- "set flags" button -> save

Permissions that have changed description:

- Catalogue changes to "Required for staff login" in bold (this was the original impetus for this boatload of changes)
- reports
- editauthorities
- management
- serials
- updatecharges
- circulate
- parameters
- borrowers
- tools
- staffaccess
- edit_patrons (only on updatedb, not on new db)

- Read through and make sure there are no typos, and that the descriptions seem to jive with what privileges the permission gives the user. Suggestions are, in fact, welcome.

- If you are feeling ambitious, go ahead and create a new, clean database and check the wording there as well - it should match what has been done in the db update.

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

Tested both with existing database and new database

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Tested with existing database.  Introduces no new mysql-isms.
Kudos for adding that syspref in bold, that got me when I first started with Koha
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:12:54 -05:00
Galen Charlton
facde98694 Bug 9494: update default LOC z39.50 target settings
This patch updates the seed data from the target list at
http://www.loc.gov/z3950/lcserver.html#addr.

Comment: new target works. updated deleting and reloading
sample targets.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
I agree with Galen that this may need to be incorproated as a follow-up
for current installations. Works fine for new installs
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:11:16 -05:00
Fridolyn SOMERS
9a5818c192 Bug 8942: Translation process breaks javascript (followup 2)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested all changes. Functionality is unchanged. Thanks for the taking
the extra effort to move alert strings into variables.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:00:24 -05:00
Fridolyn SOMERS
c80de7b69c Bug 8942: Translation process breaks javascript (followup 1)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested all effected functions. No change in functionality.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:00:24 -05:00
Fridolyn SOMERS
714075d5c1 Bug 8942: Translation process breaks javascript
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I tested most scripts affected by this patch and visually verified
all changes. Functionality is unaffected.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:00:24 -05:00
Magnus Enger
3f2b5d270c Bug 9497 - Make it easier to add new encodings for Z39.50 servers and add ISO 8859-1
This patch does three things:
- Makes admin/z3950servers.pl create one variable for encoding,
  not one variable for each encoding
- Makes the template create encoding options from a list
- Adds ISO 8859-1 to the list of available encodings
See the bug for a lengthier description

To test:
- Apply the patch
- Edit one Z39.50 server several times, choosing each available
  encoding in turn
- Check that for each encoding, the correct encoding is shown both in
  the list of Z39.50 servers and in the dropdown on the edit screen

Comment: Works as described, no errors.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 10:53:11 -05:00
Srdjan
95077493bd Bug 7243: Rewording and renaming
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-24 09:17:12 -05:00
Srdjan
1b4a266915 Bug 7243: Be selective when summing up charges for blocking issues
Added RentalsInNoissueCharges and ManInvlsInNoissueCharges sys prefs

Created C4::Members::cwGetMemberAccountBallance()
* A wrapper for GetMemberAccountRecords that gives info on non-issue and
  other charges
* Other charges are:
  'Res'
  'Rent' if RentalsInNoissueCharges is Mo
  authorised_values MANUAL_INV if ManInvlsInNoissueCharges is No

C4::Members::GetMemberAccountRecords() changes:
* Dropped input param $date, it is not used

Use split charges in C4::Circulation::CanBookBeIssued() and
C4::Members::patronflags(). That way only fines decide whether an item
can be issued, and not other non-fine charges

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

Rebased (updatedatabase.pl)

ManInvInNoissueCharges and RentalsInNoissueCharges ar both included by default (= behaviour as before)

All variants tested: Both included, none included, manual invoice included, rentals included.
Works fine, blocks/does not blok as appropirate, messages appear as expected.

[Oct 12, 2012 marcelr:] Amended for updatedatabase.pl
Signed-off-by: M. de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-24 09:12:59 -05:00
Mathieu Saby
03acc19c7f Bug 9402: letter v between 2 option tags
In HTML code generated for advanced search, a useless "v" letter
is visible after "dissertation or thesis (revised)</option>".
This patch suppress "v" letter is outside <option> markup
(and cosmetic change : "Adult" -> "adult" in public types)

To test : check HTML code generated by advanced search.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes capitalization and a little problem in the HTML of an UNIMARC
plugin.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-24 08:56:14 -05:00
Jonathan Druart
1e5f6f6fbb Bug 9391: FIX display status in serials-collection
Caused by a bad copy/paste in Bug 8782

To test:
1) Look at the detail page of any subscription
2) Click on the serial collection link in the link list on the left
3) Look at the issues, create some new issues using the "Generate next"
button
4) Check status column of the table of issues

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes template variables. Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-24 08:11:27 -05:00
MJ Ray
99e1fa291a Bug 9407: patrons search should match substrings
If a patron lives at 4345 Library Rd, a search on Street Address for
    Library should find it. However, it does not, but a search for 4345
    Library does.  This patch adds a "Search Type" drop-down, defaulting
    to the current behaviour.

    To test:
    1) Search for a patron based on a non-leading part of a field.
    2) Should return no results.
    3) Search again with "Search Type" of "Contains".
    4) Should return the patron.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-22 18:56:23 -05:00
Matthias Meusburger
56878f1453 Bug 7678: Adds extended patron attributes in patron reports
This patch allows to choose row and column amongst extended patron
attributes and to filter on them in reports/borrower_stats.pl

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

Great, I was looking for such a feature.
Patch works as expected.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-22 18:35:07 -05:00
Jonathan Druart
9f8490e0e3 Bug 9236 : Redirect to the parcel page after deleting an item/order
Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Receive shipment for a previously created basket with
  multiple order lines
2) Verify 'Delete order' links only have 2 parameters and
  when you delete an order, you are not redirected to the
  basket.
3) Verify the same is true for 'Delete order and catalog
  record'.
4) Apply both patches from Bug 9236.
5) Redo tests and verify page redirects correctly now.
  Links now also show the basket number as third parameter.

Also: make sure orders/items and records are deleted correctly.

Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-21 08:40:44 -05:00
Jonathan Druart
ce9f100328 Bug 9236: FIX delete order when receiving
Before this patch the "delete order" links were broken on the receiving
page (parcel.pl)

Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Before applying the patch, when recieving a parcel,
if you delete an order line, Koha tries to open the
page of the basket linked to that order, but can
not find it. Koha displays "Vendor not found".
With the patch, Koha finds the right basket.

I Sign off this patch, to be applied with the other patch ("Redirect to the parcel page after deleting an item/order")

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-21 08:40:43 -05:00
Bernardo Gonzalez Kriegel
5a7afe0d72 Bug 9357: Missing 'c' option in MARC21 LEADER_18 value builder
This patch adds option 'c' to the position 18
of the leader value builder.
Also corrects label for option 'i'

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Works as described
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-18 19:10:31 -05:00
4c23d24f40 Bug 9108 - Add uk/euro date sort filter to pages which require it
This patch adds the JS required to enable correct sorting
of dates in DD/MM/YYYY format to pages which require it.

To test, set your dateformat accordingly and confirm on the
affected pages that dates are sorted correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Resolved conflict in serials/serials-search.tt.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:59:30 -05:00
04a58c4004 Bug 9310 - Patron image upload template corrections
This patch fixes some template structure problems and makes some
improvements:

- Correct grid structure so that page isn't narrower than it needs
  to be.
- Move image upload messages out of message/error dialog and into
  table so that lines are distinct and legible.
- Expand breadcrumbs specificity
- Capitalization corrections

To test: Upload patron images using both single images and zip files.
Test zip file upload with a file which contains valid and invalid
contents (non-existant patron numbers, invalid image files, etc). In all
cases image uploads should work correctly and errors should be legibly
displayed.

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

With patch, error messages are displayed  in a nice table.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with zip and png files. Works great.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:53:42 -05:00
Galen Charlton
c7629376fc Bug 9376: extend HTML fix to moremember-brief.tt
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:08:48 -05:00
Vitor FERNANDES
7be86cd481 Bug 9376: Problem with dateexpiry display in moremember.tt
There is a problem that brokens the interface of moremmeber when
displaying the date expiry when renewing a patron.
In the first comment I said that the line that causes the error
should be:

<span class="reregitryinfo">[% dateexpiry %]</span>

but the correct way should be:

<strong class="reregitryinfo">[% dateexpiry %]</strong>

This way the date expiry after renew a patron appears in bold.

Test plan:

- before applying the patch try to renew a patron and check
  that almost everything went bold
- apply the patch
- renew a patron and only the expiration date is bolder.
- Note that the bug doesn't manifest in master because
  the patch for bug 6261 causes the invalid HTML to never
  be reached; it *does* affect 3.10.x and earlier.

Sponsored-by: KEEP SOLUTIONS
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:08:48 -05:00
67be30c822 Bug 9229 - branch code instead of name in subscription-detail.pl
This patch corrects the problem by using the KohaBranchName plugin.

Test plan:
Go in a subscription detail page.
Check that the "Library" information is changed from the branchcode to
the branchname

Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:00:47 -05:00
Corey Fuimaono
64a6f9a977 Bug 9398 - [ ? ] Link Lacks Context for All General Users (Accessibility) [Contexual Help]
testing procedure:
1. see that [ ? ] has simply been changed to 'Help'

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
I like this change, the context is improved even for sighted individuals, and it helps screen reader users a great deal.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The new 'Help' doesn't take up a lot more space than the old '[ ? ]'
and makes it easier to undertand what will happen when you click on it.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 20:58:17 -05:00
Jared Camins-Esakov
8bfba2d98f Add Fred Pierre to history
Welcome, Fred Pierre! You are the 201st committer to Koha.
2013-01-17 20:55:20 -05:00
Fred Pierre
09ec1bef38 Bug 8401 : Highlighting of search terms in preference causes loss of data
To test:

1/ Go to system preferences
2/ Go to SCOUserCSS
3/ Add #self
4/ Search for self
5/ Open SCOUserCSS
6/ Note it now contains only # (Do not click save)
7/ Apply the patch
8/ Refresh the page, and check SCOUserCSS and note it now says #self
9/ Rejoice!

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 20:53:40 -05:00
Jared Camins-Esakov
e6ea3db830 Add Corey Fuimaono to history
Welcome, Corey Fuimaono! You are the 200th developer to have a patch
committed to Koha.
2013-01-17 18:30:25 -05:00
Corey Fuimaono
a3cb99841e Bug 9179 - Incorrect capitalization in serials-collection.pl
testing procedure:
1. Make Subscription for Valid/Test Item
2. Look at Serial Collection Information and catagorize Item as "Arrived"
3. Click "Generate next". Observe Capitalization is Correct.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes capitalization for 'Generate next' button.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:27:52 -05:00
Jared Camins-Esakov
0043240b4b Add Hugh Davenport to history
Welcome, Hugh Davenport! You are the 199th developer to have a patch committed
to Koha.
2013-01-17 18:23:19 -05:00
Hugh Davenport
2eca979109 Bug 9062 Fix spacing next to tax rate
On the supplier view screen, there was a space after the discount
and before the % sign, but there was none for the tax rate.

This patch adds in a patch, so they look similar.

Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tiny follow-up, fixes spacing.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:18:15 -05:00
Hugh Davenport
55cf86e230 Bug 9062 Fix format for discount rate for vendors
On the vendor display and edit screens, the tax rate information was
formatted to 1 decimal point, while the discount rate was not.

This patch adds a format string to the discount information so that
it is formatted in the same way.

Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Makes display on vendor detail page more consistent and
passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:18:14 -05:00
Fridolyn SOMERS
bc71428571 Bug 8443: Suggestions publication year and copyright date (follow-up 2) Cosmetic changes and perltidy formatting
Cosmetic patch :

Manual editions :
- use of () for qw
- use of q{} or qq{} in SQL queries
- replacing $${key} by $->{key}
- formatting SQL queries (easier to read)
- in suggestion.tt reducing date input size to allow calendar icon on same line

+ Formatting with perltidy

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests were done with all 3 patches from this bug applied:

1) Add suggestion from OPAC, check copyright date is saved
2) Add suggestion in intranet, check copyright date is saved
3) Edit suggestion, check change is saved correctly
4) Check date filters work as expected, using single dates, date ranges
   and multiple filters at once:
  - Accepted on
  - Managed on
  - Suggested on
5) Check copyright date search works correctly.

Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-15 22:10:59 -05:00
Fridolyn SOMERS
7ca9093f03 Bug 8443: Suggestions publication year and copyright date
Main patch correcting suggestions search :
- allow filtering on copyrightdate, manageddate and accepteddate
- entered dates remains in filter during search
- empty and null values are in the same tab
- null/empty values are not present in filers comboboxes

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-01-15 22:10:59 -05:00
Nicole C. Engard
be356e1a07 Bug 9306: Update descriptions for the 4 SeparateHoldings prefs
Patch updates the text of the SeparateHoldings and OpacSeparateHoldings
preference descriptions to be more readable.

To test, apply the patch and check the text of the preferences.

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

Description and test plan added.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-15 21:54:26 -05:00
67ad61070e Bug 9215 - non translatable string in manage-marc-import
Status information about staged MARC record batches was being pulled
directly from the import_batches table where they are stored as English
strings. This patch puts a check on the status value into the template
so that translatable strings can be embedded.

To test, apply the patch and view both the table of staged MARC record
batches and details about individual batches. In the default 'en'
translation you should see import statuses displayed with a capital
letter ("Staged"). This indicates that the status is now being pulled
from the template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:26:54 -05:00
Adrien Saurat
356bf14f4d Bug 9182: fix on sortable columns on Saved reports
When displaying the Saved reports, since 3.10 the number of columns is
higher but the datasorter parameters have not been changed accordingly.
It's thus impossible to sort on the author or the creation date, for
example.

TEST PLAN :
1) Check sortable columns before applying : some useful columns are not
sortable, while the last columns are sortable (but don't need to be).

2) Once the patch is applied, the "non sortable" columns are the correct
ones.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Colums for saved reports are all sortable correctly now.
All tests and qa script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:23:59 -05:00
Chris Cormack
7e1a341d4e Bug 7143 updating history and about page
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Changes look to be correct

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:21:59 -05:00
Liz Rea
f13de4bdb6 Bug 6574 - js error in en-GB and en-NZ translations due to improper quoting
To replicate:

* install en-NZ translation (or en-GB)
* activate the new language, and select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* without the patch, the toolbar will be incorrect. The toolbar will also be incorrect on moremember.pl.

To test:
* apply the patch
* re-generate the en-NZ or en-GB translation
* activate the new language, or select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* with the patch, the toolbar will appear to be correct. It will also be correct on moremember.pl.

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-01-14 23:17:08 -05:00
Jared Camins-Esakov
b4e255e4d7 Merge branch 'bug_8557' into 3.12-master 2013-01-14 23:08:49 -05:00
Liz Rea
a1c9272e2f Bug 8557 - Unexpected behavior with scanners
This is an alternative to the original implementation - this one works in chrome as well as firefox.

To test:

1)
Set syspref 'AcqCreateItem' to 'Create Item when receiving an order.'

2)
Create a basket for a vendor, add an order line.

3)
Search for this vendor using Vendor search

4)
Receive Shipment for this vendor and choose the title you ordered in 2)

5) You will get the dialog to create related item(s)

6)
Fill in Item 0 through o (see screenshot)

7)
Scan Barcode for field p - Barcode

7)
Result: Scanner sends a [return], form closes and you had no chance to fill in fields t - z

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

Tested with Chrome Version 23.0.1271.97 m  and Firefox 17.0.1, both behave as expected.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with Firefox and Chromium in Ubuntu.

Additional test done:
1) Add a new subscription, choose 'receive adds items'
2) Receive an issue, fill out $p with a barcode
3) Make sure hitting enter in the barcode field does not send the form.

All tests pass and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:07:42 -05:00
Julian Maurice
3de2b44782 Bug 9126: Do not return from Check too early.
If there is no errors, it should continue instead of returning true.

+ move a block of code at the end of Check function. This avoid
detaching and re-attaching a HTML block if there are errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
The following queries show us the issues:
select count(*) from items;
select * from aqorders_items where ordernumber=XX;

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:

AcqCreateItem = receive
UniqueItemFields = barcode

1) Create a new basket
2) Create a new order with quantity > 1
3) Close the basket and create a new invoice/shipment
4) Receive only 1 item.
   - Fill out the first item form with item type only. Click add.
   - Don't change second item form at all.
   - Click save.

Before patch:
2 items are created on the record, both with the selected itemtype.

After patch:
Only 1 item is created, which is correct.

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Seems to work as described by the test plan
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:01:02 -05:00
Liz Rea
4df6f43a66 bug 9360 - Clean borrowers tool wording and layout problematic
To test:

Verify that the text has been changed to "Batch patron deletion/anonymization in the following places:

* tools-home
* the page title
* the heading on cleanborrowers
* the menu on cleanborrowers

Verify that the tool still works as intended.

This (finally) fixes the things Owen pointed out.
changes check-out to checkout per Galen.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Fix indentation and tabulations characters
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 22:51:55 -05:00
Jonathan Druart
76dc0c73ae Bug 9076: Followup: FIX ergonomic issues
If no criteria is given, the form was submitted.
Labels were wrong

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 22:01:36 -05:00
568a4c1230 Bug 9076 - Add ability to delete borrowers by expiration date and category code to cleanborrowers.pl
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested per plan, works. Staff category is not shown, and patch passes automated testing.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 22:01:35 -05:00
f887edc3ab Bug 9335 - humanMsg popups don't disapear in webkit browsers
The popup message that appears after saving changes to system
preferences should dissapear upon any user actions (i.e mouse
click, mouse move, typing) but this does not happen in modern
webkit based browsers since jQuery was updated.

This patch adds the suggested fix to the jQuery plugin code as
suggested on https://code.google.com/p/humanmsg/issues/detail?id=9

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested with Google Chrome on Windows 7

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with Google Chrome 22 and Firefox on Debian
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested with the following browsers:
  Mac: Chrome 23, Firefox 16.0.2, Opera 11.61, Safari 5.1.7
  Windows: IE8, Firefox 3.6.26
2013-01-07 21:12:10 -05:00
f2c2be1c20 Bug 9141 - Untranslatable strings on "pay an amount..." page
Moving text of an error message from the script into the
template. To test, submit an amount which is greater
than the amount due. You should see an error message
displayed correctly with a properly-formatted currency
amount.

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

Patch behaves as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 20:48:42 -05:00
Dobrica Pavlinusic
5ee5693410 Bug 9346 - acqui/neworderempty.pl ignores exchange rates and destroys user data on page load
This restores behaviour of new order form before Bug 5335 merge

Test scenario:

1. load Receipt summary for existing customer
2. take note of Unit cost and Order cost
3. open existing order line and verify that Replacement cost,
   Budgeted cost and Total are not re-calculated on page load
4. change currency and verify that costs are updated
   (change currency to system default and all values should become
   same as vendor price)
5. change Quantity, get alert "You can't add a new item, please create a new order line"
   and verify that Total still reflects correct value

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 20:47:38 -05:00
fd07c72f38 Bug 9331 - Untranslatable strings in ajax.js
This patch moves untranslatable strings from ajax.js into the template
where they can be picked up by the translation script.

To test that preference-related error messages continue to work,
open the system preferences editor in two tabs. Log out in one tab and
try to save a system preference in the other. You should see correct
error messages.

To test that error strings are now translatable, run "perl translate update
 <lang>" from misc/translator, then check if the affected strings shows
up in the po file.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Still works, and is now translatable

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 20:34:39 -05:00
04d9825717 Bug 9284 - JavaScript should follow rules recommended by JSHint
Coding style corrections to members.js:

- Mixed tab/space indentation converted to spaces.
- Converted "!=" and "==" to "!==" and "===" for comparisons with ''.
- Adding missing semicolons.

To test, create or edit a patron and confirm that validation hasn't been
broken by the changes to members.js: Invalid date, empty required
fields, guarantor popup, restricted-until field display, etc.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 19:02:07 -05:00
8fd75227fc Bug 6261 [Revised] Consolidate patron toolbar include files
The staff client has two almost identical include files which
can be consolidated: circ-toolbar.inc and members-toolbar.inc.
This patch marges the slight differences between them and
eliminates circ-toolbar.inc, that being the one which was used
on fewer pages.

In order to accommodate the different "destination" variable
for operations which redirect back either to circ or patrons,
circulation.pl defines "destination" in the template.

Revision corrects a redirect error in setstatus.pl which
predates this patch but which never showed up until now.

To test, perform various operations from the toolbar on at least
two pages: circulation.pl and moremember.pl.

Operations: Edit, add child, duplicate, change password, print (all
options), search to hold, renew, set permissions, delete, update child
to adult, and export checked-in barcodes. In most cases simply
confirming that the link takes you to the right place is enough.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 18:36:42 -05:00
8857d4d728 Bug 9289 - Adjacent checkbox behavior broken on circulation.pl
This patch fixes the behavior of adjacent checkboxes in the list of
checkouts on circulation.pl. Checkboxes in both the "renew" and "check
in" columns should not be able to be checked at the same time.

A line was commented out (by me) which was necessary to this working
correctly. I'm guessing it was done in debugging and left by mistake.

To test, load a patron for checkout who has items checked out. You
should not be able to check boxes in both the "renew" and "check in"
columns in the same row, whether you click the checkbox itself or the
containing table cell.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 18:33:17 -05:00
Jared Camins-Esakov
7535f2bfa3 Revert "Bug 7167: New version for updatedatabase"
This reverts commit c9cb55ef47.
2012-12-27 14:02:56 -05:00
Jonathan Druart
c9cb55ef47 Bug 7167: New version for updatedatabase
This patch use DataTable, see BUG|BZ 6836
      - css/datatables.css
      - lib/jquery/plugins/jquery.dataTables.min.js
      - js/datatables.js

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

Bug 7167 follow-up

Major changes:
* creating database tables for update on the fly, the  1st time the update script is called
* version is checked on mainpage.pl (and here only). If syspref Version differ from kohaversion.pl, the old updatedatabase is launched. If there are updates missing from new mechanism, the updatedatabase page is reached
* kohaversion check on each page is now useless in Auth.pm, removed dead code
* Updated installer: at the end of the process, retrieve all updates and automatically mark them "OK", as they're included in installer

Minor changes:
* adding copyright
* adding poddoc
* updating a warning, for better clarity
* switching from $$var to $var->
* small TT glitch fixed in updatedatabase.tt
* about.pl now returns the Version systempreference PLUS all the patches that have been applied

Bug 7167 follow-up perlcritic & numbers display & partial apply depending on DEBUG

* add use strict to updatedatabase, that is now perlcritic compliant
* partial apply of DB revs is now managed by DEBUG env variable = if DEBUG=0, the user can just apply every DBrev. If DEBUG=1, we're in a dev env, the user know has the option to apply DBrevs one by one
Display:
* in updatedatabase, small spelling changes
* in about.pl, remove 0 just after . (3.06.01 is displayed as 3.6.1)
* improve the display of applied numbers on about.pl
 - before this patch, if you have N, N+1, N+2, N+3 and N+10 DB rev applied, about was displaying : , N+1 / N+2 / N+3 / N+10
 - after this patch you have N......N+3 / N+10
* add ORDER BY into list_versions_already_knows to have number retrieved in the same order whatever the order they are applied

http://bugs.koha-community.org/show_bug.cgi?id=6679
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Improve the update.pl script

 * Added CLI options to update.pl
 * Call update.pl from the installer.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Now, we check versions on mainpage.pl and after login

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Reimplementing Marcel's suggestions & fixes

 * Fixing the bugguy old version check (that was made against 3.0900000 instead of 3.0900027 -the last current kohaversion number
 * in the CLI script, if there is nothing to report, just say it

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Bug 7167: Remove check_coherency

As suggested by Katrin, we've removed the call to check_coherency. It intended to provide readable comments when some SQL was wrong. Removing this sub result in the SQL error being displayed. That's OK because the sysadmin or the developer can google the error, understand it, then fix it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Changing in .sql parsing

We first split on delimiter and then extract comments. You can now put
\n for delimiter comments.
ex:

DELIMITER ;
-- this is a comment
SELECT * FROM  my_table;
-- another comment

Before this patch, we had to write:
DELIMITER ;
-- this is a comment;
SELECT * FROM  my_table;
-- another comment;

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Add .pl and .sql examples

Those files are in version directory, so will never be executed by the updater
If you want to provide an update, do it in a 3.09/ directory (if your update is expected for 3.10 version)

Note that the updater use a md5sum checker. So, if the same update is in 2 different places, it will be detected. That will be handy for changes made on both stable and master: a library running stable will get the update when updating. When upgrading to the next major release, Koha will detect the patch has already been applied, and no error will be thrown. With the previous mechanism, a DBRev ported to stable was re-executed when upgrading to master, resulting in a nasty (but usually harmless) error message

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Improve display + factorize get_queries

Despite it's size, this patch is dealing with display questions only:
 * The text "comments" and "queries" was hardcoded in ajax-updatedb-getinfo.pl script. It has been replaced by a JSON call, returning 2 separate values, "comments:" and "queries:" is now in the template, making it translatable
 * Some minor tweak in the display (like putting things in bold, displaying OK in green, warnings in yellow and KO in red)
 * Reordering the column headers for more readability:
    * Status column is merged with availability, column is after status
    * Status/availability terms more clear: "Not applied" instead of "unknown", "Applied and OK", "Applied and failed", "Applied and forced" are the 3 other statuses
    * Removed one click to display comments on DBREv not yet applied: before the patch, one had to click "Show details", then "Get comments", now, "Get comments" is enough

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: FIX typos & moving a script to a proper place

* renamed availables to available
* renamed already_knows to already_applied
* fixed FSF & copyright headers
* removing a "use strict" because we already had use Modern::Perl
* fixed a tiny typo in about.tt

* moving update.pl to misc/bin because it's a CLI script

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Add dependency File::Find::Rule

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: We want to execute non-numeric version with the -all option

Dealing with Marcel comment 100:
> Note that the current code around line 52/53 does not
> handle that correctly:
> Argument "\x{74}\x{65}..." isn't numeric in numeric ge (>=) at
> installer/data/mysql/update.pl line 52.

Now, a non-numeric DBRev will be applied if you provide the --all parameter, without throwing the error

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167 reindentation & removing dead code

* The if (! defined $ENV{PERL5LIB}... block was wrongly intented
* The 3 lines running update.pl are useless: the update (new mechanism) is run from admin/updatedatabase.pl script. This part of install.pl is run only when you have "old style" DB revisions.

Summary:
 * old mechanism = it's run as previously, by reaching the installer/install.pl?step=3 page, that applies all revisions
 * new mechanism = when you log-in or reach mainpage.pl, you reach admin/updatedatabase.pl, where you can see what will be run, and run it

Tiny side effect = the check for old mechanism is now done *after* authentification (thus it's not done on each page call). It means that the user will have to enter login/password twice :
 * first to log-in to Koha
 * second to run installer/updatedatabase.pl?step=3
As the old mechanism is deprecated, we can expect this will happend only a few time in the history of a setup, it's not a big deal.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Don't raise an error in routine TableExists

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: FIX merge

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167: Add .pl and .sql examples

Those files are in version directory, so will never be executed by the updater
If you want to provide an update, do it in a 3.09/ directory (if your update is expected for 3.10 version)

Note that the updater use a md5sum checker. So, if the same update is in 2 different places, it will be detected. That will be handy for changes made on both stable and master: a library running stable will get the update when updating. When upgrading to the next major release, Koha will detect the patch has already been applied, and no error will be thrown. With the previous mechanism, a DBRev ported to stable was re-executed when upgrading to master, resulting in a nasty (but usually harmless) error message

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 7167 follow-up fix POD syntax to please koha-qa.pl
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 11:13:54 -05:00
Jared Camins-Esakov
ab59c08035 Merge branch 'bug_7143' into 3.12-master 2012-12-27 10:12:16 -05:00
Paul Poulain
20231991ff Bug 7143 adding Kiriaki Roditi as translator
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-12-27 10:12:08 -05:00
6bae88f43d Bug 9009 - Add separate user js and css for SCO module
Add system preferences SCOUserCSS and SCOUserJS to define separate CSS and JavaScript for the Self Checkout Module.

Test plan:
1) Apply patch
2) Run updatedatabase.pl
3) Add something arbitrary to the new sysprefs SCOUserCSS and SCOUserJS ( such as TestCSS and TestJS ).
4) Load the SCO module in a browser, and view the HTML, verify the CSS and JS values in the system preferences have been included.

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

I tested with an alert('hello') as JavaScript and some background-color for the CSS. Worked as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 10:05:28 -05:00
Vitor FERNANDES
63ef513c0f BUG 9162 - Add a system preference to set which notes fields appears on title notes/description separator
Added a new system preference to control the fields to not appear in the separator.
Change GetMarcNotes to use the system preference created to only appear the fields that aren't in the list,

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
FIX some indentation in C4/Biblio.pm
+FIX 1 end of parentheses in sysprefs.sql
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 09:56:19 -05:00
e3f6a74660 Bug 9206 - Only allow place holds in records that the patron don't have in his possession - QA Followup
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-12-27 09:48:03 -05:00
Vitor FERNANDES
63f2ceb603 Bug 9206 - Only allow place holds in records that the patron don't have in his possession
Added a system preference to turn on/off this feature.
By default the system allow the patron to place holds even if it is in his possession.
Script to place holds check if the system preference is off and if patron has at least one item to block holds.
Messages to say that are already in patron possession added to templates.
Method to check if patron has one issue from one record added to C4::Circulation

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 09:48:03 -05:00
Jonathan Druart
4dbcd077f6 Bug 8377: Followup move style in a css file and do not pass template to a pm
1/ It's better to set style of the video marked in a css file.

2/ Replace some
  for my $i in (0..#$array)
with
  for my $element in (@array)

3/ the routine in a pm returns a hash not the $template variable

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 09:28:00 -05:00
Mirko Tietgen
33aa6ec2fd Bug 8377 [ENH] Show HTML5 video/ audio for media files in OPAC and staff client
This enhancement uses information from MARC field 856 to generate the appropriate HTML5 code to embed am media player for the file(s) in a tab in the OPAC and staff client detail view. This patch supports the HTML5 <audio> and <video> element. Additionally it gives basic support for the <track> element. This element is not supported very well by recent browsers. Please consider the patch working when you get working video or audio.

Rebased to Master 22.11.2012

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 09:28:00 -05:00
Lyon3 Team
37bd0c8d7e Bug 7620: OPACNoResult, Add keyword to query string
When search failed, this patch gets the keyword(s) and add them
to the string entered by the user to OPACNoResultFound

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-22 16:45:31 -05:00
adf4790c28 Bug 9169 - Wrap relator code in <span> to allow for CSS customization
This patch adds <span class="relatorcode"> around the display of
relator codes in the OPAC and the staff client, and adds a space
before the bracket (" [relatorcode]") for readability.

To test, add custom CSS to OPACUserCSS and IntranetUserCSS and
view a record which includes relator code data. Suggested:

.relatorcode {
    background-color: rgb(230, 240, 242);
    border-radius: 3px 3px 3px 3px;
    color: rgb(51, 51, 51);
    display: inline-block;
    font-size: 75%;
    font-weight: normal;
    margin-left: 0.4em;
    padding: 0.1em 0.4em;
}

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-22 16:42:46 -05:00
Chris Hall
4e8c6f1fbb Bug 9158: correcting whitespace in series (440) display
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Patch changes 'first; second; third.' to 'first ; second ; third.'

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-22 16:38:05 -05:00
533c9bc657 Bug 9140 - Untranslatable strings in item circulation history
This patch removes the text of a message from the script
to the template. The lastmove sub now returns either the date
or 0, and the template displays the "no transfers" message
if the date doesn't exist.

To test, view the circulation history for items which
do and do not have a transfer history. A date should be displayed
for items which have a transfer history. A messages should
be displayed for those which do not.

This patch also adds a <span> around the text "Never" which
was not getting picked up by the translation script. To test
this change, run "perl translate update <lang>" from misc/translator,
then check if the string shows up in the po file. (Thanks kf!)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-22 16:02:54 -05:00
Jared Camins-Esakov
0becc0ab1d Add Nadia Nicolaides to history
Welcome, Nadia. You are the 197th person to commit a patch to Koha!
2012-12-21 07:44:09 -05:00
97b0599918 Bug 9151 - Renewal notice according to patron alert preferences - QA Followup - Fix DB Revs & Grammar
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-21 07:41:25 -05:00
Vitor FERNANDES
8048ba3201 BUG 9151 - Renewal notice according to patron alert preferences (Patch 2)
Added a system preferences (RenewalSendNotice - default no) to controll the renewal notice sending.
Added to installer languages the renewal notice template.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-21 07:41:25 -05:00