Dan Scott [Wed, 15 Aug 2012 15:15:49 +0000 (11:15 -0400)]
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
Conflicts:
Open-ILS/src/templates/opac/parts/advanced/search.tt2
Open-ILS/src/templates/opac/parts/org_selector.tt2
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Tue, 14 Aug 2012 14:50:11 +0000 (10:50 -0400)]
Physical Location Fixes/Enhancements
Teach the physical location retrieval function about using an ENV var.
This allows a subdomain to force a specific physical location, say by adding
to their apache config:
SetEnv physical_loc 4
Rewriterules could also be used for more dynamic configuration.
Also, as a fix:
Have preferred library use the stored physical location instead of assuming
that CGI has the setting all the time.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Wed, 15 Aug 2012 11:29:38 +0000 (07:29 -0400)]
Apply refworks placement fix to Conifer skin
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 15 Aug 2012 11:18:53 +0000 (07:18 -0400)]
TPAC: Move "Export to RefWorks" into utility area
When the RefWorks functionality was being added to TPAC, the design and
layout were very much in flux. Now that the layout has been established
with utilities like "Place Hold" on the right hand side, move the
"Export to RefWorks" button into the same location.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 14 Aug 2012 21:18:22 +0000 (17:18 -0400)]
TPAC: Hide inline call number in detailed results
There's no need to show the inline call number in the detailed results
view; it's redundant.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 14 Aug 2012 21:09:55 +0000 (17:09 -0400)]
TPAC: Display the ISSN in search results
Also, do not display URIs from the bib if we have OpenURL results.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Ben Shum [Tue, 7 Aug 2012 17:48:31 +0000 (13:48 -0400)]
TPAC - fix pickup locations for edit holds
When a patron goes to edit a hold in TPAC, they have the option to
choose a different pickup location. Unfortunately, it looks like that
dropdown does not prevent them from selecting locations that aren't
normally allowed for pickups, such as system groups or consortium
itself.
This patch adds a check for 'can_have_vols_only' to the edit holds
screen.
Credit to Melissa Lefebvre for finally nailing down the source of
the issue.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Tue, 14 Aug 2012 20:51:59 +0000 (16:51 -0400)]
Avoid top-level copy counts in TPAC
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Fri, 10 Aug 2012 18:59:50 +0000 (14:59 -0400)]
Default to current fiscal year in ACQ order upload
* Adds a new API call to determine the current fiscal year for a given
org unit: open-ils.acq.org_unit.current_fiscal_year
* Use open-ils.acq.org_unit.current_fiscal_year to populate the correct
fiscal year in the ACQ order upload selector.
This addresses part 2 of LP
1031927
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Fri, 10 Aug 2012 18:59:29 +0000 (14:59 -0400)]
Enable pcrud access to fiscal year / fiscal calendar
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Fri, 10 Aug 2012 18:06:36 +0000 (14:06 -0400)]
Fiscal year selector in ACQ order record upload
* Support a 'fiscal_year' parameter to ACQ order record upload API.
* Adds a new "Fiscal Year" selector to the upload form to facilitate
uploading orders to different fiscal years.
This partially resolves LP
1031927 by allowing manual selection of the
correct fiscal year.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Art Rhyno [Tue, 14 Aug 2012 13:53:27 +0000 (09:53 -0400)]
TPAC: More "show details" entry points (result table)
This extends the 'show_more_details.default' setting to the table.tt2
template, which falls through the cracks otherwise.
Signed-off-by: Art Rhyno <art632000@yahoo.ca>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 13 Aug 2012 23:24:59 +0000 (19:24 -0400)]
Fix logic for show details by default
If the CGI param was set, then the hidden input field was not created -
meaning that the next search would fail to show the details. Switching
the logic around sorts that out nicely.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Ben Shum [Mon, 13 Aug 2012 22:08:53 +0000 (18:08 -0400)]
Change "Reset form" to "Clear Form"
As suggested by Thomas Berezansky in the comments on LP 994058, change
the button from "Reset form" to "Clear form" to be absolutely clear
that the button now removes all previous search variables.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 8 Aug 2012 19:08:24 +0000 (15:08 -0400)]
TPAC: Reset Form and New Search should clear queries
Currently, clicking "Another Search" in the search results page, or
"Reset Form" on the advanced search page, keeps the same query terms and
type around. Clear these parameters as expected; essentially, we keep
only the search location (loc or locg) in scope.
Note that we explicitly keep parameters around when someone is going
from a basic search to an advanced search, because the assumption is
that they want to refine their search further.
Also affected are the org_selector, because we want to pull the logic
for loc or locg out into a common area (the get_library block in
misc_util.tt2), and the style (input.opac-button elements now get styled
the same as a.opac-button elements, which makes it easier to intermingle
them on the same form).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Scott [Mon, 13 Aug 2012 22:36:10 +0000 (18:36 -0400)]
TPAC: Process loc/locg inside build_org_selector
As show_loc_groups only gets passed to build_org_selector as a
parameter, get_library didn't have a chance to properly check for that
value and therefore was generating loc instead of locg as a CGI param.
The problem was noted by Ben Shum in IRC.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 13 Aug 2012 20:50:33 +0000 (16:50 -0400)]
TPAC: Make call number browse record links retain search lib
In addition to maintaining scope for the call number browse search
results, we also need to maintain the scope for the links for the call
number records in the results themselves (for example, the "retrieve
this record" link, or the "search for this author" link).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 13 Aug 2012 16:32:26 +0000 (12:32 -0400)]
TPAC: Centralize font size definitions
The TPAC CSS had a mix of absolute and proportional font size
definitions, making it impossible to define a single base size and have
the layout adjust appropriately, as well as making it difficult to tweak
sizes to, say, eliminate the distinction between 11px and 12px text.
Accordingly, create a separate TT2 file to define standard font sizes,
define one base font size, and then use proportional percentage-based
size definitions for a set of standard font sizes. This way, a site
could easily adjust the base font size to 15px and the rest of the
layout should automatically adjust, and/or revert to using absolute font
sizes for different categories if they prefer.
Note that I did simplify some of the categories of font sizes, as the
distinction between 111% and 110% was probably not evident to most
humans at most font sizes, and even the distinction between 120% and
125% would be 14.4px vs. 15px given a base size of 12px - which
different user agents could render differently anyway.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Art Rhyno [Mon, 13 Aug 2012 21:22:17 +0000 (17:22 -0400)]
TPAC: Make "Show more details" in results optional
Academic sites typically handle a lot of electronic content and want to
bring most details about entries, such as availability, status, and
URLs, on a results screen to the front.
This adds a 'show_more_details.default' option in 'config.tt2' that can
have the values 'true', 'false' and 'hide'. The 'true' and 'false'
values set the default for the button to more and less respectively, and
'hide' suppresses the button from showing at all.
Signed-off-by: Art Rhyno <art632000@yahoo.ca>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Ben Shum [Sun, 12 Aug 2012 07:25:49 +0000 (03:25 -0400)]
TPAC - add library scoping to shelf browser
The shelf browser currently uses the 'loc' variable to define scoping and
limit browsing to specific org units. However, since much of the scoping
actually uses 'locg', the scoping was broken for the shelf browser.
Additionally, under Advanced Search's Numeric Search, the option for
'Call Number (Shelf Browse)' only applies the 'cn' variable to searches
and never adds the search scope, despite the search library now being
an available filter choice.
Based on suggestion by Dan Scott in IRC, this patch uses the function for
_get_search_lib() to retrieve the search library and add it to both parts
of the shelf browser.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 13 Aug 2012 19:51:35 +0000 (15:51 -0400)]
TPAC: AutoSuggest throws a JS error on login form
searchbar.tt2 includes a reference to the AutoSuggest widget that
results in an error if the dojo code has not been required, which is
par for the course. However, on the login form we disabled the
AutoSuggest inline code because we didn't want it to override the
autofocus for the login user name; unfortunately, the searchbar exists
on the login form, and a JS error is thrown. On most browsers, not a
problem, but on IE it throws up a nasty dialog if you have the
right/wrong settings.
The simplest way to resolve this is to not set autofocus if we're not on
the basic_search page, but keep the rest of the AutoSuggest code
around.
In addition, we can avoid some other undefined var warnings by stepping
carefully through the search for the dijit value.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Ben Shum [Sun, 12 Aug 2012 07:25:49 +0000 (03:25 -0400)]
TPAC - add library scoping to shelf browser
The shelf browser currently uses the 'loc' variable to define scoping and
limit browsing to specific org units. However, since much of the scoping
actually uses 'locg', the scoping was broken for the shelf browser.
Additionally, under Advanced Search's Numeric Search, the option for
'Call Number (Shelf Browse)' only applies the 'cn' variable to searches
and never adds the search scope, despite the search library now being
an available filter choice.
Based on suggestion by Dan Scott in IRC, this patch uses the function for
_get_search_lib() to retrieve the search library and add it to both parts
of the shelf browser.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 13 Aug 2012 17:53:22 +0000 (13:53 -0400)]
TPAC: Give login boxes a border
For some reason, the boxes for the login form were stripped of
their default border style. Let the natural input box formatting for the
border shine through and give users an easier target when logging in.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Jason Stephenson [Wed, 25 Jul 2012 17:43:38 +0000 (13:43 -0400)]
Make opac/results.tt2 remember facet when sorting, etc.
Add a hidden field in the search form and set its value to the value
of the CGI 'facet' param if the facet parameter is set. This appears
to work for multiple facets. Clearing a facet is as simple as clicking
on the gray-backgounded facet name.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Jason Stephenson [Wed, 25 Jul 2012 17:43:38 +0000 (13:43 -0400)]
Make opac/results.tt2 remember facet when sorting, etc.
Add a hidden field in the search form and set its value to the value
of the CGI 'facet' param if the facet parameter is set. This appears
to work for multiple facets. Clearing a facet is as simple as clicking
on the gray-backgounded facet name.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Ben Shum [Thu, 9 Aug 2012 16:27:57 +0000 (12:27 -0400)]
TPAC - fix alignment of "You are now browsing..." in shelf browser
The "You are now browsing..." message does not align to the center of the
page. Changing the <div> to a <p> seems to properly align the text.
Along the way, we should remove the extra <span> and <strong> (the strong
is redundant with the css being inherited by color_4 class) and make the
new single line message more i18n-friendly for future translations.
Credit to Michael Peters for noticing the problem and thanks to Dan Scott,
Lebbeous Fogle-Weekley, and Thomas Berezansky for help via IRC for the
i18n-bits.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Ben Shum [Thu, 9 Aug 2012 16:27:57 +0000 (12:27 -0400)]
TPAC - fix alignment of "You are now browsing..." in shelf browser
The "You are now browsing..." message does not align to the center of the
page. Changing the <div> to a <p> seems to properly align the text.
Along the way, we should remove the extra <span> and <strong> (the strong
is redundant with the css being inherited by color_4 class) and make the
new single line message more i18n-friendly for future translations.
Credit to Michael Peters for noticing the problem and thanks to Dan Scott,
Lebbeous Fogle-Weekley, and Thomas Berezansky for help via IRC for the
i18n-bits.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Sun, 12 Aug 2012 19:16:01 +0000 (15:16 -0400)]
Fix TPAC shelf browser's previous link
Line fix suggested by Thomas Berezansky.
The cnoffset was strictly checking for values that start with a digit.
But negative numbers start with a "-" instead. Once this check was
changed, the previous link will continue to move further into negative
offsets.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Sun, 12 Aug 2012 19:16:01 +0000 (15:16 -0400)]
Fix TPAC shelf browser's previous link
Line fix suggested by Thomas Berezansky.
The cnoffset was strictly checking for values that start with a digit.
But negative numbers start with a "-" instead. Once this check was
changed, the previous link will continue to move further into negative
offsets.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Robert Soulliere [Fri, 10 Aug 2012 17:03:58 +0000 (13:03 -0400)]
Documentation: Fix some issues which caused a2x epub processing to choke.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Robert Soulliere [Fri, 10 Aug 2012 16:24:13 +0000 (12:24 -0400)]
Documentation: add a missing image.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Robert Soulliere [Fri, 10 Aug 2012 14:04:59 +0000 (10:04 -0400)]
Documentation: remove line break characters from file.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Sally Fortin [Fri, 10 Aug 2012 13:59:04 +0000 (09:59 -0400)]
Documentation: Add kids catalog documentation from ESI site.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Dan Scott [Thu, 9 Aug 2012 22:25:00 +0000 (18:25 -0400)]
Authorities: Fix broken UI due to new XUL/Dojo/regressions
New versions of XUL, since Firefox 10, hate dojo.query("foo bar"), so we
have to refactor it to use dojo.query("foo").query("bar") instead. At
least until we upgrade to a new version of Dojo.
In addition,
522d8d82 introduced a regression meaning that the text of
the authorities was no longer wrapped in a SPAN element with a class of
"text". That in turn meant that the Dojo queries weren't picking up the
labels for the merge box, leaving no visual indication to the user as to
what authorities exactly were being merged. So, repair that.
Also, similar to a fix for the MFHD editor, set the initial height of
the spawned MARC Editor for an authority record to something reasonable.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Scott [Thu, 9 Aug 2012 20:31:44 +0000 (16:31 -0400)]
Set a sane initial MFHD Editor size
For most MFHD records, the size of the MARC Editor window when spawned
fits into the confines of a normal desktop. However, for MFHD records
with dozens or more rows, the window chrome can be inaccessible because
it is bumped off the top of the Windows desktop. This makes it
impossible for users to close the window without a workaround like
hitting ALT+F4
This branch sets the window to an initial height of 40 pixels less than
the height of the entire staff client window. This should be enough to
enable the chrome on top to be visible. In addition, we have to set the
width to something reasonable because XUL seems to otherwise set the
window to be extremely skinny once an explicit height is set, so we set
that to be half the width of the staff client window.
Finally, we allow the new window to be resizable according to the user's
preference.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Wed, 8 Aug 2012 17:50:33 +0000 (13:50 -0400)]
Simplified Hold Pull List: Fix several sorting bugs
First of all, sorting on most columns was broken due to a bug in the way
that the flattener methods of the open-ils.fielder service were
constructing their SQL JOINs. We were coming up with way too many
joins, and then losing track of which JOIN's alias to refer to when
building the ORDER BY clause later. This is fixed.
Secondly, the shelving location column now sorts automatically by the
shelving location *ordering* values, when avaiable. These are the
values that you set up in the drag-and-drop staff client interface
titled "Copy Location Order." When these values are not set for the org
unit whose pull list you're viewing, the sorting will fall back to
alphabetical.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Scott [Thu, 9 Aug 2012 22:25:00 +0000 (18:25 -0400)]
Authorities: Fix broken UI due to new XUL/Dojo/regressions
New versions of XUL, since Firefox 10, hate dojo.query("foo bar"), so we
have to refactor it to use dojo.query("foo").query("bar") instead. At
least until we upgrade to a new version of Dojo.
In addition,
522d8d82 introduced a regression meaning that the text of
the authorities was no longer wrapped in a SPAN element with a class of
"text". That in turn meant that the Dojo queries weren't picking up the
labels for the merge box, leaving no visual indication to the user as to
what authorities exactly were being merged. So, repair that.
Also, similar to a fix for the MFHD editor, set the initial height of
the spawned MARC Editor for an authority record to something reasonable.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 9 Aug 2012 20:31:44 +0000 (16:31 -0400)]
Set a sane initial MFHD Editor size
For most MFHD records, the size of the MARC Editor window when spawned
fits into the confines of a normal desktop. However, for MFHD records
with dozens or more rows, the window chrome can be inaccessible because
it is bumped off the top of the Windows desktop. This makes it
impossible for users to close the window without a workaround like
hitting ALT+F4
This branch sets the window to an initial height of 40 pixels less than
the height of the entire staff client window. This should be enough to
enable the chrome on top to be visible. In addition, we have to set the
width to something reasonable because XUL seems to otherwise set the
window to be extremely skinny once an explicit height is set, so we set
that to be half the width of the staff client window.
Finally, we allow the new window to be resizable according to the user's
preference.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Robert Soulliere [Thu, 9 Aug 2012 19:17:48 +0000 (15:17 -0400)]
Documentation: Update upgrade instruction to 2.3.beta1 and include all docs that were in 2.2.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Dan Scott [Thu, 9 Aug 2012 15:49:49 +0000 (11:49 -0400)]
One more fix for the org_selector
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 9 Aug 2012 15:23:32 +0000 (11:23 -0400)]
Fix
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 8 Aug 2012 19:08:24 +0000 (15:08 -0400)]
TPAC: Reset Form and New Search should clear queries
Currently, clicking "Another Search" in the search results page, or
"Reset Form" on the advanced search page, keeps the same query terms and
type around. Clear these parameters as expected; essentially, we keep
only the search location (loc or locg) in scope.
Note that we explicitly keep parameters around when someone is going
from a basic search to an advanced search, because the assumption is
that they want to refine their search further.
Also affected are the org_selector, because we want to pull the logic
for loc or locg out into a common area (the get_library block in
misc_util.tt2), and the style (input.opac-button elements now get styled
the same as a.opac-button elements, which makes it easier to intermingle
them on the same form).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 8 Sep 2011 21:26:58 +0000 (17:26 -0400)]
Add an API for generating barcodes
Add a custom API to open-ils.actor for generating barcodes; accepts one
argument, user ID, which gets the barcode set to their new value. If no
arg is passed, just generates a new barcode and returns it (should be
useful on the patron editor screen).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Robert Soulliere [Wed, 8 Aug 2012 14:45:33 +0000 (10:45 -0400)]
Documentation: Remove a space causing an error during PDF processing.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Dan Scott [Mon, 16 Jul 2012 17:27:54 +0000 (13:27 -0400)]
Hide OPAC-invisible holdings from SRU/Z39.50
The basic_holdings Supercat method filtered out deleted call numbers and
copies, but didn't filter out copies based on the OPAC visibility status
of copy location / status / the copy itself. This has undesired results
when third-party services request copies via SRU or Z39.50 and expose
copies that should not be visible to the public.
We wrap all of the visibility and deletedness checks for a given copy up
into a subroutine so that we can avoid repeating ourselves in the
basic_holdings logic. Also, if we missed a test, we can add it in one
handy place :)
(Thanks to Galen Charlton for finding two missing tests: circ lib
visibility and owning lib visibility!)
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sat, 4 Aug 2012 15:24:15 +0000 (11:24 -0400)]
TPAC: Remove explicit width on "View my list" button
.cached_list_div, which defines the style for the "View my list" button
on the TPAC button bar once an item has been added to a temporary list,
is given an explicit width of 111px, which is problematic for a number
of reasons:
1. If the font-size of the base style is increased, then the text will
likely wrap.
2. Translations tend to be longer than English, and indeed in fr-CA
"Afficher ma liste" ends up wrapping onto a second line, which makes
the button bar look weird.
Accordingly, remove the explicit "width:111px" from the style definition
for .cached_list_div.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Scott [Tue, 7 Aug 2012 21:49:58 +0000 (17:49 -0400)]
Generic login help that leads to example.com is no use
We'll override the generic login help that leads to example.com with a
blank page, and let sites override that with their own help if they so
desire.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 7 Aug 2012 20:39:37 +0000 (16:39 -0400)]
Allow some buttons in Import via Z39.50 to wrap lines
Some of our technicians with 4:3 ratio monitors and a reasonable
font-size are unable to see the "Import Record" button on the Import via
Z39.50 screen, because the buttons in that row are laid out in a single,
non-wrapping row, and there is no affordance for scrolling over to the
side.
Simply changing the containing "hbox" element to a "description" element
allows enough of the buttons to overflow to resolve the problem in our
experience.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 7 Aug 2012 18:53:26 +0000 (14:53 -0400)]
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
Thomas Berezansky [Tue, 7 Aug 2012 18:29:37 +0000 (14:29 -0400)]
Remove extra xulG redefines
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 7 Aug 2012 18:32:34 +0000 (14:32 -0400)]
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
Thomas Berezansky [Tue, 7 Aug 2012 18:19:56 +0000 (14:19 -0400)]
Fix timestamp typo
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Mon, 6 Aug 2012 16:48:19 +0000 (12:48 -0400)]
Redirect to OILS in staff client
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Sat, 4 Aug 2012 15:24:15 +0000 (11:24 -0400)]
TPAC: Remove explicit width on "View my list" button
.cached_list_div, which defines the style for the "View my list" button
on the TPAC button bar once an item has been added to a temporary list,
is given an explicit width of 111px, which is problematic for a number
of reasons:
1. If the font-size of the base style is increased, then the text will
likely wrap.
2. Translations tend to be longer than English, and indeed in fr-CA
"Afficher ma liste" ends up wrapping onto a second line, which makes
the button bar look weird.
Accordingly, remove the explicit "width:111px" from the style definition
for .cached_list_div.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sat, 4 Aug 2012 15:04:17 +0000 (11:04 -0400)]
Silence warnings in search results for holdable copies
Have not yet determined the exact reason the holdable copies size is not
defined in some instances in the search results only, but this commit
prevents warnings from being spewed by apache about undefined variables.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sat, 4 Aug 2012 14:43:31 +0000 (10:43 -0400)]
TPAC: Silence two uninit variable warnings
These warnings were being thrown on every TPAC page request, slowly
filling the logs:
Use of uninitialized value $set_locale in string eq at
/usr/local/share/perl/5.10.1/OpenILS/WWW/EGWeb.pm line 159.
Use of uninitialized value in pattern match (m//) at
/usr/local/share/perl/5.10.1/OpenILS/WWW/EGCatLoader.pm line 250.
Banish them.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sat, 4 Aug 2012 14:26:25 +0000 (10:26 -0400)]
TPAC locale picker: use POST instead of GET
Users could (deliberately or not) change another's language
preferences by sharing links with the "set_eg_locale" GET param given
the locale picker's current behaviour. By switching to a POST param, we
prevent this result from accidentally occurring.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sat, 4 Aug 2012 14:10:48 +0000 (10:10 -0400)]
TPAC: Add the ability to set a different default locale
Installations with multiple sites might desire different default locales
for their skins. This adds the Apache config directive
"OILSWebDefaultLocale", which enables you to set the default locale on a
global and a per-skin basis.
Note that this prevents the browser Accept-language header from having
any effect; sadly that header is not often used in real life.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Fri, 3 Aug 2012 16:26:28 +0000 (12:26 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
Dan Scott [Fri, 3 Aug 2012 14:59:33 +0000 (10:59 -0400)]
Add dependencies for Fedora
Noted by Net Wolf on the mailing list, some core dependencies were
missing from the Fedora Makefile.install installer. As some of them have
recently been packaged for Fedora 17, add them to the package
collection; others are still unpackaged, so leave them there.
Note: the packages are not available on Fedora 16, but that has a
limited remaining shelf life anyway, so consider this a shift to
supporting only the latest stable version of Fedora.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Fri, 3 Aug 2012 14:59:33 +0000 (10:59 -0400)]
Add dependencies for Fedora
Noted by Net Wolf on the mailing list, some core dependencies were
missing from the Fedora Makefile.install installer. As some of them have
recently been packaged for Fedora 17, add them to the package
collection; others are still unpackaged, so leave them there.
Note: the packages are not available on Fedora 16, but that has a
limited remaining shelf life anyway, so consider this a shift to
supporting only the latest stable version of Fedora.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Fri, 3 Aug 2012 14:02:29 +0000 (10:02 -0400)]
Import updated translations from Launchpad; stage 2
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Fri, 3 Aug 2012 14:00:54 +0000 (10:00 -0400)]
Import updated translations from Launchpad; stage 1
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Fri, 3 Aug 2012 14:02:29 +0000 (10:02 -0400)]
Import updated translations from Launchpad; stage 2
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Fri, 3 Aug 2012 14:00:54 +0000 (10:00 -0400)]
Import updated translations from Launchpad; stage 1
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Thu, 2 Aug 2012 16:12:49 +0000 (12:12 -0400)]
Initial cut of 2.3 release notes.
Basically, the contents of RELEASE_NOTES_NEXT organized into
RELEASE_NOTES_2_3.txt and removed from RELEASE_NOTE_NEXT.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Thu, 2 Aug 2012 16:09:42 +0000 (12:09 -0400)]
Add simple README to RELEASE_NOTE_NEXT
Without something in the directory, it will dissappear each time we
create release notes from the contents and delete them, since Git
removes empty directories. That would likely just lead to confusion.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Thu, 2 Aug 2012 16:12:49 +0000 (12:12 -0400)]
Initial cut of 2.3 release notes.
Basically, the contents of RELEASE_NOTES_NEXT organized into
RELEASE_NOTES_2_3.txt and removed from RELEASE_NOTE_NEXT.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Thu, 2 Aug 2012 16:09:42 +0000 (12:09 -0400)]
Add simple README to RELEASE_NOTE_NEXT
Without something in the directory, it will dissappear each time we
create release notes from the contents and delete them, since Git
removes empty directories. That would likely just lead to confusion.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Robert Soulliere [Fri, 3 Aug 2012 13:21:18 +0000 (09:21 -0400)]
Documentation: adjust documentation for 2_3 release.
Comment out chapters in root.txt except for basic documentation.
Update upgrade instructions for the 2.3 alpha2 release.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Robert Soulliere [Fri, 3 Aug 2012 13:21:18 +0000 (09:21 -0400)]
Documentation: adjust documentation for 2_3 release.
Comment out chapters in root.txt except for basic documentation.
Update upgrade instructions for the 2.3 alpha2 release.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Lebbeous Fogle-Weekley [Fri, 3 Aug 2012 01:37:10 +0000 (21:37 -0400)]
Add basic release notes for 2.2.1. Not as thorough as notes at major release.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Thu, 2 Aug 2012 20:45:27 +0000 (16:45 -0400)]
Conifer is missing the acq category in config.settings_group
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 2 Aug 2012 20:33:00 +0000 (16:33 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
Dan Scott [Thu, 2 Aug 2012 20:31:48 +0000 (16:31 -0400)]
Add a rough 2.2-2.3 upgrade script for Conifer purposes
Built largely by determining which upgrade files live only in rel_2_3
and concatenating them together.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Thu, 2 Aug 2012 15:35:05 +0000 (11:35 -0400)]
Repairing upgrade stamp number
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Robert Soulliere [Thu, 2 Aug 2012 14:34:44 +0000 (10:34 -0400)]
Documentation: Add Staff account management chapter.
Converted from 1.6 documentation. Reviewed by Jennifer Turner.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Dan Scott [Thu, 2 Aug 2012 03:05:58 +0000 (23:05 -0400)]
Fix up whitespace in a couple of SIP modules
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Jeff Godin [Tue, 19 Jun 2012 19:31:08 +0000 (15:31 -0400)]
Add SIP support for Fine Items field
Add support for SIP Fine Items, msg 64 field AV.
Display outstanding balance, last_billing_type, and a description.
For circulation xacts, description is title / author from MODS.
For grocery xacts, description is last_billing_note.
Wishlist LP
1012328
Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Jeff Godin [Tue, 19 Jun 2012 19:10:07 +0000 (15:10 -0400)]
Pass authtoken to OpenILS::SIP::Patron objects
To support retrieval of billing details, OpenILS::SIP::Patron
objects need an auth token.
Teach OpenILS::SIP->find_patron to pass patron objects an auth
token, and also move existing "find patron by what key: barcode or
database id?" logic into find_patron (and out of
OpenILS::SIP::Patron->new).
Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 1 Aug 2012 21:37:30 +0000 (17:37 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
Dan Scott [Wed, 1 Aug 2012 21:33:48 +0000 (17:33 -0400)]
Wrap upgrade script for search filter group admin UI
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Wed, 25 Jul 2012 13:43:43 +0000 (09:43 -0400)]
Search filter group doc repair
Change the example in the docs to have correct syntax:
filter_group=reading_level becomes filter_group='reading_level'
Thanks to kmlussier for pointing this out.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Thu, 31 May 2012 14:06:17 +0000 (10:06 -0400)]
Add missing search filter group view/admin perm
ADMIN_SEARCH_FILTER_GROUP
VIEW_SEARCH_FILTER_GROUP
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Thu, 31 May 2012 13:27:40 +0000 (09:27 -0400)]
Search filter groups release notes
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Thu, 31 May 2012 13:37:58 +0000 (09:37 -0400)]
Search filter groups admin UI staff menu entry
Admin -> Local Administration -> Search Filter Groups
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Fri, 25 May 2012 13:22:36 +0000 (09:22 -0400)]
Search filter groups admin UI / API
UI for managing search filter groups and group entries.
This inclues a new API call for performing CRUD actions on filter
group entries:
open-ils.actor.filter_group_entry.crud
This new API call was necessary because entries link to
actor.search_query's, whose write access cannot be controled by pcrud.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Jason Stephenson [Wed, 25 Apr 2012 19:06:38 +0000 (15:06 -0400)]
Add WEBDIR to Open-ILS/xul/staff_client/Makefile.am.
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 1 Aug 2012 21:04:16 +0000 (17:04 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/templates/opac/parts/record/summary.tt2
Open-ILS/src/templates/opac/parts/result/table.tt2
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Wed, 1 Aug 2012 20:40:51 +0000 (16:40 -0400)]
Fix place hold hiding logic
Always show the place hold link for staff with permission to place holds
that won't fill currently.
Otherwise, only show the link if:
There are holdable copies
AND
We aren't blocking OR there are no available copies
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 1 Aug 2012 20:54:32 +0000 (16:54 -0400)]
TPAC: Wrap "holdable copies" upgrade script
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Art Rhyno [Fri, 27 Jul 2012 15:39:14 +0000 (11:39 -0400)]
Block "Place Hold" link in TPAC if item is available
Suppress the display of the "Place Hold" link based on whether an item
is available. This is set as a preference in config.tt2. Some sites
may want the ability to place holds regardless of availability.
Signed-off-by: Art Rhyno <art632000@yahoo.ca>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/src/templates/opac/parts/record/summary.tt2
Open-ILS/src/templates/opac/parts/result/table.tt2
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Wed, 18 Apr 2012 21:03:05 +0000 (17:03 -0400)]
TPac: Hide place hold links when not holdable
The only check done is on the holdable flags:
Copy
Status
Location
Hold rules themselves are not checked.
Note that place hold links are shown either way when you can have the
PLACE_UNFILLABLE_HOLD permission and are logged into the staff client.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Thu, 12 Apr 2012 14:23:12 +0000 (10:23 -0400)]
Operator Change Fun
Allow for temporary, staff, and permanent operator changes.
Temporary uses a temp authtoken for a few minute timeout.
Staff uses a normal staff login authtoken for a multi-hour timeout.
Permanent is a staff change that disregards the previous login instead of
allowing it to be recovered by using the menu item again.
I also fixed things up so later timeouts can re-use the previous duration
and fixed up some title bar issues:
1 - Login screen shows version again (needed a document in the title set)
2 - Menu windows don't forget the server name
3 - Menu windows keep the same number for their lifetime
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Wed, 11 Apr 2012 23:53:48 +0000 (19:53 -0400)]
Rip modal_xulG_stack out, replace with openDialog
This converts the util/window.js open function to a wrapper around the
openDialog function and passes xulG in that way, as well as teaches
global_util.js to look for it having been passed in via the arguments
parameter on window.
The non-modal "push it into place" is still done as well, in case some
window isn't using global_util.js and needs xulG.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Mike Rylander [Wed, 1 Aug 2012 19:17:59 +0000 (15:17 -0400)]
Stamping upgrade script for JEDI with Copies
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Fri, 27 Jul 2012 16:11:23 +0000 (12:11 -0400)]
EDI ORDER template, now with copies
Adds a new "copies" structure to the stock JEDI ORDER template. Copies
are ultimately mapped into one or more GIR segments in the outbound EDI.
This commit only adds the change to the stock template (seed data). It
also adds entries to the environment for the stock template and existing
template 23 via upgrade script (to expedite local template editing).
With the current template, GIR segments look like so:
GIR+001+8:LCO+TESTFUND2:LFN+SYS1-BR1:LLO+FIC ROW 456:LSM+Stacks:LSQ'
GIR+002+9:LCO+TESTFUND2:LFN+SYS1-BR1:LLO+FIC ROW 456:LSM+Stacks:LSQ'
GIR+003+10:LCO+TESTFUND2:LFN+SYS1-BR1:LLO+FIC ROW 456:LSM+Stacks:LSQ'
GIR+004+11:LCO+TESTFUND2:LFN+SYS1-BR1:LLO+FIC ROW 456:LSM+Stacks:LSQ'
GIR+005+12:LCO+TESTFUND2:LFN+SYS1-BR1:LLO+FIC ROW 456:LSM+Stacks:LSQ'
GIR+006+13:LCO+TESTFUND2:LFN+SYS1-BR2:LLO+FIC ROW 456:LSM+Young Adult:LSQ'
GIR+007+14:LCO+TESTFUND2:LFN+SYS1-BR2:LLO+FIC ROW 456:LSM+Young Adult:LSQ'
GIR+008+15:LCO+TESTFUND2:LFN+SYS1-BR2:LLO+FIC ROW 456:LSM+Young Adult:LSQ'
LQT / quantity is also supported.
The current implementation is meant to cover all possible fields so that
users can remove/alter items on a vendor by vendor basis as needed.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Fri, 27 Jul 2012 15:11:25 +0000 (11:11 -0400)]
Added debug-only option to edi_pusher.pl
Option causes the final EDI to be printed to STDOUT, but does not
populate any data in the DB nor does it FTP the file to the vendor.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Thu, 26 Jul 2012 14:17:06 +0000 (10:17 -0400)]
Feed JEDI to the EDI translator to get EDI, and vice versa.
Run this script as the opensrf user.
INPUT_IS_EDI=1 perl test_edi_translator.pl < blob.edi
-or-
perl test_edi_translator.pl < blob.jedi
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Wed, 1 Aug 2012 18:51:39 +0000 (14:51 -0400)]
Whitespace fixes in Collections.pm
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>