Commit graph

5693 commits

Author SHA1 Message Date
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