Commit graph

4336 commits

Author SHA1 Message Date
1a20f3005b ug 8078 [REVISED] my summary showing contents of incorrect tab
This patch moves the holdings tab content to the correct
position sequentially with regard to the order of the
tabs themselves. My guess is that the jQuery upgrade has
something to do with this change but I'm not sure why
(probably something in our aging tabs plugin which works
differently with the new jQuery version).

Making the sequence of the tab contents match the sequence
of the tabs seems to fix the problem.

Revised to correct the error in placement of the tags markup
in the staff client.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-28 10:36:27 +02:00
Katrin Fischer
2f837bafee Bug 7926: Acq search results show empty () for orders without basket group
To test:
- search for orders by title or vendor
- make sure some results are attached to a basket group, while others are not
- make sure correct information shows in the basket group column of search results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

- Fixed merge conflict

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:44:43 +02:00
cfae2c6a61 Bug 8080 - login and password is pre-filled by the browser when creating a new patron
When creating a new patron, if you have chosen to let your browser remember your
login and password for you, the login and password fields will be pre-filled with
them, leading to a systematic error "the passwords entered do not match" since
the second password field was not filled. These fields should be blank.

Add the directive autocomplete="off" to the memberentry form tags.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
enhances usability of password forms, gets my signoff.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:32:56 +02:00
fe823735a5 Bug 8107 - Disabled buttons not distinguishable from enabled buttons
Add a "greyed-out" style for disabled buttons.

Having looked through the templates for examples of usage of this
I'm not convinced that we should really be showing disabled buttons.
I think in general it would be better to hide or show a button
based on whether the action is available.

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

I agree, I think hiding or showing is better, but this patch is
harmless enough, until we want to go fixing our usage

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:30:50 +02:00
Jonathan Druart
1b08f100ba Bug 5345: DataTables integration in acquisition module [4]
basket.tt
'Modify' and 'Delete' columns become unsortable

http://bugs.koha-community.org/show_bug.cgi?id=8109
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:28:55 +02:00
Jonathan Druart
a90d58e518 Bug 5345: DataTables integration in acquisition module [4]
basket.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Columns for 'Modify' and 'Delete' are sortable, which doesn't hurt but could be removed.

http://bugs.koha-community.org/show_bug.cgi?id=8109
2012-05-25 17:28:53 +02:00
Jonathan Druart
9a1550bf53 Bug 8009: Followup Item descriptive data not populated on pay.pl
Separation of title from the description.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:26:04 +02:00
b4a1662889 Bug 7889 [Acquisitions] Use standard style for errors and messages
Correcting style of the warning on the Acquisitions home page
which appears if no budgets have been defined.

Also correcting the logic by which the warning appears, as a
change to the script inadvertently prevented it.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 18:11:59 +02:00
ed1382a87a Bug 7889 [Search errors] Use standard style for errors and messages
There are two instances in the templates where markup is defined
for displaying search errors. I've never seen these appear and I
have no idea what kind of error might trigger it, but now it will
display correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-24 18:11:58 +02:00
723734513b Bug 7889 [Authorities duplicates] Use standard style for errors and messages
The warning shown in the authorities editor when there is
a possible duplicate is styled incorrectly. In addition the
design of the warning is inconsistent with that shown in the
bibliographic record editor.

This patch revises the style and layout of the duplicate error
box. It also corrects a problem which appears in the biblio
and authority editors where a non-existent JS window function
was called. I have added the function to the default JS include
and revised the editor pages to use it.

To test:

- Create a record in both the cataloging and authorities
  editors which will trigger a duplicate warning.
- Click the link to the existing record. A separate window
  should pop up.
- In both editors try each option:
   - Confirm the duplicate and go to the existing record.
   - Deny that the record is duplicate and continue to save.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-24 18:11:55 +02:00
102de83746 Bug 7889 - Use standard style for errors and messages
Styling subscription renew message according to standard style.
Also:
 - Adding direct link to renew from message suggesting renew.
 - Adding output of expiration date to message.

To test open a subscription with an impending expiration. You
should see a dialog-styled message, "Subscription will expire XX/XX/XXXX.
Renew this subscription."

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-24 18:11:54 +02:00
Stéphane Delaune
55b83c79e6 Bug 8040: bad name in acquisitions-menu
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 18:09:46 +02:00
cf91dc45cf Bug 8124 - Hide option to download results of items with no checkouts report
We should not show disabled controls for features which don't work.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 17:58:12 +02:00
285f06e394 Bug 7112 - Having two prices in 020$c causes basket creation to fail from staged marc import
The root problem here is that the price is being pulled from the MARC record
and is then run through Number::Format::unformat_number. This routine is
really being misused, and should only be used to reverse the effects of
Number::Format on a number string. We are apparently using it to strip
out currency characters and the like.

Number::Format::unformat_number will choke if there is more than one period (.)
in the price field. MARC standards do not limit this field to a single period,
so unless there is only one period, we should skip number unformatting.
Examples of that break unformat_number include '18.95 (U.S.)', and
'$5.99 ($7.75 CAN)', both of which are perfectly valid.

This commit adds the function MungeMarcPrice that will better handle
find a real price value in a given price field. It does a very good
job at finding a price in any currency format, and attempts to find
a price in whichever currency is active before falling back to
the first valid price it can find.

The variable $price may fail to have an actual price, in which case
the price then defaults to '0.00', which would be rarely if ever the
correct price. To combat this, I have added highlighting to any
price in the Order Details table that begins with 0 ( i.e. '0.00' ).

Also, fixed the incomplete table footer, adding a new td with a
span of 3 to fill in the nonexistant cells.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-05-24 15:59:21 +02:00
Srdjan
c80fe2be2d bug_7398: Replaced OPACDisplayRequestPriority syspref with OPACShowHoldQueueDetails
New syspref is Choice, options being:
- None
- Priority only
- Holds number only
- Holds number and priority

Show holds count on OPAC detail

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 15:32:19 +02:00
Paul Poulain
66350848b6 Merge remote-tracking branch 'origin/new/bug_7178' 2012-05-24 15:02:21 +02:00
Julian Maurice
5a29c39c9f Bug 7178 follow-up: Do not fill items table with "(undefined)"
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 14:56:03 +02:00
Julian Maurice
f3aa919c50 Bug 7178 follow-up: Fix check_additem when UniqueItemFields is empty
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 14:55:44 +02:00
Paul Poulain
28d3693adc Bug 7977 follow-up, fixing UC breaking coding guidelines 2012-05-24 14:33:19 +02:00
Chris Nighswonger
9a867b176c Fixing a typo in the quotes-upload help file and hardcoded css
http://bugs.koha-community.org/show_bug.cgi?id=7977
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:15:17 +02:00
Chris Nighswonger
02a8557a3e Bug 7977: Improving upload result message display
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:15:09 +02:00
Chris Nighswonger
d78641e7c0 Bug 7977: Followup patch addressing items pointed out by Jonathan Druart
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:53 +02:00
Chris Nighswonger
fe09f2f6bd Bug 7977: Adding Koha standard help files for QOTD feature
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:51 +02:00
Chris Nighswonger
b3726f28cf Bug 7977: Fixing captialization on the tools main page
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:21 +02:00
Chris Nighswonger
a459da2c13 Bug 7977: Further UI work on the QOTD editor
This patch implements more of oleonard's suggestions as well as other
improvments:

--Adds instructions for using the QOTD editor
--Moves inline css to quotes.css, etc.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:17 +02:00
Chris Nighswonger
0a9f8f86aa Bug 7977: Further UI work on the QOTD uploader
This patch addresses another of oleonard's points as well as
some general cleanup:

--Adds instructions to each stage of the uploader
--Consolidates quote tool css into quotes.css

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:15 +02:00
Chris Nighswonger
12cb095bac Bug 7977: QOTD uploader to enable uploading csv files containing quotes
This series will add a DataTable's based upload/editor with which
to upload csv files containing quotes to be used by the QOTD
feature.

The file should be formatted thusly:

"source","text-of-quote"
"source","text-of-quote"
...

Note: This work serves as a good example of potential improvements
in all other "editor" and file upload areas of Koha.

This patch is a squash of the following work:

--Adding code to parse CSV file contents and push it into a DataTable
--Adding in jEditable to enable table editing
--Adding ajax to post data back to the server to be saved
--Fixing edit and adding delete functionality
--Adding some missing css as well as server feedback on save
--Fixing a bug which limited the number of quotes which could be uploaded
--Also fixing a minor bug with fnCSVToArray and doing some style cleanup.
--Adding sanity checks to verify file type and size
--Implements YUI button widget/toolbar
--Improved handling of hiding uploader UI
--Adds row selectability
--Adds multi-delete capability
--Adds YUI button/toolbar widget
--Fixing capitalization in quote uploader
--Implements improvments suggested by jcamins and oleonard

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:09 +02:00
Chris Nighswonger
eb7e930eea Bug 7977: Quote-of-the-day (QOTD) Feature for OPAC
This feature will add the option of displaying a select quote
for the day on the OPAC homepage. It will include the addition
of a QOTD editor in the tools section of the staff interface
which will allow the addition, editing, and deletion of quotes.
A single system preference will enable/disable the display of
the QOTD on the OPAC homepage. A new granular permission will
also be added to conrol user access to the QOTD editor tool.

Possible extentions to this would be code to allow alternate
quote selection algorithms to be added to vary how the currently
displayed quote is selected from the table of quotes.

This patch is a squash of the following work:

--Adding quotes table to kohastructure.sql and updatedatabase.pl

Note: This patch is intended for a MySQL based installation only.
That means that it includes backticks because that is what is required
at this point in history to install Koha correctly on a MySQL based
installation.

Feel free to port this over to the Pg stuff in the data/Pg directory.

--Adding system preference to control display of QOTD on OPAC main page
--Adding sample quote data

These quotes are taken from various US presidents. I'm not sure these
are applicable to the rest of the world, so I'm leaving it to translators
and others to add sample quote data for other languages.

--Adding edit_quotes user permissions
--Squash with other db related patches in this series
--Adding quotes editor pages to tools
--Adding QOTD editor link to tools homepage
--Integration of DataTables into QOTD Editor
--Impleminting jEditable into the quote editor
--Adding delete and add option to editor
--Fixing OPAC display so the QOTD div does not show if no quote is returned
--Also removing useless code from tools/quotes.pl
--Adding spans around QOTD foo in opac-main.tt
--Also fixing quote selection logic to accomodate the possibility of
    a single quote in the db a litte better.
--Changing timestamp column header to a more user-friendly 'Last Displayed'
--Fixing bug in quote selection logic. This bug caused a situation where
    when the table had only a single quote with an id greater than 1 in it,
    no quote would be selected.
--Fixing up sorting in the quote editor table. --jcamins
--Adding span element to quote separator --jcamins
--Overriding the default empty table message supplied by datatables-strings.inc
--Adds missing page heading
--Adds beginning of click-for-help elements.
--Refactors delete functionality to allow selecting of quotes to delete,
    enabling multi-delete.
--Refactors saving added quote functionality so that striking <Enter>
    saves the new quote.
--Refactors canceling aded quote functionality so that striking <Esc>
    cancels the new quote.
--Removing debug console.log statements
--Implementng the YUI button widget/toolbar used on other pages.
--Adds a 5px radius to all YUI buttons to bring them into
    conformity with the general trend toward rounded corners
--Fixes capitalization in quote editor
--Implements improvements suggested by jcamins and oleonard
--Adds DataTables Plugin dataTables.fnReloadAjax.js

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:05 +02:00
Chris Nighswonger
50d35fd678 Bug 7977: Adding jEditable minified version
jEditable is necessary to create DataTables with editable fields

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:00 +02:00
Chris Nighswonger
376cda8d64 Bug 7977: Updating datatables.css to reflect changes from v1.8.1 to v1.9.1
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:13:58 +02:00
Chris Nighswonger
e77461a3cf Bug 7977: Upgrading DataTables library to 1.9.1
Previous versions of the DataTables library did not support listeners
for custom DataTabels events. These listeners are necessary to the
"add quote" feature of the QOD editor.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:13:55 +02:00
Paul Poulain
2709f66089 [PATCH 1/1] Bug 7757 - Followup - Move IF outside of html tag
(patch written by kyle@bywatersolutions.com, see http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9588

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 13:36:47 +02:00
d6c3cb2934 Bug 7757 - Edit basket vendor after it has been created
Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 13:35:52 +02:00
0cdd38a5ae Bug 7948 - Printing transfer slip loses barcode field focus
* Refocus on barcode field after running Dopop()
  * Cleaned up javascript, removed tabs

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-22 12:36:02 +02:00
Jonathan Druart
d99666f502 Bug 8106: DataTables integration in ACQ: addorderiso2709.tt
addorderiso2709.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Only affects the list of imports, not the list of records

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-21 18:34:01 +02:00
Katrin Fischer
6835c1bc51 Bug 7604 - Link on basket group name for closed basket groups is broken
Fixes the intended behaviour of the link on the basket group name
for closed basket groups by adding a missing '='.

Clicking the link will reopen the basket group.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-21 18:33:03 +02:00
Julian Maurice
2338d02e9e Bug 7175: Allow to choose which items to receive
If AcqCreateItem=ordering, when you receive an order, you now have a
list of all created items and checkboxes that permit you to choose which
items you want to receive.
A 'Edit' link open additem.pl page in a popup to allow you edit the
items before receiving them (popup is automatically closed after
modification, and items table is automatically updated)
If quantity is set manually in the text box, the appropriate number of
checkbox are checked from top to bottom and a warning shows up if
quantity is greater than order quantity

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-21 17:46:07 +02:00
Jonathan Druart
a6c6946dfc But 5742: Batch edit patrons
new permission : edit_patrons

Plan test:
- Go on the page: tools > Patrons modification (modborrowers.pl)
- Enter a list of cardnumbers (or use a file)
- Modify one or more patron's fields (you can modify surname, firstname,
branchname, category, sort1, sort2, date of enrollment, date of expiry,
debarred date, debarred comment and borrower note)
- Save
- Check on the result page (or in database for non-displayed fields) if
modifications have been correctly made.
- re test with different attributes. For each attributes filled with an
authorized value category, you can select a value in a drop-down list.
Else it's a free input text. If your attribute is filled with a patron
category, the modification performs only on patrons belonging to this
category
- Save
- Verify on the result page

Signed-off-by: Mathilde Formery <mathilde.formery@ville-nimes.fr>
Signed-off-by: Stéphane Delaye <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-15 17:44:19 +02:00
b04899bafd Bug 7641 - Followup - Suspend Until not set on by suspend button.
For request.pl, there are two ways to suspend a reserve, either
by using the 'suspend' button for an individual reserve, or by
using the 'Update hold(s)' button with suspend until dates set.

If the 'suspend' button is used, any date in the 'suspend until'
field is ignored. This commit fixes this issue.

  * Add suspend_until date to suspend button link via jquery
  * Add optional date to ToggleSuspend()
  * Add KohaDates plugin where necessary

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, tested:
* suspend all holds from circ.pl
* suspend one hold from circ.pl
* suspend all holds from moremember.pl
* suspend one hold from moremember.pl
   --- NOTE: clicking suspend all holds without setting a date will mean the holds must be manually unsuspended. I'm not sure this is intentional?
* suspend a specific hold using the in-table button on reserves
* suspend a specific hold using the "update hold" button

500 error is gone.

http://bugs.koha-community.org/show_bug.cgi?id=8084
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-15 15:48:12 +02:00
67fcd4fe5b 7368 typo: MARC -> Card
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-15 15:47:02 +02:00
Paul Poulain
a598b10061 Merge remote-tracking branch 'origin/new/bug_7178' 2012-05-14 16:18:46 +02:00
Julian Maurice
7a81b89357 Bug 7178: Follow-up Improve order item creation
Move SQL code from Perl script to Perl module
Replace SHOW COLUMNS by $dbh->column_info()
Update total on neworderempty.pl when adding or deleting items

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested ok for ordering and receiving items.
Total updated correctly.

Note: There are lots of errors in the logs before and after applying
the patch. A follow up is needed.
2012-05-14 16:16:13 +02:00
Jared Camins-Esakov
9295e47a66 Bug 7998: Don't make the news all bold
Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 16:07:58 +02:00
Liz Rea
42a38e4a2a Bug 7998 - CSS fixes for new interface
Omnibus of changes thus far:

adds slight transparency for news so logo shows through on mainpage..
Fixes purple header gradient in Chrome-based browsers.
remove list from returns.tt options so checkboxes do not have bullets.
fix missing gradient class on returns.tt.
reverse colors of menu div - blue for inactive, grey for active.

turns searchheader blue, rounds corners, improves spacing for sort form.

Adds padding, rounded corners, and a 1px border to the now-blue toolbar.

increase width of intranet nav div to width 40%

add a bit of padding to #searchheader

fieldset.action changes - removed background, added a little padding to make it look better in all of the uses I could find of it.

Bug 7998 - followup - make facets header background blue

bug 7998 - followup - fixing headers on search.pl to be blue, rounded.

bug 7998 - followup - consistency tweaks

match menu borders to the search header tabs (green border)
hover menus a very light grey instead of #eee.
make fieldset.brief have a consistent border with the rest of the fieldsets.

bug 7998 - followup - more tabs/borders updating to fit in new look

boraccount.pl

bug 7998 - followup - add gradient div to prefs-admin-search.inc

Bug 7998 - Change toolbar to be lighter, with barely discernible border

Will need to be applied after the other patch.

Bug 7998 - add gradient to roadtype admin panel

Bug 7998 - adds gradient to patrons-admin-search.tt

Bug 7998 - add gradient to budgets-admin-search.inc

bug 7998 - add gradient to z3950-admin-search.inc

Bug 7998 - add gradient to cities-admin-search.inc

bug 7998 - active tab on checkout table now has green border like side menu

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-05-14 16:07:11 +02:00
Paul Poulain
9ec7ac5b8e Merge remote-tracking branch 'origin/new/bug_5345' 2012-05-14 15:42:47 +02:00
Jonathan Druart
4df6ccacf1 Bug 5345: DataTables integration in acquisition module [6]
histsearch.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 15:42:06 +02:00
Jonathan Druart
d89396d3d7 Bug 5345: DataTables integration in acquisition module [10]
ordered.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-05-14 15:41:58 +02:00
Jonathan Druart
8231df1a42 Bug 5345: DataTables integration in acquisition module [13]
spent.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-05-14 15:41:57 +02:00
Jonathan Druart
8db20c6abd Bug 5345: DataTables integration in acquisition module [15]
uncertainprice.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-05-14 15:41:52 +02:00
Jonathan Druart
b7f6714544 Bug 5345: DataTables integration in acquisition module [9]
newordersuggestion.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-05-14 15:41:44 +02:00
Srdjan
df98c8aaaa bug_7647: Table sorter on issue history
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 15:39:44 +02:00
Magnus Enger
0808da6de2 Bug 7982: [SIGNED-OFF] Typo in moremember-receipt.tt
Changes "Checked uut today" to "Checked out today".

To test:
Um, just looking at the patch should be enough, I think?

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-14 15:29:38 +02:00
f2842869bb Bug 7842 - Inconsistencies in Notices interface
- Putting "New" button in toolbar <div>
- Moving "Copy" function and making label more explicit
- Adding page headings
- Correcting table header sort options

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 12:22:09 +02:00
Paul Poulain
1aebf5594b Bug 7739 follow-up for capital cases 2012-05-11 12:20:14 +02:00
Amit Gupta
fcc9fcea4f Bug 7739 - Batch edit items of a title
A new option - Edit items in batch - is made available under the menu - Edit - in the catalog detail page. When this option is selected the tool batch item modification is called with all items under this biblio passed as parameters.

User can then edit all items of this biblio in batch. Once changes are saved the "done" link takes the user back to the catalog detail page of this biblio.

To test:
    Navigate to catalog detail page of any biblio with one or more item records. Use the option "Edit items in batch" from the "Edit" menu. Modify the items in batch, say the collction code or lost status. Press "Save", verify that changes have been effected in the confirmation screen. Use the "Done" link to navigate back to the catalog detail page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 12:16:22 +02:00
db32e098d4 Bug 8048 - better spacing on categories for attributes
- Convert <h4> to <caption> and adding comfortable padding.
 - Add quotes to attribute for validity
 - Add padding to patron messaging note too since it has
   the same problem.

To test you must have at least one value added to the PA_CLASS
authorised value category. At least one patron attribute must
be categorized using that value.

On the patron edit screen that patron attribute category should
display with comfortable padding.

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

Looks much better!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:37:12 +02:00
Paul Poulain
e584ba169e Merge remote-tracking branch 'origin/new/bug_5345' 2012-05-11 11:33:51 +02:00
Jonathan Druart
53b5d0449b Bug 5345: DataTables integration in acquisition module [16]
z3950_search.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-05-11 11:32:48 +02:00
Lyon3 Team
81f63a4d5d Replace itemnumber by barcode in links of patron modification log
in the ISSUE and RETURN links to item

http://bugs.koha-community.org/show_bug.cgi?id=7870
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passes tests, works as expected. Perhaps for followup - items that have been deleted are linked, but do not work. If an itemnumber doesn't exist, it should not be linked.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:24:57 +02:00
d1e3773e3b Bug 5184 - Upgrade jQuery to the latest version (staff client)
Upgrade jQuery in the staff client. Besides the change
to the jQuery file syntax has been changed wherever this
syntax was written:

$(foo).attr("checked","");

The new correct way to un-check a checkbox:

$(foo).removeAttr("checked");

I also removed some JavaScript altogether from
branch-transfer-limits.tt which used the old syntax but
which wasn't used on the page at all anymore.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:05:19 +02:00
Paul Poulain
b80c50d98c bug 7249 follow-up, online help 2012-05-11 10:58:33 +02:00
Jared Camins-Esakov
02a6d2b1d0 Bug 7249: Syspref to control number of rows in web service results
The original patches for bug 7249 had a hardcoded limit of ten rows in the
results returned by the web service. This patch adds a SvcMaxReportRows syspref
which allows the librarian to choose how many rows should be returned by the
web service.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 10:26:33 +02:00
Chris Hall
24213703d5 Bug 7249 : Allow reports to be called through a restful interface
Hands back JSON, and supports caching

Squashed commit of the following:

commit 5c93506079738b9a13139417d3a0734289a4b007
Author: Chris Hall <chrish@catalyst.net.nz>
Date:   Mon Nov 21 15:41:14 2011 +1300

    Fixed bugs when creating reports, added more user friendly input and
    feedback

commit c62430bb358ee4af6ee5331b4d3a2ed67f723032
Author: Chris Hall <chrish@catalyst.net.nz>
Date:   Mon Nov 21 12:00:27 2011 +1300

    Added caching to intranet report webservices, added cache expiry and public
    options to reports

commit 2d89f0777d95b26bf08635782070b6367d0698f3
Author: Chris Cormack <chris@bigballofwax.co.nz>
Date:   Wed Nov 9 20:29:26 2011 +1300

    Working on caching for services

commit e0511f180cebd81747858ad776433fe3a1cf6854
Author: Chris Cormack <chris@bigballofwax.co.nz>
Date:   Wed Nov 9 08:28:26 2011 +1300

    Starting work on webservices

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch includes database update adding 2 new fields to the saved_sql table.

1) Checked that adding/deleting/editing of sql reports still works and new
fields are correctly saved to the database.

2) The saved reports page now lists the new fields correctly.

3) Checking URLs with JSON output
- if report is not public http://localhost/cgi-bin/koha/svc/report?id=2 fails,
but http://localhost:8080/cgi-bin/koha/svc/report?id=2 works
- if report is public, both links work

4) Checking results are cached
Created a report listing my borrowers, setting caching to 60 seconds and
added new borrowers before doing following tests.
- URL doesn't show new borrower immediately - correct
- Turning off the usecache system preference updates data - correct
- Restarting memcached updates data '/etc/init.d/memcached restart' - correct
- Waiting until cache time runs out updates data - correct

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Retested the feature and renewing my sign-off.

There are some things that should be noted:
- currently there is a hardcoded limit of 10 results for the reports webservice
- reports with runtime parameters are currently not supported
2012-05-11 10:26:29 +02:00
Paul Poulain
a8c8cc3ca5 Bug 7903 follow-up, wrong capital cases
Also fixing a tiny indentation problem
2012-05-07 23:26:16 +02:00
Lyon3 Team
7a1b608472 Add ordernumber column in orders history table
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

There was a conflict (whitespace changes causing a conflict)

http://bugs.koha-community.org/show_bug.cgi?id=7903
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:21:34 +02:00
Gaetan Boisson
09cdcad460 Bug 7949 - a different favicon for the staff client
different favicon proposal

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:19:56 +02:00
Stéphane Delaune
ab602f9b76 bug 7990 - styl= in aqplan.tt
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:17:33 +02:00
Srdjan
b9f4a8cac6 bug 6372: moved background-job.inc to background-job-progressbar.js
Check for div 0 when calculating percentage

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
div0 no longer appears on 0 size jobs.
Passes t xt

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:00:34 +02:00
Colin Campbell
d78c28db7b Bug 7987 [SIGNED-OFF] Fix typo in circulation template
li was not properly closed after loss of a character

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

- Checked koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt before / after applying patch
- Line is changed as expected, ends now with </li>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 22:49:54 +02:00
Katrin Fischer
22b6705b4f Bug 3413: Checkboxes for new subfields not saving correctly
The bug was in the numbering of the fields and subfields in the form.
The form elements for the 'new subfield' got the same numbered names and ids as
the form elements for the second subfield. (example: repeatable1)
The patch fixes the numbering to continue to the new subfield.

To test:
- Create some new subfields and check all checkbox fields save correctly
  (mandatory, repeatable, is url)
- Check that other subfields' checkboxes are not changed
- Check existing subfields and newly created subfields can be edited

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 22:23:49 +02:00
Paul Poulain
3b41bd09ed Merge remote-tracking branch 'origin/new/bug_3969' 2012-05-07 21:49:42 +02:00
Katrin Fischer
39e5477f56 Bug 3969: Budget search in acquisition doesn't work (string changes)
String changes:
- Correcting tab name from "Search budgets" to "Seach funds"
- Changing search option from "Name" to "Fund code"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Strings look a-ok.
2012-05-07 21:42:34 +02:00
Paul Poulain
cd9812c928 Bug 7979 tiny follow-up for translatability (string freeze)
A few tiny string changes have been introduced, that I revert with this patch as we're string freeze
* Advanced search had been changed to Advanced Search (useless capital S). this is a mistake, I've reverted
* same thing for Koha administration
* the suggestions/comment/tags links have had a <span> and : added, the translator tool consider them as being changed. Switching back to the previous display.

The suggestion/comment/tags change can probably be reintroduced later
2012-04-23 11:41:31 +02:00
Paul Poulain
5c4f4730b0 [PATCH] Bug 7979 [FOLLOW-UP] New design for staff interface, rights fix
Fixes display of pending links (with necessary permissions being
enforced).

(patch made by Adrien Saurat, does not apply on my computer for an unknown reason)
2012-04-23 11:01:12 +02:00
d09260c58b Bug 7979 [FOLLOW-UP] New design for staff interface
This follow-up changes the structure of the page
so that it uses a standard YUI grid structure. This
helps keep the page flexible while preventing the
buttons from wrapping below the news block. The buttons
have been given a percentage width and a max-width value.

The benefit to flexibility is countered by the less-
strict spacing of the buttons. The columns of buttons
don't form a strict grid at higher screen widths.

There is probably a middle ground between this and
the previous design but I think we need to make it a
priority for the design not to break at 1024x768.

Another minor change: A tweak to the position and
padding of the icons.
2012-04-20 18:24:41 +02:00
Adrien Saurat
d830925be8 Bug 7979: New design for staff interface + fixes + css call moved
Many modifications, see bugzilla for more informations.
Moved the CSS call to allow override with intranetusercss.
2012-04-20 18:24:38 +02:00
4916080bc2 Bug 7950 - Typo for preference intranetuserjs
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:30:28 +02:00
Gaetan Boisson
5cb92abdcd Bug 7693 - clear screen button misaligned
This patch removes firefox specific lines in the css which were breaking the display

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

This fixes the layout problem in current versions of Firefox. I think
the CSS which is removed by this patch might be necessary for older
versions of Firefox, but if this turns out to be a problem we can
follow up.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:29:45 +02:00
096447f086 Bug 7828 - On circulation home page, URL to offline circulation Firefox addon should be a hyperlink
Along with making the URL a hyperlink I removed the language
part of the URL ("/fr/"). The link correctly redirects to 'en'
for me. I'm curious whether it will for other languages.

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

Link works and redirects to my language (english).

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

(Redirects to fr if your browser is FR)
2012-04-19 11:22:11 +02:00
Katrin Fischer
b42a9c46ca Bug 7371: Add 'cardnumber' as option for AutoEmailPrimaryAddress
The systempref.sql file had one more option 'cardnumber' that was not
visible from the system preference editor. This patch adds the setting.

To test:
- Check new setting cardnumber is available for AutoEmailPrimaryAddress
- Use setting with a patron that has an email address as cardnumber and
verify email is sent out correctly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:20:02 +02:00
Katrin Fischer
36b7239f40 Bug 7733 - HidePatronName not working on moredetail
Patch implements HidePatronName system preference for 'Checkout status'
on moredetail (tab items from staff detail page).

Also adds some new 'if' statements, so 'Serial enumeration' and 'Paid for?' are
only shown when they are not empty.

Silences warns in the logs.

To test:
- Toggle system preference for an issued item and check name/cardnumber
are displayed correctly.
- Check serial enumeration and Paid for? show when not empty.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:05:09 +02:00
Katrin Fischer
b302e4a525 Bug 7833 - unique holiday link broken
As Nicole stated on the bug the branchcode was missing from the links.

To test:
- add unique holidays to calendar for different branches
- click on link and check that the date is opened in the right calendar

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

Clicked links for unique holidays and exceptions for
multiple branches and everything works perfectly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 10:54:00 +02:00
Katrin Fischer
d8aa557fc9 Bug 7845: Multiple 260s don't display properly in search results
Corrects display for multiple 260 fields in intranet and OPAC.
In intranet the order of fields was wrong on the detail page.
In OPAC and intranet punctuation for multiple 260 fields in the
result list was not displaying properly.

Example after correction:
Publisher: Jena : Elsevier, 1907 ; Stuttgart : Franckh, 1907-1992 ; Jena : Urban & Fischer, 1993-2003

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-19 10:51:33 +02:00
mveron
51b21b1b57 Bug 7528 - amount subtracting 1 cent
Rounding issue with JavaScript and float numbers, JavaScript changed to do no calculation if discount is 0

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 17:30:14 +02:00
Nicole C. Engard
3827973408 Bug 7936: Reports Help Files for 3.8
This updates the existing help files and adds a new
help file for the holds stats report.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-13 16:12:39 +02:00
Nicole C. Engard
4a99852ccf Bug 7936: Patron Help Files 2012-04-13 16:12:38 +02:00
Nicole C. Engard
671e85cc52 Bug 7936: Catalogue Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:37 +02:00
Nicole C. Engard
ae36d24ab3 Bug 7936: Patron Card Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:35 +02:00
Nicole C. Engard
21d39dad96 Bug 7936: Label Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:35 +02:00
Nicole C. Engard
e8c21311b4 Bug 7936: Circ Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:34 +02:00
Nicole C. Engard
96830bcd5e Bug 7936: Holds Help File for 3.8
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:33 +02:00
Nicole C. Engard
99c3506073 Bug 7936: Comments Moderation Help File
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:31 +02:00
Nicole C. Engard
6961c3880f Bug 7936: Suggestion help file
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:30 +02:00
Nicole C. Engard
2fd001b8f5 Bug 7936: Authorities Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:29 +02:00
Nicole C. Engard
daf1343ba3 Bug 7936: Marc Export Help File
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:28 +02:00
Nicole C. Engard
b8dba5b81f Bug 7936: Tags help file
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:27 +02:00
Nicole C. Engard
8e0fa49184 Bug 7936: Tools Help for 3.8
This updates the tools help files and adds a new
help file for the new upload cover images tool.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:26 +02:00
Nicole C. Engard
72f91afd9c Bug 7936: Cataloging Help Files
These are the updated help files for cataloging

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:25 +02:00
Nicole C. Engard
3d06358f84 Bug 7936: Help file for Lists
This is the 3.8 help file for lists.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:24 +02:00
Nicole C. Engard
62a23201c3 Bug 7936: 3.8 Help Files
These are the three help files that do not belong in any
specific directory. Links updated to the 3.8 manual.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:23 +02:00