Commit graph

5306 commits

Author SHA1 Message Date
39c177e3f2 bug 3344: display in-transit status on holds priority list
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 07:55:35 -04:00
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
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
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
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
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
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
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
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
Henri-Damien LAURENT
39d70cf05b MT2938 : Adds a permission for editing items
This patch adds a permission on edit_items

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 21:04:01 -04:00
6af71b5f8d Fix for Bug 3722 - Branch deletion results in incorrect message
A fix was submitted by Nahuel on 23 Nov 2009 and pushed, but
it combined messages for existing patrons and existing items.
This patch defines separate messages for the various cases and
corrects a typo in the original fix which left existing patrons
unreported.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:46:31 -04:00
d346179a9b Fix for Bug 3926, inadvertantly resurrected by me.
The template-side fix for Bug 3926 was overwritten by
another template change I submitted later. My bad.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:36:33 -04:00
c6b94ab730 Fix for Bug 3992 - New Sys Prefs Branch - Local Use Tab not Highlighted
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:25:43 -04:00
Nicole Engard
c4f7259cc1 bug 4205 remove extra 'plan by' option
There wasn't a conditional in place to stop the planning
pull down from showing a blank 'plan by' option.

This patch also makes the other 'plan by' options look
cleaner by removing the all caps.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:04:23 -04:00
58969c958c Fix for Bug 4504, Confirmation messages in opac account not translated
Strings within JavaScript onclick attributes are not getting picked
up by the translator:

onclick="return confirmDelete(_('Are you sure you want to cancel this
hold?'));"

This patch converts those to use variables defined in the main
script block:

onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 19:52:22 -04:00
Nicole Engard
5bdbd73f63 bug 4845 change language from reserves to holds
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 19:50:07 -04:00
Nicole Engard
a1d5033849 bug 4445 update OCLC text tips on preferences
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 07:54:55 -04:00
Nicole Engard
aeabfb69a3 bug 4834 split joined preferences
these prefs : FilterBeforeOverdueReport & DisplayClearScreenButton shouldn't be
lumped together - they do two very different things and have nothing to do with
each other.

this patch splits them into two individual preferences.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 07:54:53 -04:00
Nicole Engard
8f1a6ad3de bug 4027 fix testStatus typo to textStatus
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 07:52:29 -04:00
bef0899742 Whitespace removal, removal of U+FEFF character
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-26 14:52:37 -04:00
Cindy Murdock Ames
ad2babecf3 Added "dialog alert" class to "No Results Found" message on the patron
search so the alert stands out.  Previously no css was applied to it so
it was just plain text.  Librarians weren't noticing it.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-26 12:56:26 -04:00
Garry Collum
c45ddf7ff7 Bug 4199: Adds ability to print routing slip. Patch 2.
Previous patch added an invalid XHTML element.  This patch fixes it.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:52:59 -04:00
Garry Collum
e6a416a847 Bug 4199: Adds ability to print routing slip from serials-collection.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:52:58 -04:00
Garry Collum
59622c22da Bug 4805: Fixes multiple subscriptionid's being passed to serials-collection.
This is a replacement patch for my previous patch.

This patch insures that only unique subscriptionids are defined in the serials-edit form.  Multiple ids are passed to serials-collection, but not multiple copies of the same id.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:46:14 -04:00
f243b83ec0 bug 4018: remove duplicate unAPI link when XSLT bib details display on
The unAPI link is now added only in opac-detail.tmpl.  More than
one unAPI link in the same page was causing a bit of indigestion
for Zotero, which interprets multiple unAPI links as specifying
more than one resource on a given page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 09:29:31 -04:00
a0dff71e1b Correct position of non-sorted table column
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 11:10:52 -04:00
fdd2879988 Revert "(bug #3798) fix changing request branch"
This reverts commit ad01b57bcc.

This commit had introduced bug 4526.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 11:00:41 -04:00
ed2348dd95 Corrected: Fix for Bug 4529, columns on circ history all screwy
- fix formatting of last renew date
- Add table zebra striping
- Other markup structure changes
- Revised template assumes that issues.branchcode == checkout library and displays
  that value instead of issues.issuingbranch (which is always empty, see Bug 2806)
  issues.branchcode seems to reflect the item's holding branch *after* having
  been updated as part of the checkout transaction.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 10:43:28 -04:00
Colin Campbell
47a29c2bef Bug 4510 Script processes single supplier not an array
Script was written as though it had an array rather than
a single supplier. Replaced the excess punctuation with a single
supplier variable

replaced the C-style currency loop with a simpler perl-style one
we only need 1 loop not multiples
Changed variable name $GST to $tax_rate it's not magical and not a constant
and we all know what tax is
Fetch Contract data once rather than twice from two different modules
Correct size of discount data on display

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 09:37:42 -04:00
Nahuel ANGELINETTI
3fac59ba6b (bug #4522) fix plugin unimarc 210$c
This patch change the way to retrieve the value to insert in the record.
The way it was done, was verry ugly.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 09:14:34 -04:00
82c3c3df6c Fix for Bug 4534, Box for SQL not visible in "Create Report from SQL"
Changed style of SQL box and altered markup for a somewhat
cleaner layout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 08:43:51 -04:00