Commit graph

639 commits

Author SHA1 Message Date
Julian Maurice
632277e453 Bug 5864: link biblio => serials subscription is wrong
The GetSubscription function can be called with 3 parameters : title,
issn, biblionumber.
In biblio view (both opac & staff interface), the link to jump from the
biblio to the subscription(s) was done using title.

The result was that for a title like "Science", all subscriptions
containing "science" in the title were linked.
That's too much and that's false.

This commit fixes this problem by calling GetSubscription with
biblionumber only where applicable.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 11:54:21 +13:00
Sophie Meynieux
6282f652b2 Bug 5889: Messages name in english for notifications on public interface.
Modification of template to allow multilanguage support. Alsa fixing columns
overflow.

BibLibre bug #5939

Tests: It works. Messages strings can now be extracted and placed in .po file
for translation.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:25:08 +13:00
Nicole C. Engard
e05bb4ef85 Follow Up Bug 5869 Fix String Errors
This patch fixes all occurences of 'reserves' to 'holds.' It also
added Holds to the menu include and updates capitalization and spacing.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:11 +13:00
Chris Cormack
76d52d89e4 Merge remote branch 'kc/new/enh/bug_3659' into kcmaster 2011-03-15 15:58:26 +13:00
251e2c4d74 Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Revision fixes some markup and corrects an error that would lead
to the hold being initiated for the remembered patron when this
was not intended.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 15:48:09 +13:00
Chris Cormack
fc2fe083fc Merge remote branch 'kc/new/bug_5693' into kcmaster 2011-03-15 10:04:38 +13:00
Chris Cormack
9b5e18c4ee Bug 5693 : Follow up patch, escaping HTML in limit_cgi so "" dont break hrefs
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 10:02:37 +13:00
Janusz Kaczmarek
d6e580439b Bug 5819 : No toolbar in record view when quotes present in title - fix
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Was able to reproduce problem by surrounding 245$a with "".
Patch fixed the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:57:15 +13:00
Paul Poulain
b2e7b5aaca Bug 5835 : adding a class to index <select>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 14:01:28 +13:00
Stéphane Delaune
3cc0939622 Bug 5432 : (MT #4584b)Add duplicate support for borrowers
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 13:22:54 +13:00
Reed Wade
1f0e0c5de1 Bug 5741 - Extra comma causes JavaScript error in Internet Explorer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-20 20:29:07 +13:00
ed2b583eb1 Fix for Bug 5769 - notice tab disappearing on edit patron
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-18 10:10:10 +13:00
61f6828d12 Follow-up fix for Bug 5733 - Empty cart in intranet when session is closed
Modifying empty cart function to take a paramter: if true,
cart will be emptied without a prompt.

Removing unnecessary  "javascript:" pseudo-protocol.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:28:12 +13:00
Paul Poulain
94bd7ad545 Bug 5733 : MT3531: Intranet cart is emptied when session is closed
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-10 15:07:22 +13:00
Chris Cormack
3b5aa120d7 Merge branch 'bug_5462_signoff' of git://github.com/colinsc/koha into new/enh/bug_5462 2011-02-04 08:52:39 +13:00
Christopher Hall
0088c5da53 Bug 5462: fixed current preferences tab highlighting bug created by dashfix
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:58:52 +00:00
Christopher Hall
c02e4d02d5 Bug 5462: fixed dashes (replaced with _) and fullstops (removed) for variable names
Done within opac and intranet templates, still needs to be done for corresponding scripts.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:54:50 +00:00
e6a3029470 Fix for Bug 3319 - Need error message when adding patron and libraries are defined
- Hiding patron add toolbar when branches or categories are undefined
- Blocking patron entry form if branches or categories are undefined
- Removing nonfunctional template logic for displaying missing category
  error message.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:21:45 +13:00
86576e7fd2 Revised fix for Bug 3850 - Budget Planning Pages Need Design Work
- Filter moved to left-hand sidebar consistent with other pages
- Export option moved to left-hand sidebar to improve visibility
- Show/hide column controls moved to their own role with clear labels
- "Locked" icon added to replace indicating locked status by row color

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-01 19:26:46 +13:00
Chris Cormack
e1b1c43425 Revert "Fix for Bug 3659, Add place hold option from patron checkout tab"
This reverts commit da2040634e.

Wrong patch was applied
2011-01-25 06:24:32 +13:00
da2040634e Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-24 20:43:04 +13:00
Nicole Engard
b7fdfc1384 bug 4131 have subscription so edit routing if one exists
Changes the template variable checked in serials-menu.inc for determining where to
show 'Create Routing List' or 'Edit Routing List' to hasRouting.

Also adds the $hasRouting variable to serials/routing.pl and serials/routing-preview.pl,
for completeness.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 12:13:34 +13:00
98efac4c0a Fix for Bug 4945 - Patron search is limited by default to the currently logged-in library
I couldn't figure out how (or whether) GetBranchesLoop could be
convinced to return a list of branches without selecting one, so
I swapped GetBranchesLoop with GetBranches. This will preselect
a branch only if a branch has been submitted as part of a query.

This does NOT preselect the correct branch when IndependantBranches
is turned on.

I also added a template variable which is true if a query has
been submitted with a branch or a category so that the extra
form fields can be displayed, reminding the user that they
added limiters to their query.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 15:35:09 +13:00
1b344bdbd1 Fix for Bug 4984, Invalid XHTML in staff client search results
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-10 05:25:29 +13:00
562653bc8d Fix for Bug 3918 - Add to order lists inconsistent
- Added new include to contain add to basket options
- Minor markup corrections

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 08:46:07 +13:00
6a61750bf0 Reimplement fix for bug 5557 - Link to logs for user with view_system_logs permission
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-03 21:54:18 +13:00
Robin Sheat
980de26320 bug 5045 - Help works even when the referrer is being stripped
This fix puts the URL of the source page as a parameter to help.pl,
which will override the referrer value, if it's provided. This deals
with people sitting behind proxies that strip the referrer information
out.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-02 09:20:01 +13:00
f5b416b5bb Bug 5530 Follow up
With this patch, I don't see any other place where the old sysprefs editors
(systemprefences.pl) is used anymore.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-22 11:27:55 +13:00
Henri-Damien LAURENT
77426c9ef1 MT4009: followup removing systempreferences
searching a systempreferences was disabled owed to the fact that it is now systempreferences which is used.
2010-12-21 21:18:11 +13:00
080f693c48 Fix for Bug 5513 - staff client display screwy if you don't have all permissions
The cause of this bug was the removal of a closing <!-- /TMPL_IF -->
in a recent commit.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:40:21 +13:00
Paul POULAIN
78038d3cf6 fixing unopened closed tmpl_if
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:22:10 +00:00
Nicolas Morin
dade9a2a24 correct vocabulary
in GUI, changes technical vocab like "string" to proper user-friendly terms like "Title"

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:11:33 +00:00
21c516601c Possible fix for Bug 2307, Calendar widget cannot be translated
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 19:38:52 +13:00
Nicole Engard
a6799f95fb bug 4252 add authorites permission to menus
Added to more menu and to the main intranet page

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:16:32 +13:00
bd7cca935b Updated fix for Bug 2170, Adding 'edititems' user-permission
This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.

The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.

Revised for current HEAD

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:10:57 +13:00
Katrin Fischer
c6a9141413 Bug 3381 - Add an IntranetUserCSS system preference
Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.
2010-12-13 08:01:41 +01:00
cb969684da Fix for Bug 5285, Show/hide columns in the output of items in batch operations
Also adds title/author information to output of batch deletions

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:45:30 +13:00
e29a123a9b Fix for Bug 2808, Hold queue not alphabetizing
White space in the biblio-default-view include and in the page
template caused sorting on title or patron to be incorrect.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:30:06 +13:00
1024eceec7 Fix for Bug 5048, Error in menu/submenu for select language in intranet
Patch for HEAD. This issue was apparently solved quite a while
ago in the OPAC. This patch copies that solution over to the staff client.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:24:34 +13:00
083d3b1a92 Fix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab
Display of the renewal date footer in the template was conditional upon
the existence of checkouts from today.

In order to fix this bug it was necessary to repeat the markup for the
table footer twice in the template, so I created an include file for it.
The same include file can now be used in moremember.tmpl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:38:43 +13:00
bd90bb02a4 Corrected patch for Bug 4520, facets "show more" doesn't work
Re-doing Nahuel's fix so that it applies to master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 20:20:42 +13:00
4b69538f9b Fix for Bug 4913 - Budget pages should show currency name instead of symbol
This patch adds a new include file to handle the display of the active
currency name and a warning if no currency is active.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 15:13:55 +13:00
d9de6ebab3 Fix for Bug 4498 - Acq always shows '1 suggestions waiting'
- Removing 'suggestions waiting' link from left-hand menu. A plain
  'suggestions' link is still shown if suggestions are enabled.
- Putting back the 'pending suggestions' box that used to appear
  on the Acquisitions home page. This will show, with a count
  of pending suggestions, only if suggestions are turned on and
  there are pending suggestions.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-14 09:34:45 +13:00
Chris Cormack
414b2ace4f Merge remote branch 'kc/new/signoffs' into kcmaster
Conflicts:
	installer/data/mysql/updatedatabase.pl

Updated updatedatabase.pl to handle new version number
2010-11-04 20:14:28 +13:00
dev2
433b77b750 Bug 5192 Enhancement to add new index for 658 curriculum field
Creates new curriculum index for 658 subfields a,b,c and search option in Advanced search (under More Options).  Also modifies the installer files to make 658abc display (they were hidden in the frameworks) and to create the new indexes.

The 658 already displays as part of the staff/OPAC subject display line.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 21:02:12 +13:00
Nicole Engard
d5eb56dd52 bug 5019 remove link to funds
This patch renames the link to budgets to say 'budgets & funds'
and removes the links to funds (which went no where).

This patch also adds the acq menu to the budget pages.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 14:50:02 +13:00
Chris Cormack
f0fc240e91 Merge remote branch 'kc/new/for-3.4/spelling' into kcmaster 2010-11-02 11:33:49 +13:00
8893e38c6e remove unused template include
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 08:23:57 +13:00
Chris Cormack
8af6165f53 Merge remote branch 'kc/new/background_jobs_tested' into kcmaster 2010-11-01 21:03:06 +13:00
Srdjan Jankovic
e2e1dfd86e bug 5309: Adjust progres bar
Also added some test facilities
wr73785

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 11:20:34 -04:00