Commit graph

18433 commits

Author SHA1 Message Date
fe5115e2ae Bug 9688 - Replace YUI button on Authority MARC framework toolbar with Bootstrap
This patch converts the toolbar used on the Authority MARC framework
toolbar to Bootstrap, replacing YUI button code with Bootstrap markup.

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

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

Comment: 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-03-07 10:18:17 -05:00
Jared Camins-Esakov
e84c0b6798 Merge branch 'bug_9689' into 3.12-master 2013-03-07 10:16:39 -05:00
3d883a97ce Bug 9689 - Replace YUI buttons on the OAI sets administration page with Bootstrap
This patch converts the toolbar on the OAI sets administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the OAI sets administration page and confirm that the "New
set" button looks correct and works correctly.

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

Comment: Works and looks nice. 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-03-07 10:16:36 -05:00
Jared Camins-Esakov
fe85b19ac6 Merge branch 'bug_9693' into 3.12-master 2013-03-07 10:03:48 -05:00
4334cd195a Bug 9693 - Remove YUI styling from buttons on the patron card creator's image manage page
Buttons on the patron card creator's image manage page are styled using
YUI. They can be classified as submit buttons rather than toolbar
buttons, so they should have default submit button styles.

This patch removes YUI styling and related JavaScript. Other minor
changes: Markup corrections for validity.

To test, view the patron card creator's image manage page. "Upload" and
"Delete" buttons should look correct and work correctly. Upload and
delete operations should function normally.

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

Comment: Work as described. No errors.
Questions answered in comments.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and is more consistent.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 10:03:25 -05:00
Jared Camins-Esakov
f1d8191499 Merge branch 'bug_9694' into 3.12-master 2013-03-07 09:57:38 -05:00
fc26ee3bae Bug 9694 - Remove YUI styling from buttons on the patron card creator manage pages
Buttons on the patron card creator's manage pages (manage templates,
manage profiles, etc) are styled using YUI. They can be classified as
submit buttons rather than toolbar buttons, so they should have default
submit button styles.

This patch removes YUI styling and related JavaScript. Other minor
changes: Escaping strings in JavaScript for translation.

To test, view the patron card creator's manage page for layouts,
templates, profiles, and batches. "Edit," "Delete," and "Export" buttons
should look correct and work correctly.

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

Comment: Work as described. On errors.
Tested all manage pages, edit, delete, and export buttons.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, improves consistency.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:57:35 -05:00
Jared Camins-Esakov
e2c2fe6751 Merge branch 'bug_9696' into 3.12-master 2013-03-07 09:55:24 -05:00
2c01d28c40 Bug 9696 - Remove YUI styling from buttons on patron card creator edit pages
Submit and cancel buttons on patron card creator edit pages should not
be styled differently than other submit and cancel controls.

This patch removes YUI styling of these controls and makes them
consistent with controls on other Koha pages. The "Cancel" button has
been removed altogether from the batch edit page since there is not a
corresponding submit button.

To test, got to the patron card creator and edit a batch, a layout, a
profile, and a template. Submit and cancel controls should look correct
and work correctly.

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

Comment: Work as described. Works and looks well. No errors.

Note: It's true that edit batch has not a submit button, but
on the other managed pages (layout, profile, template) cancel
aborts editing and takes you to a list of objects (layout, etc.)
Now if we selected the wrong batch, we need to click on left menu o
back button (yay). Are we loosing a consistent interface?
Just thinking.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, more consistent with Koha's general interface
patterns.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:55:21 -05:00
Jared Camins-Esakov
424bf484ea Merge branch 'bug_9698' into 3.12-master 2013-03-07 09:52:22 -05:00
bf19223a79 Bug 9698 - Replace YUI buttons on patron card creator manage toolbar with Bootstrap
This patch converts the toolbar include file used by the patron card
creator home and manage pages 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").

To test, view the patron card creator home page and any manage page
("Manage layouts," "Manage profiles," etc). Buttons should look correct
and work correctly.

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

Comment: Work as described. No errors.
No "plus" sign for this buttons?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No plus signs? :)
Works nicely and didn't have the plus before, so it's ok.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:52:20 -05:00
Jared Camins-Esakov
821d0aa1c3 Merge branch 'bug_9586' into 3.12-master 2013-03-07 09:50:04 -05:00
96b6f39e7a Bug 9586 - Remove $ENV{DEBUG} info from Member Template
Currently, if $ENV{DEBUG} is set (for example to 1), the debug level
will be printed on the Add/Edit Patron pages (memberentrygen.tt) in the
form of: "Debug is on (level 1)".

While many if not most folks might not set $ENV{DEBUG} on a production
system, there is no reason to have this information printing on the
member template(s).

No where else in Koha is there a template that prints $ENV{DEBUG}
information, with the exception of calendar.inc, although that doesn't
activate until at least debug level 2 or 5, so it might be worth holding
on to. It is certainly more complicated than simply printing the debug
level. I don't do development on the calendars, so I'm not going to
address that one.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:49:10 -05:00
Jared Camins-Esakov
9ca04faad1 Merge branch 'bug_9267' into 3.12-master 2013-03-07 09:47:26 -05:00
2999014d28 Bug 9267 - Ubuntu 12.04 install docs broken
Current install instructions are broken in the (1.6) step. On amd64
architectures it breaks the whole dependency tree, pulling i386 packages.

This patch replaces the 'dpkg --set-selections' combo and replacess some spaces
for tabs in one line.

This should be cherry-picked for other releases that have 12.04 install instructions
as the problem is related to multiarch.

Regards
To+

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:46:55 -05:00
Jared Camins-Esakov
e5eb9a222f Merge branch 'bug_9570' into 3.12-master 2013-03-07 09:34:00 -05:00
8129680afd Bug 9570 - view plain not working in ccsr
The code in opac-showmarc.pl isn't smart enough to find the xsl files in
the "default" (prog) theme if the ccsr theme is enabled, so the "view
plain" option on opac-MARCdetail.pl fails ever time.

This patch copies some path-handling code from XSLT.pm to improve xsl
file path handling when dealing with a "sub-theme."

To test, view the MARC view in the OPAC and click the "view plain" link.
This should work correctly in prog and ccsr themes and with different
languages enabled (keeping in mind the ccsr theme will fail in general
for languages other than en).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked plain view works in both prog and ccsr themes now.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:33:57 -05:00
Jared Camins-Esakov
203fb520db Merge branch 'bug_9620' into 3.12-master 2013-03-07 09:31:29 -05:00
c5987b423b Bug 9620: IncludeSeeFromInSearches and data in $9 subfields can break indexing
In Germany 020$9 is used to store the ISBN with hyphens. In rare cases this
can break indexing in combination with IncludeSeeFromInSearches.

To reproduce:
1) Change your frameworks:
  * Make sure 084 $a is visible
  * Create a 084 $9 that you link to PERSO_NAME authorities.
2) Create a record or edit an existing one:
  * Use the plugin on 084 to link the record to an authority.
  * Make sure 400 is filled in your authority record.

Preparations all done, now test indexing:

3) Make sure IncludeSeeFromInSearches is OFF
  * Reindexing should work without any problems.

4) Activate IncludeSeeFromInSearches
  * Reindexing should throw an error and stop:
    201.Subfields are only for data fields (generally,
    just tags >= 010 at /home/koha/Koha/Filter/MARC/EmbedSee
    FromHeadings.pm line 94

5) Apply patch and reindex.
  * No error should occur.
  * Test 4xx fields from other tags were properly indexed.

What causes the problem is the fact, that Koha tries to store
the date from the 400 in the bibliographic record for indexing.
For this it calculates a tag in the bibliographic record from the
tag it found the authority link in and the 4xx tags used in the
authority record. If you have an authority linked to a 0xx field
and the matching authority has a 4xx where xx < 10, the calculated
tag will be a control field. The attempt to add subfields to this
control field, is causing the error and breaks the indexing process.

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

Comment: Work as described, and is a long description :)
Test:
1) Enabled 084 (all subfields visible), added 084_9 (missing from
default framework) linked to PERSO_NAME
2) Edited authority record and added some data to 400
3) Edited bib record, linked 084 to previous auth record
4) With IncludeSeeFromInSearches OFF, re-index without problem
5) With IncludeSeeFromInSearches ON, re-index problems!!!
====================
exporting biblio
====================
1...Subfields are only for data fields (generally, just tags >= 010) at...
Abort
6) Applied patch
7) With IncludeSeeFromInSearches ON, re-index without problem
...
====================
5001....................................................................................................
Records exported: 5060
====================
...
====================
2001....................................................................................................
Records exported: 2024
====================
CLEANING
====================
Good!

*) That's "works as described", don't know if other tests are needed.

No errors from koha-qa

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:31:11 -05:00
Jared Camins-Esakov
6ee03f1b4f Merge branch 'bug_9653' into 3.12-master 2013-03-07 09:28:55 -05:00
Jonathan Druart
179ade7282 Bug 9653: FIX collapse class is used by already Bootstrap
Quick, simple and dirty fix.

Test plan:
Apply this patch and check that filters are present on the suggestion
management page.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Filters are back on the page, regression fixed.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:28:53 -05:00
Jared Camins-Esakov
b5094156bd Merge branch 'bug_9656' into 3.12-master 2013-03-07 09:27:06 -05:00
Jonathan Druart
c65b45e3b4 Bug 9656: Followup Make logging to a file optional (for fines)
The -log option become optional if the -output_dir is given.

Test plan:
call the script with
1/ no one parameter : no log file
2/ -l : log file will be created in /tmp
3/ -o=/home/koha/var/log : log file with be created in the specified
4/ -o=/home/koha/var/log -l: Same as 3/

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

Comment: All combination of options tested. Works well. No errors.
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:27:02 -05:00
Chris Cormack
d2bee4486c Bug 9656: Make logging to a file optional (for fines)
To test:
1/ Before the patch run misc/cronjobs/fines.pl
   Notice that a file has been written to /tmp

2/ rm the file

3/ Apply the patch and run the script again
   Notice the file is not created

4/ run the script with -l
   Notice the file is created again

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

Comment: Now it work as described. No errors.
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:27:01 -05:00
Jared Camins-Esakov
3c35d59c33 Merge branch 'bug_8620' into 3.12-master 2013-03-07 09:19:46 -05:00
Jared Camins-Esakov
e56a0a0e62 Bug 8620: Any index in DOM mode sensitive to -x flag of rebuild_zebra.pl
The definition of the Any index was sensitive to whether
spaces were present between (say) subfield elements in the
MARCXML representation of the bib being indexed.  When using
the -x option to rebuild_zebra.pl, spaces would be present
because of how MARC::File::XML emits MARCXML.

When not using the -x option, spaces would not be present
and the contents of a field would be run together, potentially
as one big token.

The visible behavior was that doing a keyword search by
item barcode would sometimes not work.

To test:
0) Make sure Zebra is using DOM mode
1) Create an item record.
2) Reindex using rebuild_zebra.pl -b -z, *without* -x
3) Do a keyword search by the barcode of the item just
   added; the search shouldn't work
4) Apply patch.
5) Update the following two files:
    etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
    etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
6) Reindex
7) Do a search that was previously failing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes the problem for me - formerly not working callnumbers
and barcodes are now found in keyword (any) searches.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(revised commit description to better explain why it fixes the problem)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Passes all my tests, happy to sign off
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:19:43 -05:00
Jared Camins-Esakov
bacfa56426 Merge branch 'bug_9574' into 3.12-master 2013-03-07 09:17:53 -05:00
Jared Camins-Esakov
4a84038a86 Bug 9574: Plack fixes for serials/subscription-add.pl
This patch fixes the following warnings under Plack:
* Use of uninitialized value $firstissuedate in string eq at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 92.
* Use of uninitialized value $firstissuedate in substr at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 105.
* Use of qw(...) as parentheses is deprecated at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 95.
* Variable "$firstissuedate" is not available at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 338.

To test:
1) Create a subscription. Ensure that setting the first issue's
   publication date works.
2) Edit a subscription. Ensure that the first issue's publication
   date shows up.
3) Sign off.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No regressions found, all tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:17:48 -05:00
Jared Camins-Esakov
1f88190fdd Merge branch 'bug_9445' into 3.12-master 2013-03-02 12:25:33 -05:00
27a57b7cf0 Bug 9445 [Revised] Use DataTables in local use system preferences editor
Replace the tablesorter plugin with the DataTables plugin in the
local use system preferences editor.

This patch moves embedding of the toolbar and table-sorting JS from
within the body of the page to the <head> for sake of consistency.

To test, open the system preferences editor to the Local Use tab.
Confirm that table sorting works correctly. In this configuration there
should be no pager and no results filtering.

Revision corrects template path to datatables assets.

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

Comment: Tab sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Further revision removes old tablesorter code
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-02 12:25:29 -05:00
Jared Camins-Esakov
74e9221ba1 Merge branch 'bug_9674' into 3.12-master 2013-03-02 12:22:10 -05:00
36aa22d3c8 Bug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap
This patch converts the toolbar on acquisitions pages to Bootstrap,
replacing YUI button code with Bootstrap markup.

To test, view acquisitions pages and confirm that buttons look correct
and work correctly:

- acqui-home.pl (Acquisitions home page)
- booksellers.pl (Acquisitions -> Vendor search)
- supplier.pl (Acquisitions -> Vendor search -> Vendor)
- aqcontract.pl (Acquisitions -> Vendor search -> Vendor -> Contracts)
- uncertainprice.pl (Aquisitions -> Vendor search -> Vendor -> Uncertain
  prices)

View these pages for vendors with and without orders.

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

Comment: Buttons works. No errors.
Tested vendors with and without orders (delete button in last case)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, changes are consistent.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-02 12:22:07 -05:00
Jared Camins-Esakov
3aac90419e Merge branch 'bug_9675' into 3.12-master 2013-03-02 12:20:12 -05:00
5347a48ce5 Bug 9675 - Replace YUI buttons on authorities home page with Bootstrap
This patch converts the toolbar include file used by the
authorities home page and authority view page
(authorities-home.pl and authorities/detail.pl) replacing YUI button
and menu code with Bootstrap.

To test:

- View the authorities home page and confirm that the "New
  authority" button looks correct and works correctly.
- Search for an existing authority and click the "Details" link to view.
  "Edit," "Delete," "Save," and "New authority" buttons should look
  correct and work correctly. The "Delete" button should only appear for
  authorities which are unused.

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

Comment: Now it works. New and all operations on existing auth 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-03-02 12:20:08 -05:00
Jared Camins-Esakov
7e529fed2e Merge branch 'bug_9397' into 3.12-master 2013-03-02 12:18:19 -05:00
Corey Fuimaono
abf8076d5c bug 9397 - Error Messages hard to find for Visually Impaired Users (Accessibility) [Returning Items] {REVISION 1.1}
testing procedure:
1. Check in Invalid Item
2. See that new header has been added. "Can't Check in"

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
A followup may come that makes this text invisible, but this helps accessibility a great dea, and passes validation.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: replace "Can't Check in" with "Cannot check in" and
delete a h3 element with the same text in order to avoid duplicated
messages.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-02 12:18:15 -05:00
Jared Camins-Esakov
26ae634a29 Merge branch 'bug_9520' into 3.12-master 2013-03-02 12:12:28 -05:00
Jared Camins-Esakov
6fbe246257 Bug 9520: Increment version number
Database update for bug 9520 has been given version 3.11.00.023
2013-03-02 12:09:26 -05:00
Bernardo Gonzalez Kriegel
7e0f0178fb Bug 9520 -[Revised] - Update default LOC Z39.50 target
This patch updates (if present) target settings
of Library of Congress Z39.50 server.

Revision: Was trying to update wrong column 'type',
now correct column 'syntax'.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: add the SetVersion call
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-02 12:09:09 -05:00
Jared Camins-Esakov
558acf88b0 Merge branch 'bug_9617' into 3.12-master 2013-03-02 12:07:06 -05:00
Jared Camins-Esakov
12b1a87570 Merge branch 'bug_9617' into 3.12-master 2013-03-02 11:58:50 -05:00
cb6d604e91 Bug 9617 - Replace YUI menu on catalog pages with Bootstrap
This patch converts the toolbar include file used by catalog detail
pages (detail.pl, MARCdetail.pl, etc.) replacing YUI button and menu
code with Bootstrap.

Minor change to staff client CSS fixes issue with language footer.
Minor change to doc-head-close.inc corrects error in logic for handling
cart and lists js discovered in testing.

To test, view any page which uses cat-toolbar.inc. Buttons and menus
should look correct and work correctly. Functions to test include:

New record
New item
New subscription
New child record

Edit record
Edit items
Edit items in a batch
Delete items in a batch
Attach item
Edit as new (duplicate)
Replace record via Z39.50
Delete record
Delete all items

Save (various formats)

Add to cart
Add to list

Print

Place hold (including with search-to-hold active).

Testing should be done by users with varying permissions including with
and without:

CAN_user_serials_create_subscription
CAN_user_editcatalogue_edit_catalogue
CAN_user_editcatalogue_edit_items
CAN_user_tools_items_batchmod
CAN_user_tools_items_batchdel

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

Comment: All buttons tested. Works as described. No Errors.
Looks good.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-02 11:58:47 -05:00
Jared Camins-Esakov
4fc65c47a1 Merge branch 'bug_3549' into 3.12-master 2013-02-28 19:30:36 -05:00
Bernardo Gonzalez Kriegel
590c476f09 Bug 3549 -[Revised]- Framework sorting in addbook
Reviewing Bug 9649, this bug comes up.

This patch correctly sort frameworks by description.

To test:
1) Go to Cataloguing home, button 'New record' shows
unordered list of frameworks
2) Apply the patch
3) refresh, the list must be correctly sorted.

Revised to sort using uppercase.

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-28 19:30:33 -05:00
Jared Camins-Esakov
e247af6723 Merge branch 'bug_9555' into 3.12-master 2013-02-28 19:16:04 -05:00
Jonathan Druart
f36ac484c9 Bug 9555: Template files contain single quote strings
Test plan:
- launch the test xt/single_quotes.t, there are 3 occurrences
- apply this patch
- launch the test. It will pass with success
- Check that there is no regression on the 2 modified intranet files and
  the calendar still works at the OPAC.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, also checked calendar still works.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-28 19:16:00 -05:00
Jared Camins-Esakov
4f0191e187 Merge branch 'bug_9669' into 3.12-master 2013-02-28 19:14:49 -05:00
495ff79239 Bug 9669 - Replace YUI buttons on staff client cart toolbar
This patch converts the toolbar on the staff client cart
page to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the staff client cart and confirm that all buttons look
correct and work correctly. Functions to test include:

Full/brief display
Send
Download (various options)
Print
Empty and close
Hide window

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

Comment: Tested all buttons, works very well. No errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-28 19:14:46 -05:00
Jared Camins-Esakov
7141dada5e Merge branch 'bug_5333' into 3.12-master 2013-02-28 19:11:27 -05:00
9bdf28b555 Bug 5333 - z3950 normalization should apply only on UNIMARC
It's been a while since this bug is around. This normalization is only
used for UNIMARC and yields a fatal error when those variables are set
on (at least) MARC21 setups.

Regards
To+

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: update comment
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-28 19:11:24 -05:00