Commit graph

12515 commits

Author SHA1 Message Date
a9c90b6dfb Fix for Bug 4532, Use include file for bibliodefaultview logic
Note that this new include builds only the first half of the
anchor tag (<a>). Because title and subtitle are output differently
on some pages, rendering of the second half of the tag is left
to individual pages.

Includes fixes for staff client templates.

Change to basket.pl fixes a bug wherein the OPAC's bibliodefaultview
preference was being checked instead of the staff client's.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:54:54 -04:00
20140de43e Fix for Bug 4821, With multiple 5XX fields, the font display gets progressively smaller
Prevent the generation of empty label spans for various
bib details fields.  A construct like

<span class="results_summary"><span class="label" />contents note</span>

is consistently misinterpreted in many web browsers, leading to
CSS oddities.  See the bug for more details.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:33 -04:00
884d7099e9 Partial fix for Bug 4423, Staff Client XSLT is just a copy of the OPAC one
This patch improves the template logic specifying a layout
based on whether the display is XSLT or normal, and whether
Amazon Content is on or off. Previously XSLT view did not
display Amazon covers when enabled.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:31 -04:00
d3b07c1889 More fixes for Bug 4423, Staff Client XSLT is just a copy of the OPAC one
- Adding material type icons from the OPAC side
- Adding OPAC View link
- Copying revised handling of MU from the OPAC
- Removing OPAC-specific markup

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:29 -04:00
8a9b4f0695 Followup fix for Bug 4453: Removing invalid template fragment.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:23 -04:00
4d8863bbdb Fix for Bug 4278, canceling vendor add refreshes wrong
Patch corrected to follow HDL's suggestion that link check
for existing vendor id and conditionally redirect based
on that.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:22 -04:00
3bae1c1dca Fix for Bug 3895 - Menu on left of Contracts is for Admin Pages
- Also adding cancel link to the add/edit view
- Also adding message when there are no contracts to list

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:20 -04:00
f24750f5ba Fix for Bug 4886, missing 404 redirection on wrong biblionumber for MARC and ISBD details
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:19 -04:00
6f14921479 Fix for Bug 4884, opac-showmarc.pl can't find compact.xsl
This patch implements Fridolyn SOMERS' suggested change
to the .xsl file path but copies compact.xsl from the
intranet template dir and points to that instead.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:46:58 -04:00
5944bd56fa Fix for Bug 4859, Formatting cleanup for merge biblio record interface
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:42:39 -04:00
880fd86057 Fix for Bug 4869 - Non-staff patrons logging into the OPAC don't have option to place holds from Public Lists
The template was originally designed so that form controls were
hidden from users who didn't have permission to modify a particular
shelf  because the form controls were only used for deleting from
lists. Now that users can place holds and add tags via the check-
boxes, the controls must be available to all users.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:39:41 -04:00
Henri-Damien LAURENT
a4dab23a41 Bug3916 : Batch Modify tool overwrites branches fields
This was owed to the Item modification construction and the change in GetBranchesLoop behaviour which selects the user branch by default.
Adding a void branch selected
Changing default value to ""

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:37:44 -04:00
Katrin Fischer
1ea703d869 Bug 4474 swap options for sys pref singleBranchMode
Resend with corrected spelling.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:32:12 -04:00
Katrin Fischer
2859e19155 Bug 4902: Add missing b_phone and b_email to borrower details
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:32:06 -04:00
Nicole Engard
10f362fbf5 bug 4900: add in missing value for usedaysmode pref
The usedaysmode preference was missing the option to
calculate due date by finding the next open date on the
calendar instead of ignoring all days the library is
closed.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:32:04 -04:00
Garry Collum
89a39cdc21 Bug 4897: Invalid XHTML in opac-userupdate.tmpl.
Removes several duplicate name tags.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:17:00 -04:00
d40488fe65 fixes to xt/sysprefs.t test case
* use root of source tree as base directory
* ignore case when comparing system preference codes;
  at present this is also case-insenstive in the database
* added German sysprefs file
* corrected paths to Russian and Ukrainian system preference files

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 15:56:07 -04:00
aebaf6bc08 fixed permissions for item batch deletion and modification for French
Solves bug where granular permissions for batch deletion and modification
would not work correction for a fresh installation using the French
translation.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 15:51:25 -04:00
05ca029055 fixed problems in xt/permissions.t test case
* now looks for permissions SQL files in the current
  source tree, not in intranetdir; tests in xt/ and
  t/ are meant to be run without requiring a full Koha
  installation
* added path to German
* fixed paths to permissions SQL for Russian and Ukrainian
* handles case where SQL script contains more than just
  inserts into to permissions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 15:48:28 -04:00
Katrin Fischer
3dfecafc56 Bug 4895: Add missing granular permissions
Add missing granular permissions for serials to userpermissons.sql
de-DE, pl-PL

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 09:28:12 -04:00
0abb62be46 set DBversion to 139
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 09:03:45 -04:00
Katrin Fischer
c7e421d995 Bug 3682: change message_attributes.message_name from varchar(20) to varchar(40)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 09:03:19 -04:00
4e6a664fb0 Fix for Bug 4868 - Improve controls for cloning and deleting MARC subfields
Changes "+" and "-" controls to actively linked images giving
better feedback about their clickability and an increased click
target area.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:23:26 -04:00
2fe930dae2 Page structure correction, helps Bug 3850 (Page Need Design Work)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:16:26 -04:00
Ian Walls
6ba2b9c87c Fixes bug 3619: _send_message_by_email not respecting AutoEmailPrimaryAddress = 'OFF'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:14:27 -04:00
Katrin Fischer
a18bdb0bfe BUG 4883: Staff - remove \n from strings for translation
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:09:09 -04:00
Katrin Fischer
252d595194 Bug 4833: OPAC - remove \n from strings for translation
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:09:08 -04:00
Katrin Fischer
3a63dda868 Bug 4895: Add missing granular permissions to ru-RU, uk-UA
Files are different from en files, combining userpermissions.sql and userflags.sql.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:07:14 -04:00
Katrin Fischer
b4b92c3d98 Bug 4895: Add missing granular permissions to de-DE, pl-PL
Added missing permissions, files are translations of en.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:07:13 -04:00
Garry Collum
b717110c14 But 4890: Fixes invalid XHTML in basket.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:13 -04:00
Garry Collum
8876393d16 Bug 4889: Fixes minor XHTML error in booksellers.tmpl.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:12 -04:00
Garry Collum
1e9c425950 Bug 4827: Fixes library drop-down list in aqbudgets.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:11 -04:00
0700a8b732 bug 4896: granular permissions now always on (DB rev 138)
Per the following koha-devel thread, the use of
staff user subpermissions, AKA granular permissions, is
now the default behavior in Koha.  This patch removes
the GranularPermissions system preference.

[1] http://lists.koha-community.org/pipermail/koha-devel/2010-February/033670.html

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:56:03 -04:00
Chris Cormack
ac5047b887 Follow up patch, removing missed conflict marker
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:50 -04:00
Chris Cormack
b3feb54ee0 Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Conflicts:

	installer/data/mysql/en/mandatory/userpermissions.sql
	installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
	installer/data/mysql/updatedatabase30.pl
	koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
	serials/member-search.pl
	serials/serials-edit.pl
	serials/subscription-add.pl
	serials/subscription-bib-search.pl
	serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:46 -04:00
9f806f2611 Missing indexes and a missing column
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:18:38 -04:00
36e68effae Missing tables in the kohastructure.sql table.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:16:45 -04:00
Liz Rea
aa3ac3e319 Changing <p> to <span> per gmcharlt's suggestion re: Adding <p class="noholdstext"> tag around the "No Holds Allowed" text to allow for jquery selection/replacement of the text.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-17 19:40:57 -04:00
Liz Rea
24b8e9c384 Adding <p class="noholdstext"> tag around the "No Holds Allowed" text to allow for jquery selection/replacement of the text.
A later patch might come that changes the text entirely, as it does not match the OPAC, and is often confusing for staff.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-17 19:40:56 -04:00
Chris Cormack
e0c72d37fa Bug 4472 - Missing / in img tags breaking xslt (and other img tags)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-17 19:37:57 -04:00
Chris Cormack
b453f7ed5c Updated history file, 2 more committers
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-17 19:33:51 -04:00
Colin Campbell
d7a6f17f11 Fix depreciation warnings in acqui/z3950_search.pl
Perl generates depreciation warnings on compilation
caused by use of ambiguous syntax. Seemed that an
underlying confusion as to row's type

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-17 19:32:33 -04:00
77f04bd426 Bug 2789 Fix UNIMAC leader plugin
The plugin was returning a 25 characters length leader rather than 24
characters. So leader was recreated automatically, removing user update,
before writing biblio record.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 10:14:11 -04:00
Nahuel ANGELINETTI
5f0f488596 (bug #4853) change rights needed to renew loans
Use "circulate" right, instead of "borrower".

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 09:55:29 -04:00
Garry Collum
34936223f3 Bug 2505: Enabled warnings in patron-attr-types.pl
Fixed all resulting  errors.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 09:49:34 -04:00
Andrew Elwell
4370a19d75 Final batch of POD cleanups.
Should fix any remaining warnings with 'podchecker'

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:39:01 -04:00
Andrew Elwell
aa9b4d92cd POD Cleanups
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:59 -04:00
Andrew Elwell
546a0244bb More POD cleanups
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:58 -04:00
Andrew Elwell
2856bb8295 POD Cleanups - Few minor ones this time
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:57 -04:00
Andrew Elwell
8480f56370 Another batch of POD cleanups
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:56 -04:00