koha.git
9 years agoBug 9455: Remove unnecessary quoting from sql
Colin Campbell [Wed, 23 Jan 2013 10:31:31 +0000 (10:31 +0000)]
Bug 9455: Remove unnecessary quoting from sql

Wa've removed the mysql specific back quotes from sql files
But this case remained of them embedded in an sql string
Also removed the unnecessary call to finish
and temporary variable in the subroutine return

Testing: Functionality should remain unchanged. Retrieval of
basketgroups in acquisitions should not be affected

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Works according to test instructions: Basketgroups
functionality appears to work normally.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked SQL produces the same results as before and did some
tests on the basket group functionality.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9658' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:22:00 +0000 (08:22 -0500)]
Merge branch 'bug_9658' into 3.12-master

9 years agoBug 9658: Incorrect breadcrumb on report dictionary
Jared Camins-Esakov [Mon, 18 Feb 2013 13:16:01 +0000 (08:16 -0500)]
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>
9 years agoMerge branch 'bug_9655' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:20:50 +0000 (08:20 -0500)]
Merge branch 'bug_9655' into 3.12-master

9 years agoBug 9655 - Capitalization wrong on 'Close and Print' button in basket groups
Bernardo Gonzalez Kriegel [Sun, 17 Feb 2013 23:22:45 +0000 (20:22 -0300)]
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>
9 years agoMerge branch 'bug_9582' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:17:36 +0000 (08:17 -0500)]
Merge branch 'bug_9582' into 3.12-master

9 years agoBug 9582: Remove unused code from members/pay.pl
Jared Camins-Esakov [Sun, 10 Feb 2013 15:39:20 +0000 (10:39 -0500)]
Bug 9582: Remove unused code from members/pay.pl

The subroutines writeoff() and get_writeoff_sth() (and the two package
variables $writeoff_sth and $add_writeoff_sth) defined in members/pay.pl
are not used at all.

To test:
1) View members/pay.pl by looking at the record of a patron who has
   at least seven fines/fees and clicking the "Pay fines" tab after
   clicking the "Fines" tab on the left side
2) Write off a single item in the table on members/pay.pl using the
   button labelled "Write off"
3) Pay a single fine by clicking the "Pay" button
4) Pay a portion of a fine by selecting a checkbox on one of the lines
   in the table and clicking the "Pay amount" button
5) Select two lines in the table and click the "Pay selected" button
6) Write off all remaining fines

If all your actions show up in the table on the Account tab, this patch
works.

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>
9 years agoMerge branch 'bug_8079' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:16:28 +0000 (08:16 -0500)]
Merge branch 'bug_8079' into 3.12-master

9 years agoBug 8079 - opac not showing fines - says 'no'
Kyle M Hall [Tue, 12 Feb 2013 15:54:23 +0000 (10:54 -0500)]
Bug 8079 - opac not showing fines - says 'no'

Make charges of type FU be counted for opac-user.pl

Test Plan:
1) Checkout an item to a patron, back date the date due enough to create fines
2) Run fines.pl
3) Log into the patron's account via the OPAC
4) Note the fines line for that issue says 'No'
5) Apply patch
6) Reload opac-user.pl, not the fines column now says 'Yes'

Signed-off-by: David Cook <dcook@prosentient.com.au>
Works great, Kyle. Seeing as my test patron had $4500 in fines for that item, I was glad to see that column switch to "Yes" ;).

I'm not sure what the difference is between FU and F is, or what L means, but the patch works, so I'm signing off.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as described, all tests and QA script are ok.
Note: why show yes and not the fine amount?
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9651' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:00:42 +0000 (08:00 -0500)]
Merge branch 'bug_9651' into 3.12-master

9 years agoBug 9651 - When deleting a fund, button is wrongly labelled with 'Delete this budget'
Bernardo Gonzalez Kriegel [Sun, 17 Feb 2013 13:19:55 +0000 (10:19 -0300)]
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>
9 years agoMerge branch 'bug_7969' into 3.12-master
Jared Camins-Esakov [Tue, 19 Feb 2013 16:04:52 +0000 (11:04 -0500)]
Merge branch 'bug_7969' into 3.12-master

9 years agoMerge branch 'bug_9646' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:11:25 +0000 (09:11 -0500)]
Merge branch 'bug_9646' into 3.12-master

9 years agoBug 9646 - Replace YUI button on the printers administration page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 13:43:16 +0000 (08:43 -0500)]
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>
9 years agoMerge branch 'bug_9645' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:09:57 +0000 (09:09 -0500)]
Merge branch 'bug_9645' into 3.12-master

9 years agoBug 9645 - Replace YUI buttons on the quotes management page with Bootstrap
Owen Leonard [Fri, 1 Feb 2013 21:10:14 +0000 (16:10 -0500)]
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>
9 years agoMerge branch 'bug_9644' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:08:33 +0000 (09:08 -0500)]
Merge branch 'bug_9644' into 3.12-master

9 years agoBug 9644 - Replace YUI button on the suggestions management page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 20:28:19 +0000 (15:28 -0500)]
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>
9 years agoMerge branch 'bug_9643' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:07:33 +0000 (09:07 -0500)]
Merge branch 'bug_9643' into 3.12-master

9 years agoBug 9643 - Replace YUI button on the road types administration page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 13:58:26 +0000 (08:58 -0500)]
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>
9 years agoMerge branch 'bug_9642' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:06:49 +0000 (09:06 -0500)]
Merge branch 'bug_9642' into 3.12-master

9 years agoBug 9642 - Replace YUI button on the patron attribute types page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 13:14:10 +0000 (08:14 -0500)]
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>
9 years agoMerge branch 'bug_9641' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:05:51 +0000 (09:05 -0500)]
Merge branch 'bug_9641' into 3.12-master

9 years agoBug 9641 - Replace YUI button on the Koha news management page with Bootstrap
Owen Leonard [Sat, 2 Feb 2013 18:33:39 +0000 (13:33 -0500)]
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>
9 years agoMerge branch 'bug_9640' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:04:46 +0000 (09:04 -0500)]
Merge branch 'bug_9640' into 3.12-master

9 years agoBug 9640 - Replace YUI button on record matching rules page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 13:02:42 +0000 (08:02 -0500)]
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>
9 years agoMerge branch 'bug_9639' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:03:33 +0000 (09:03 -0500)]
Merge branch 'bug_9639' into 3.12-master

9 years agoBug 9639 - Replace YUI button on MARC tag structure toolbar with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 12:53:30 +0000 (07:53 -0500)]
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>
9 years agoMerge branch 'bug_9637' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:00:27 +0000 (09:00 -0500)]
Merge branch 'bug_9637' into 3.12-master

9 years agoBug 9637 - Replace YUI button on local use system preferences page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 14:33:45 +0000 (09:33 -0500)]
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.

9 years agoMerge branch 'bug_9636' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:57:34 +0000 (08:57 -0500)]
Merge branch 'bug_9636' into 3.12-master

9 years agoBug 9636 - Replace YUI buttons on labels pages with Bootstrap
Owen Leonard [Sat, 2 Feb 2013 00:31:44 +0000 (19:31 -0500)]
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>
9 years agoMerge branch 'bug_9635' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:55:55 +0000 (08:55 -0500)]
Merge branch 'bug_9635' into 3.12-master

9 years agoBug 9635 - Replace YUI buttons on label batches pages with Bootstrap
Owen Leonard [Sat, 2 Feb 2013 15:07:04 +0000 (10:07 -0500)]
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>
9 years agoMerge branch 'bug_9633' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:53:11 +0000 (08:53 -0500)]
Merge branch 'bug_9633' into 3.12-master

9 years agoBug 9633 - Replace YUI button on the itemtypes administration page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 00:16:21 +0000 (19:16 -0500)]
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>
9 years agoMerge branch 'bug_9632' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:51:45 +0000 (08:51 -0500)]
Merge branch 'bug_9632' into 3.12-master

9 years agoBug 9632 - Replace YUI button on the currencies administration page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 00:09:42 +0000 (19:09 -0500)]
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>
9 years agoMerge branch 'bug_9631' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:50:23 +0000 (08:50 -0500)]
Merge branch 'bug_9631' into 3.12-master

9 years agoBug 9631 - Replace YUI buttons on classification sources administration page with...
Owen Leonard [Sat, 2 Feb 2013 23:49:52 +0000 (18:49 -0500)]
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>
9 years agoMerge branch 'bug_9630' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:48:36 +0000 (08:48 -0500)]
Merge branch 'bug_9630' into 3.12-master

9 years agoBug 9630 - Replace YUI button on cities and towns administration page with Bootstrap
Owen Leonard [Sat, 2 Feb 2013 18:40:23 +0000 (13:40 -0500)]
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>
9 years agoMerge branch 'bug_9629' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:47:28 +0000 (08:47 -0500)]
Merge branch 'bug_9629' into 3.12-master

9 years agoBug 9629 - Replace YUI button on patron category administration page with Bootstrap
Owen Leonard [Sat, 2 Feb 2013 23:26:25 +0000 (18:26 -0500)]
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>
9 years agoMerge branch 'bug_9628' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:24:38 +0000 (08:24 -0500)]
Merge branch 'bug_9628' into 3.12-master

9 years agoBug 9628 - Replace YUI buttons and menus on budgets administration pages with Bootstrap
Owen Leonard [Fri, 1 Feb 2013 20:31:27 +0000 (15:31 -0500)]
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>
9 years agoMerge branch 'bug_9627' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:23:07 +0000 (08:23 -0500)]
Merge branch 'bug_9627' into 3.12-master

9 years agoBug 9627 - Replace YUI buttons and menus on serials pages with Bootstrap
Owen Leonard [Thu, 31 Jan 2013 14:39:38 +0000 (09:39 -0500)]
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>
9 years agoMerge branch 'bug_9624' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:08:22 +0000 (08:08 -0500)]
Merge branch 'bug_9624' into 3.12-master

9 years agoBug 9624 - Replace YUI button on reports dictionary page with Bootstrap
Owen Leonard [Fri, 15 Feb 2013 16:31:46 +0000 (11:31 -0500)]
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>
9 years agoMerge branch 'bug_9623' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:07:16 +0000 (08:07 -0500)]
Merge branch 'bug_9623' into 3.12-master

9 years agoBug 9623 - Replace YUI button on authority types administration page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 20:21:21 +0000 (15:21 -0500)]
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>
9 years agoMerge branch 'bug_9622' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:05:43 +0000 (08:05 -0500)]
Merge branch 'bug_9622' into 3.12-master

9 years agoBug 9622 - Replace YUI button on MARC fameworks page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 20:12:39 +0000 (15:12 -0500)]
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>
9 years agoMerge branch 'bug_9621' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 13:04:15 +0000 (08:04 -0500)]
Merge branch 'bug_9621' into 3.12-master

9 years agoBug 9621 - Replace YUI menu on lists pages with Bootstrap
Owen Leonard [Thu, 31 Jan 2013 15:20:14 +0000 (10:20 -0500)]
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>
9 years agoMerge branch 'bug_9619' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 12:59:17 +0000 (07:59 -0500)]
Merge branch 'bug_9619' into 3.12-master

9 years agoBug 9619 - Replace YUI buttons on libraries administration page with Bootstrap
Owen Leonard [Fri, 15 Feb 2013 15:30:19 +0000 (10:30 -0500)]
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>
9 years agoMerge branch 'bug_9616' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 12:57:41 +0000 (07:57 -0500)]
Merge branch 'bug_9616' into 3.12-master

9 years agoBug 9616 - Replace YUI menu on patrons page with Bootstrap
Owen Leonard [Fri, 15 Feb 2013 15:37:50 +0000 (10:37 -0500)]
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>
9 years agoMerge branch 'bug_9648' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 12:55:37 +0000 (07:55 -0500)]
Merge branch 'bug_9648' into 3.12-master

9 years agoBug 9648 - Replace YUI buttons on authorized values administration page with Bootstrap
Owen Leonard [Sat, 16 Feb 2013 21:07:20 +0000 (16:07 -0500)]
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>
9 years agoMerge branch 'bug_9395' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 23:30:35 +0000 (18:30 -0500)]
Merge branch 'bug_9395' into 3.12-master

9 years agoBug 9395: Increment version number
Jared Camins-Esakov [Fri, 15 Feb 2013 23:30:27 +0000 (18:30 -0500)]
Bug 9395: Increment version number

Database update for bug 9395 has been given version 3.11.00.018

9 years agoBug 9395: Problem with callnumber and standard number searches
Vitor FERNANDES [Tue, 15 Jan 2013 17:19:59 +0000 (17:19 +0000)]
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>
9 years agoBug 7969 - select all / unselect all on fines page
Owen Leonard [Mon, 11 Feb 2013 20:29:08 +0000 (15:29 -0500)]
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>
9 years agoMerge branch 'bug_8906' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 14:08:13 +0000 (09:08 -0500)]
Merge branch 'bug_8906' into 3.12-master

9 years agoBug 8906: Followup replace 'Clear' with 'Delete'
Jonathan Druart [Wed, 26 Dec 2012 11:06:47 +0000 (12:06 +0100)]
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>
9 years agoBug 8906: Followup FIX hardcoded localhost url
Jonathan Druart [Tue, 20 Nov 2012 15:41:57 +0000 (16:41 +0100)]
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>
9 years agoBug 8906 - Improve OAI management interface
Owen Leonard [Thu, 11 Oct 2012 18:07:01 +0000 (14:07 -0400)]
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>
9 years agoMerge branch 'bug_9420' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 14:04:20 +0000 (09:04 -0500)]
Merge branch 'bug_9420' into 3.12-master

9 years agoBug 9420 [Revised] Work on Bootstrap for Koha: Circ toolbar
Owen Leonard [Wed, 30 Jan 2013 01:08:29 +0000 (20:08 -0500)]
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>
9 years agoBug 9420 [Revised] Work on Bootstrap for Koha
Owen Leonard [Fri, 25 Jan 2013 18:57:28 +0000 (13:57 -0500)]
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>
9 years agoMerge branch 'bug_9460' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:47:46 +0000 (08:47 -0500)]
Merge branch 'bug_9460' into 3.12-master

9 years agoBug 9460 - Use DataTables on transfers to receive report page
Owen Leonard [Wed, 23 Jan 2013 16:18:09 +0000 (11:18 -0500)]
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>
9 years agoMerge branch 'bug_9461' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:44:17 +0000 (08:44 -0500)]
Merge branch 'bug_9461' into 3.12-master

9 years agoBug 9461 [Revised] Use DataTables on holds awaiting pickup report page
Owen Leonard [Wed, 23 Jan 2013 16:43:04 +0000 (11:43 -0500)]
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>
9 years agoMerge branch 'bug_9465' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:41:48 +0000 (08:41 -0500)]
Merge branch 'bug_9465' into 3.12-master

9 years agoBug 9465 - Use DataTables on update child to adult patron page
Owen Leonard [Wed, 23 Jan 2013 17:53:33 +0000 (12:53 -0500)]
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>
9 years agoMerge branch 'bug_9467' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:36:14 +0000 (08:36 -0500)]
Merge branch 'bug_9467' into 3.12-master

9 years agoBug 9467 - Use DataTables on catalog by item type report page
Owen Leonard [Wed, 23 Jan 2013 19:21:49 +0000 (14:21 -0500)]
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>
9 years agoMerge branch 'bug_9226' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:34:13 +0000 (08:34 -0500)]
Merge branch 'bug_9226' into 3.12-master

9 years agoBug 9226: Wrong branch filter after suggestion creation
Fridolyn SOMERS [Thu, 6 Dec 2012 14:11:57 +0000 (15:11 +0100)]
Bug 9226: Wrong branch filter after suggestion creation

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Before the patch, upon submitting a new suggestion in the staff client I
was redirected to a view which was not filtered by branch. After the
patch I was redirected to a view which was filtered by my logged-in
branch.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9385' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:30:26 +0000 (08:30 -0500)]
Merge branch 'bug_9385' into 3.12-master

9 years agoBug 9385 - patron add labels right aligned in chrome
Owen Leonard [Mon, 11 Feb 2013 17:12:58 +0000 (12:12 -0500)]
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>
9 years agoMerge branch 'bug_9545' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:28:40 +0000 (08:28 -0500)]
Merge branch 'bug_9545' into 3.12-master

9 years agoBug 9545 - Followup Fix import MARC bibliographic framework text label
Jonathan Druart [Thu, 14 Feb 2013 14:23:01 +0000 (15:23 +0100)]
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>
9 years agoBug 9545 - Fix import MARC bibliographic framework text label
Owen Leonard [Mon, 11 Feb 2013 10:49:05 +0000 (05:49 -0500)]
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>
9 years agoMerge branch 'bug_9585' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:13:44 +0000 (08:13 -0500)]
Merge branch 'bug_9585' into 3.12-master

9 years agoBug 9585 - Fix spelling mistake in default tab conditional for opac-detail
David Cook [Mon, 11 Feb 2013 05:24:20 +0000 (16:24 +1100)]
Bug 9585 - Fix spelling mistake in default tab conditional for opac-detail

There is just a small typo where one of the results of a conditional is
"subscription" rather than "subscriptions".

If this comes up, the correct tab (subscriptions) will not be chosen.

I'm not sure what will happen...it'll probably just have the
"holdings", "subscriptions", and "serial collection" tabs all default
to closed with none of them being open.

Test Plan:

The easiest way to test is just to double-check the other strings in the
conditional which say "subscriptions" rather than "subscription".

You can also look at opac-detail.tt where the param is shown, and note
that there is no condition for "subscription" - just "subscriptions".

Any tests other than that would be overly complex for such a trivial
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>
9 years agoMerge branch 'bug_9592' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:07:53 +0000 (08:07 -0500)]
Merge branch 'bug_9592' into 3.12-master

9 years agoBug 9592 - update dependencies, allow blacklisting
Robin Sheat [Tue, 12 Feb 2013 01:56:14 +0000 (14:56 +1300)]
Bug 9592 - update dependencies, allow blacklisting

* Update the dependencies to match master
* Blacklist the CHI and Data::Pagination
* Perltidyed the list-deps script

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9592 - remove db-dependency from Members.pm
Robin Sheat [Wed, 13 Feb 2013 00:55:59 +0000 (13:55 +1300)]
Bug 9592 - remove db-dependency from Members.pm

This was causing test cases to fail on package builds, introduced in bug
7243.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9608' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 12:49:16 +0000 (07:49 -0500)]
Merge branch 'bug_9608' into 3.12-master

9 years agoBug 9608 - White background on header on check in
Owen Leonard [Wed, 13 Feb 2013 16:11:23 +0000 (11:11 -0500)]
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>
9 years agoMerge branch 'bug_7608' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 12:46:59 +0000 (07:46 -0500)]
Merge branch 'bug_7608' into 3.12-master

9 years agoBug 7608: Manual history should not always be enabled
Jared Camins-Esakov [Sun, 10 Feb 2013 18:39:50 +0000 (13:39 -0500)]
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>
9 years agoMerge branch 'bug_9454' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 12:44:09 +0000 (07:44 -0500)]
Merge branch 'bug_9454' into 3.12-master

9 years agoBug 9454: Use placeholders when adding basket
Colin Campbell [Wed, 23 Jan 2013 10:52:28 +0000 (10:52 +0000)]
Bug 9454: Use placeholders when adding basket

Should always use placeholders when passing variables
to DBI; avoids unforeseen bugs and security issues.

Also:

- reformated the long lists of parameters to add CR
- moved the setting of defaults out of the call to ModBasket to
  clarify code
- Setting parameters to undef if they were not defined
  was unnecessary bloat and obscuration

Testing:
Patch should not change functional behaviour. To test check that
order baskets can still be correctly created.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Created a new basket, added order lines and closed basket.
Checked everything worked in the staff interface, also checked
the entry for the new basket in aqbasket in the database.
Logs are clean too.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_7253' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 15:00:46 +0000 (10:00 -0500)]
Merge branch 'bug_7253' into 3.12-master