Commit Graph

17944 Commits

Author SHA1 Message Date
Owen Leonard 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
Jared Camins-Esakov c8a8825367 Merge branch 'bug_9629' into 3.12-master 2013-02-18 08:47:28 -05:00
Owen Leonard 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
Jared Camins-Esakov 7d7063ff03 Merge branch 'bug_9628' into 3.12-master 2013-02-18 08:24:38 -05:00
Owen Leonard 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
Jared Camins-Esakov 82f9234dc9 Merge branch 'bug_9627' into 3.12-master 2013-02-18 08:23:07 -05:00
Owen Leonard 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
Jared Camins-Esakov 2774064e94 Merge branch 'bug_9624' into 3.12-master 2013-02-18 08:08:22 -05:00
Owen Leonard 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
Jared Camins-Esakov c7334b03cd Merge branch 'bug_9623' into 3.12-master 2013-02-18 08:07:16 -05:00
Owen Leonard 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
Jared Camins-Esakov 28db493f16 Merge branch 'bug_9622' into 3.12-master 2013-02-18 08:05:43 -05:00
Owen Leonard 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
Jared Camins-Esakov 902e389836 Merge branch 'bug_9621' into 3.12-master 2013-02-18 08:04:15 -05:00
Owen Leonard 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
Jared Camins-Esakov b2e24d9bf8 Merge branch 'bug_9619' into 3.12-master 2013-02-18 07:59:17 -05:00
Owen Leonard 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
Jared Camins-Esakov 5690031777 Merge branch 'bug_9616' into 3.12-master 2013-02-18 07:57:41 -05:00
Owen Leonard 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
Jared Camins-Esakov 3edb382bbc Merge branch 'bug_9648' into 3.12-master 2013-02-18 07:55:37 -05:00
Owen Leonard 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
Jared Camins-Esakov 64dea6ca5f Merge branch 'bug_9395' into 3.12-master 2013-02-15 18:30:35 -05:00
Jared Camins-Esakov 63663d5b15 Bug 9395: Increment version number
Database update for bug 9395 has been given version 3.11.00.018
2013-02-15 18:30:27 -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
Jared Camins-Esakov 5691663e34 Merge branch 'bug_8906' into 3.12-master 2013-02-15 09:08:13 -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
Owen Leonard 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
Jared Camins-Esakov 26f473ca75 Merge branch 'bug_9420' into 3.12-master 2013-02-15 09:04:20 -05:00
Owen Leonard 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
Owen Leonard 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
Jared Camins-Esakov a386df2c78 Merge branch 'bug_9460' into 3.12-master 2013-02-15 08:47:46 -05:00
Owen Leonard 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
Jared Camins-Esakov 58a5a79d64 Merge branch 'bug_9461' into 3.12-master 2013-02-15 08:44:17 -05:00
Owen Leonard 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
Jared Camins-Esakov 8c1646006c Merge branch 'bug_9465' into 3.12-master 2013-02-15 08:41:48 -05:00
Owen Leonard 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
Jared Camins-Esakov 191c019669 Merge branch 'bug_9467' into 3.12-master 2013-02-15 08:36:14 -05:00
Owen Leonard 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
Jared Camins-Esakov 98120fc0c8 Merge branch 'bug_9226' into 3.12-master 2013-02-15 08:34:13 -05:00
Fridolyn SOMERS fe48757668 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>
2013-02-15 08:34:11 -05:00
Jared Camins-Esakov cec7c3c91a Merge branch 'bug_9385' into 3.12-master 2013-02-15 08:30:26 -05:00
Owen Leonard 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
Jared Camins-Esakov 01a95c2302 Merge branch 'bug_9545' into 3.12-master 2013-02-15 08:28:40 -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
Owen Leonard 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
Jared Camins-Esakov 5d153be1d8 Merge branch 'bug_9585' into 3.12-master 2013-02-15 08:13:44 -05:00
David Cook f7e8e22541 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>
2013-02-15 08:13:40 -05:00
Jared Camins-Esakov e85c55ace7 Merge branch 'bug_9592' into 3.12-master 2013-02-15 08:07:53 -05:00
Robin Sheat 93a802459f 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>
2013-02-15 08:06:51 -05:00