Commit graph

6537 commits

Author SHA1 Message Date
Juan Romay Sieira
a8f3860149 Bug 7262 - No calendar present in holidays module when there are quotes in title or description
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nice patch, making use of the Template::Toolkit filters

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-14 17:51:12 +01:00
Paul Poulain
f9e4c6424a Merge remote-tracking branch 'origin/new/bug_7135' 2011-12-14 15:54:34 +01:00
edd8e5767d Bug 7135 - in addbiblio, make save button floating to have it on always on screen
Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-14 15:52:55 +01:00
7fd5098b98 Bug 7202 - z39.50 search on bib edit not working
The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-14 15:48:26 +01:00
6bc414a3d4 Bug 7164 - add Koha history timeline tab to 'About' page
Includes follow up by Chris Cormack fixing formatting in docs/history.txt

[MINOR EDIT] Added html filter to output for validity's sake

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2011-12-14 14:44:45 +01:00
Brendan
04f8dfec9b Bug 7143: Follow up patch for Updating about.tt
I had a typo where I put Ian Walls as Release Manager - I have fixed to QA.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I put in another missing space for Colin Campbell.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-14 14:28:02 +01:00
Brendan
c3494eaaed Bug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2011-12-14 14:28:00 +01:00
da916a368c Fix for Bug 7135: Save button options
This patch adds a jQuery plugin which will cause
an element to remain "fixed" at the top of the
screen if it would otherwise scroll up out of
view.

The license of this plugin is "This plugin is as free as fresh
air. Feel free to use it anywhere.".

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I tested this on Chrome OSX
saving works
changing framework works
scrolling works, obviously.
tabbing through the records works
z39 button works as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
updated patch comment about licensing of the plugin
2011-12-13 18:01:33 +01:00
fff32393cf Fix for Bug 7123 - barcode should be one word
Other fixes thrown in for good measure:

- Adding data to the results table to match output of returns
- Better checking of error codes in the script to control
  output of error messages (don't show error box when there
  are no errors).
- Move some errors/messages from the right column onto the
  top of the page to match Koha's established pattern.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 17:48:02 +01:00
e65dc43af7 Fix for Bug 7121 - remove comma on items info
Because I can't just take out one comma, I reworked
the way moredetail.pl fetches and outputs biblio
data based on the way it does in detail.pl. This
allows for simpler output in the template.  In the
process I've added subtitle information to the
template.

Revision adds line break for readability

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 17:16:10 +01:00
da6c532074 Bug 6865 - Replace image-based gradient backgrounds with CSS3 gradients
Replaces image-based gradients in:

OPAC search bar
OPAC submit buttons
OPAC lists menu background
OPAC alert and message boxes
OPAC user menu tabs
Staff client alert and message boxes
Staff client side menu tabs

Removes obsoleted background image files.

Cross-browser background-gradients created using:
http://www.colorzilla.com/gradient-editor/

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 16:04:16 +01:00
5db3397041 Bug 6803: Replacing remote XSL include
Replacing remote include by local one.
This resolves possible connectivity issues (see Bugzilla comments).
Should theoretically be safer and faster too.

December 7, 2011: Rebased and included nbsp entity definition (bug 7141).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 15:56:09 +01:00
Christophe Croullebois
806fac60f4 Bug 6663: Features for holidays.pl with datepicker
Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I have added also Holidays repeated yearly on a range.
On suggestions I have added a datepicker for "To Date".

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 15:07:05 +01:00
Katrin Fischer
57800f2af2 Bug 7082: Template improvements for better translatability
Problem:
/cgi-bin/koha/admin/aqbudgets.pl
<label for="show_mine">Show my<br /> funds only</label>

This gets broken into 2 strings for translation which makes it very hard for
translators to make sense of it.
Patch removes the line break.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This patch removes the linebreak and has no ill effects that I can see, even
on a small screen. I'll attach before and after screenshots in Bugzilla.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 17:45:58 +01:00
Galen Charlton
18e06ecf0b bug 7198: show patron name in overdue list even if name column is null
If the surname or firstname of a patron is NULL, the MySQL concat()
function (properly) returns NULL, leading to the patron name not
displaying in the overdue report.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 16:32:13 +01:00
a98219dc34 Fix for Bug 7124 - back to search wrapping in lower resolutions
Maybe not a complete fix, but hopefully an improvement. I couldn't
prevent it from wrapping at smaller browser widths, but I was
able to change the style so that when it does wrap it's a little
more readable.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 15:35:01 +01:00
Frère Sébastien Marie
48173560ba Bug 7316 - Missing escaping in search results
Two parameters are now escaped in title (html element):
 - query_desc
 - limit_desc

This is a security correction against XSS.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-09 16:01:23 +01:00
c1dbd7bbbf Fix for Bug 6818 - acquisitions basket groups could use some design work
I've made changes to the basket grouping interface to bring it
in line with other interfaces in Koha. I think it's better to
keep things following a consistent pattern.

On the page which lists basket groups:

- Basket groups listed in a table instead of as custom-styled lists
- Buttons use standard style
- Tabs are generated by jQuery

On the page for managing baskets in a group:

- Markup has been revised to be more consistent with established
  patterns.
- Corrections have been made for validity

On the basket view page:

- Display of data has been streamlined a little bit
- An option has been added to the "Basket group" dropdown
  for adding a new group
- Markup has been corrected for validity and consistency

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Basket group page
The blue is gone and the new buttons  are much better
readable than before.

2) Basket grouping page
Works.

3) Basket view page
I like the new option to create a new group from here.
Nice improvement to the workflow!
I removed a spare 'td' from line 264.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 17:36:37 +01:00
8f0c10ef1b Bug 7259 - Show a count of items pending approval on staff client home and tools pages
- Correcting permissions checks on the home page
- Adding default parameter (1)  to numberofreviews subroutine

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 12:06:41 +01:00
d3c02c6bb6 Bug 7259 - Show a count of items pending approval on staff client home and tools pages
This patch adds count indicators on the staff client home page and
the tools page for the number of items pending approval. On the
home page this includes suggestions, comments, and tags. On the tools
page a count of pending comments and tags is shown.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Counts appear for all types of actionable items listed, all are clickable through to the proper place.

Nice work!
2011-12-08 12:04:28 +01:00
Katrin Fischer
5d6f770c18 Bug 7116: White space on item form for bulk ordering from staged file
Same fix that was done for normal order page and receive page.
Moving the style element for hiding the subfield into the li tag.

AcqCreateItem = on order

To recreate:
1) stage a marc file with 1 - many records
2) make sure you have an acq framework with hidden fields in 952
3) create new basket
4) order from your marc file
5) check item form below the record list for white space

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Followed the steps outlined by Katrin above. Before the patch there are gaping
holes left by the hidden fields. After the patch the holes are gone.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 11:52:59 +01:00
Jon Aker
90ddf1b254 Bug 7020 Items with no checkouts report does not output call number, barcode or item details
When running the Items with no checkouts report and outputting to
screen, the results do not include any identifying information for
the items. The only information listed is the item count and the
branch location.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 11:24:14 +01:00
Paul Poulain
c0234dd9b9 Merge remote-tracking branch 'origin/new/bug_5604' 2011-12-07 18:07:40 +01:00
Chris Cormack
e615516952 Bug 5604 : Follow up for missing image
When doing icons, there is a test for them please run

perl xt/author/icondirectories.t

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
see jenkins complaining: http://jenkins.koha-community.org/job/Koha_master/lastUnstableBuild/#showFailuresLink
2011-12-07 18:04:59 +01:00
Paul Poulain
f21577986f Merge remote-tracking branch 'origin/new/bug_6291' 2011-12-07 16:03:16 +01:00
b03cb0d545 Bug 6291 - Cart printing truncated in Firefox
Alternate fix suggested by http://www.sidesofmarch.com/index.php/archive/2007/04/25/firefox-truncates-long-tables-when-printing/

Seems absurd that changing the top heading from an <h1> to an <h2>
would fix the problem, but it does in my tests in Firefox 3.6 and 8
on Windows 7
2011-12-07 16:01:43 +01:00
Paul Poulain
39d401a0ce Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
This reverts commit da0a5b2bd6.
2011-12-07 16:01:27 +01:00
Jared Camins-Esakov
6f043aa82f Bug 6971: XSLT Intranet Detail displays 245 subfields out of order
245 Subfields in the Intranet Detail Display (MARC21slim2intranetDetail.xsl) are
being reordered on display. Instead of displaying 245$a 245$h 245$b, the
stylesheet was displaying 245$a 245$b 245$h. This patch does not address ISBD
punctuation.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Follow-up patch to address the issue in the staff client.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 20:42:23 +01:00
Albert Oller
d71e696567 Bug 6971: XSLT Opac Detail displays 245 subfields out of order.
245 Subfields in the OPAC Detail Display (MARC21slim2OPACDetail.xsl) are being
reordered on display. Instead of displaying 245$a 245$h 245$b, the stylesheet
was displaying 245$a 245$b 245$h. This patch does not address ISBD punctuation.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Clarified commit message.
2011-12-06 20:42:16 +01:00
Paul Poulain
aef1dd15fb Merge remote-tracking branch 'origin/new/bug_5604' 2011-12-06 19:46:55 +01:00
Chris Nighswonger
fa0bc2b08d Fixing typo in image filename which introduced a space causing problems on win32
http://bugs.koha-community.org/show_bug.cgi?id=5604
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 19:45:52 +01:00
2177562ecf Bug 3385 - Add checkout date and renewal date to display list of checked out items
This patch doesn't fix the origial request to add the renewal date
to the list of checked out items, but follows the other bug commenter's
suggestion that the information be added to the item details page
(moredetail.pl).

The other part of this request, to add the checkout date, has already
been fixed by another patch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 19:22:01 +01:00
Katrin Fischer
d0ef505fc4 Bug 6740: can add items at ordering/receiving but not remove
The problem was, that the script was looking for the first
and second <a> tag in the code. When using plugins in the framework
this can't work. The patch changes the script to select the correct
<a> tags by using a class.

Also changes + and - to 'Add' and 'Delete' to make the meaning clearer
and clicking on them a bit easier.

To test:
1) AcqCreateItem = order
- Create a basket
- Create an order line
- Create more than one item
- Delete items
- Check quantity is calculated correctly
- Check items are created correctly

2) AcqCreateItem = receive
- Create basket
- Create 2 order lines, order >1 items
- Do a partial item by removing items from the receive form
- Receive all missing items
- Receive more items than ordered

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 19:07:33 +01:00
f9763a8ec9 Bug 7280 - can't place hold without selecting on list
JavaScript was looking for clicks on links with class "hold,"
and incorrectly triggering the check for checked checkboxes.
Making the selection stricter lets the JS function as it should
while allowing people to place individual holds directly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 18:54:55 +01:00
3be1252e1b Bug 7225 - "Delete all items" should be greyed out when a title has no items
This patch changes the catalog toolbar so that when there are no
items attached to a record the "Delete all items" menu item appears
to be disabled. Clicking it will trigger an alert, "This record
has no items."

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 17:07:57 +01:00
Frédérick Capovilla
7534c34cdb Fix a problem when translations contain &nbsp; various XSL files
With new 3.6.1 translation files, the lake of 'nbsp' entity definition make
fail t/00-valid-xml.t test.

This patch applies to HEAD and 3.6.x.

How to test:

  - checkout 3.6.x branch
  - generate French templates:
    cd misc/translator
    ./translate install fr-FR
    cd ../..
  - run test:
    prove -v t/00-valid-xml.t
    you get failing error message
  - apply this patch
  - run test again: it passes

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

http://bugs.koha-community.org/show_bug.cgi?id=7141
2011-12-06 12:16:04 +01:00
5a6c8b3675 Fix for Bug 7137 - fixed width table where it should be variable
Removing inline style setting the table width.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 12:13:58 +01:00
Liz Rea
e0cba61e31 Bug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across OPAC user pages.
To test:
verify that the div <div class="yui-g" id="usermessaging"> appears and can be styled via opacusercss.

Signed-off-by: Arslan Farooq <arslanone@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 12:11:28 +01:00
dc249205a2 Fix for Bug 7120 - After deleting order from order receive page redirect fails
The order modification script doesn't retrieve an order's basket
when doing a delete, so the template must explicitly pass
the basket number if we want the redirect to work.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 12:02:49 +01:00
Martin Renvoize
5a86cb4ed9 Bug7108: Intranet Language Menu Display Patch
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 11:55:48 +01:00
ccc182f260 Bug 7108 - OPAC Translations Display Patch
If multiple similar languages (i.e: fr-FR, fr-CS or en, en-GB) are installed
and  the opaclanguagesdisplay preference is set to allow patrons to choose a
language then at each occurrence of a language with multiple options the
display is the selector splits across multiple lines breaking the display.

http://bugs.koha-community.org/show_bug.cgi?id=7108
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 11:55:44 +01:00
Paul Poulain
f029e9aba7 Merge remote-tracking branch 'origin/new/bug_6966' 2011-12-03 07:52:07 +01:00
Nicole C. Engard
ab90434b58 Bug 6966 Updated Patron Attribute Help File
A new patch required an additional line in this help
file.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-12-03 07:51:38 +01:00
Paul Poulain
6980d82991 Merge remote-tracking branch 'origin/new/bug_5974' 2011-12-03 07:36:44 +01:00
Katrin Fischer
9cecb7a9d3 Bug 5974: Fix broken toolbar on paton checkout tab
Fixed a couple of errors:
- [% CAN_user_staffaccess %] should be [% IF ( CAN_user_staffaccess ) %]
- added missing [% END %]
- added missing line new YAHOO.widget.Button("duplicate");

To test:
1) Open patron account
2) Go through tabs, especially 'Check out'
3) Check toolbars are correct and buttons work

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-03 07:36:04 +01:00
Paul Poulain
c7ef4da571 Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
see
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6291, comment 7, 9 and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7279

This reverts commit da0a5b2bd6.
2011-11-30 17:12:06 +01:00
Chris Cormack
66fa828846 Bug 7268: Fixing failing tests for translatable templates
To test run

perl xt/author/translatable-templates.t

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test runs without any complaints about the fixed templates now.
Also checked detail pages without XSLT turned on display correctly.
2011-11-28 11:22:06 +01:00
Chris Cormack
3e05393dd8 Bug 6328 : Previous patches broke templates, this is fixing them
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes xt/tt_valid.t
Checked the member entry page, didn't find any problems.
2011-11-28 10:11:46 +01:00
Paul Poulain
41b42dbe32 Bug 6328 follow-up for QA comments
* fixed documentation in C4/Auth_with_ldap.pm
* updated ILSDI/Utility.pm to work with debarred being a date
* updated Members.pm/patronflags to work with debarred being a date (copy/paste of BibLibre code that had not been backported)
* fixed opac-reserve to check correctly for debarred status

I also have removed a duplicate line on circulation.pl when the patron was restricted = the information was displayed twice
2011-11-25 14:00:47 +01:00
Paul Poulain
1fe3514c3c Bug 6328 fine in days does not work
Some code coming from BibLibre has been lost in the process of inclusion in
3.4. The result is that fine in days does not work at all (you can setup rules,
but it does nothing)

Step to reproduce:

- Koha > Admin > circ rules > set 1 day fine every day of overdue for default
  rule
- Issue a book return date last week
- check-in the book => no debarment is set

The following patch will fix all of those problems by :

* updating borrowers.debarred to a date field (instead of tinyint). It contains
  the limit of the debarment
* changing API of DebarMember and UpdateBorrowerDebarred to pass a date
* display debarrdate where applicable. Note that a debarrdate of 31/12/9999 is
  considered as unlimited and not displayed
* added a debarrcomment, usefull to explain why a patron is debarred (this is
  independant from debarrdate changes and can be used when placing an unlimited
  debarment too)

[2011-05-12] F. Demians. It works as described. And I can confirm this
functionality is impatiently awaited by French libraries since one year. Thanks
BibLibre for the good work and for contributing this code.

Bug 6328 Followup--update DB structure

Thanks Katrin.

Bug 6328: make comment a textbox / fix debar by notice trigger

Debarring by notice triggers was broken, because the new function
expects a date as second parameter.

The comment field in patron account details was a very long text field.
Patch changes it to be a textbox instead.

Bug 6328: Lift debarment leaves patron account

'Lift debarment' redirects to an empty circulation page.

BZ6328 follow-up 3

Fixes comment 23 from Fernando L. Canizo : when the patron was debarred and debar removed
he still could not check-out.

The changes in the IsMemberBlocked (that were on biblibre/master) were lost somewhere
The sub was still checking for old_issues instead of calling CheckBorrowerDebarred
to get a debardate if applicable

Note : this bug was appearing only is you had issuing rules defined for itemtype/categorycode/branch.
Seemed to work if you had only default rules. That's probably why it hadn't been spotted before

BZ6328 follow-up 4
Comments fron Zeno Tajoli: The patch is OK and I sign-off it. Two little changes done on
installer/data/mysql/kohastructure.sql and installer/data/mysql/updatedatabase.pl

Signed-off-by: koha <koha@kohabase.localdomain>
2011-11-25 14:00:47 +01:00