Commit graph

3660 commits

Author SHA1 Message Date
Joshua Ferraro
25241441f8 fix for bug 2045: Network Printers Setting Does Nothing? 2008-06-20 16:41:14 -05:00
Joe Atzberger (siptest
f79e1d2b9a Remove EXPRs from includes file.
This prevents the following log entries:
    error EXPR:at pos 42: non-initialized variable OPACViewOthersSuggestions
EXPR must NOT be used unless the author can guarantee ALL names referenced
will be defined at the BEGINNING of TMPL execution.  That suggests that in
.inc files, only variables populated by get_template... are valid, since
the author cannot guarantee what other templates might include the file.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 16:23:19 -05:00
Joe Atzberger
3dc4767f7f There is no doc-head-calendar.inc. I think it's called calendar.inc and
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 15:31:15 -05:00
Joe Atzberger
757f42d94b Replace EXPR.
Prevents log error:
	EXPR:at pos 14: non-initialized variable notforloantext

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 15:31:14 -05:00
Joe Atzberger
38bf3b1e18 Remove EXPRs. Also added all jacket images to Overdue tab.
Standardized table layout with colspan=2 for Title header,
the first being the icon or jacket image.  Discovered a bug
when I fixed the "toggle/highlight" code to work (using loop
context var __odd__), namely that the highlight styling overrides
the red overdue styling.  Commented out that conditional with a
FIXME.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 15:30:45 -05:00
Ryan Higgins
59cd6cc346 Fix broken link and quick formatting of currency.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 14:52:12 -05:00
Ryan Higgins
3dc7ca5aff Bugfix bad template variable, causing no data to display on bookfund.pl
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 14:45:22 -05:00
Andrew Moore
3aafdf768d Bug 2176 (5/5): adding staff interface to patron messaging preferences
I added another tab to the "patron" area of the staff interface to let staff
edit patron messaging preferences.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 13:04:55 -05:00
Andrew Moore
4d0e0fec72 Bug 2176 (4/5): adding RSS feed for patron overdue alerts
opac-mymessages.pl and opac-mymessages.tmpl generate an RSS feed of a patron's messages from the message_queue.

Some more methods in C4::Letters to let us pluck out the right entries in the queue.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 13:04:53 -05:00
Andrew Moore
401c84cc09 Bug 2176 (2/5): adding patron interface to update messaging preferences
This patch allows patrons to update their messaging preferences. This
includes methods in C4::Members to manage patron messaging preferences.

added cgi script to allow patron to edit their messaging preferences

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 13:04:50 -05:00
Chris Nighswonger
3cb7a9ac28 kohabug 2238 This patch allows patrons to add books to public open/free lists whether they are logged in or not.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 12:48:11 -05:00
Chris Nighswonger
813f4ae9d1 kohabug 1873 Fixes shelves.pl so that the date is displayed in the 'date added' column of the virtual shelf contents
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 12:48:01 -05:00
Chris Nighswonger
3d377cd7c1 kohabug 1875 Public lists/virtualshelves are displayed and viewable whether a patron is logged in or not.
NOTE: This patch introduces code which generates an anonymous session when a patron first browses to OPAC.
This anonymous session contains a minimal amount of information including the results of a query to discover
all public lists/shevles. When the user logs in, the anonymous session is cleared and a new session created
for that user.

kohabug 1875 - fix error when editing a patron record

C4::Auth::checkauth was not distinguishing between a
'userid' input from an OPAC or staff login form and
a 'userid' input from (e.g.,) the patron editor.
Consequently, adding or editing a patron record would
result in Koha trying to log in as the new patron.

To resolve this, added a hidden input to all login
forms, 'koha_login_context', to explicitly signal
when a login is occurring.  The value of this input
can be 'opac', 'intranet', or 'sco' - the value is
not used at present, but may be of use later.

C4::Auth - added debug flag to two warns

kohabug 1875 - create anonymous sessions only for OPAC

No need to create an anonymous session for the intranet.

set yuipath correct for login pages

When preparing the template parameters for a login form,
C4::Auth was overriding the value of yuipath set
by C4::Output::gettemplate(), thus causing 404 errors
if the 'yuipath' syspref was set to 'local'.

kohabug 1875 - avoid warns viewing lists anonymously

During an anonymous OPAC session, the $loggedinuser variable
is not set.  As the undefined value causes warns in
C4::VirtualShelves::Page::shelfpage, for the purpose of the
shelfpage call the loggedinuser is set to -1, which should
not correspond to any real borrower number.

This is admittedly a hack to avoid digging through all
of C4::VirtualShelves to deal with lists viewed anonymously.

kohabug 1875 Refactoring of &ModShelf to avoid overwriting list owner needlessly

kohabug 1875 Avoid warning if can't find owner of shelf

Since virtualshelves.owner is not a true FK of borrowersnumber.number,
set ownername to '' if can't find the patron

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 12:44:27 -05:00
Galen Charlton
7ac682c859 bug 2265: fix problem when cloning MARC field
Correctly set indicators when cloning a field
in the MARC editor.  Prior this fix, a cloned
field would not be saved.  Bug introduced in
patch for bug 2207.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 09:41:00 -05:00
Joshua Ferraro
71c7afd90d Darrel's patch to fix sorting by size of order 2008-06-20 09:14:17 -05:00
Galen Charlton
375f62bdb1 bug 2000 - remove admin/issuingrules.pl
Patch to remove issuingrules.pl in favor of
using smart-rules.pl to manage loan and fine
rules.  Several reasons for this:

* issuingrules.pl's matrix could grow rather large
  if the library has a large number of item types
  and patron categories
* successfully entering rules via issuingrules.pl
  requires placing commas within input fields
* a sparse circulation policy matrix takes the
  same amount of screen space as one that uses
  rules for a lot of specific patron category/item type
  combinations.
* having two administrative interfaces to the same
  policy settings could be confusing.
* UI design of smart-rules.pl better lends itself
  to adding more policy setting attributes to the
  rules matrix.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:10 -05:00
Galen Charlton
5a7905f440 bug 2000 - removed finesrules.pl
Removed the separate admin/finesrules.pl script
to set the fines policy matrix: since admin/finesrules.pl
and admin/issuingrules.pl both touch issuingrules.pl, creating
a specific fine rule could silently override a default issuing
rule and prevent items from being checked out.

Circulation policy matrix settings for fines are now
handled in admin/smart-rules.pl

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:09 -05:00
Galen Charlton
376c130153 bug 2000: addition changes to rules editor
* Added ability to specify total loans allowed at a library
  for the default patron category.  If set, the default
  limit is applied if no rule for the specific library
  and patron category is set.
* Added ability to specify default total loans allowed
  for the default library; this is applied if no rule
  for the specify library is set.
* Form now indicates if the number of current checkouts
  allowed is unlimited.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:05 -05:00
Galen Charlton
c9a7dd5520 bug 2000 - add total loan limit to alt. issuing rules
The alternate issuing rules editor can now allow
defining the maximum number of loans that a borrower
of a given category can take out per branch, regardless
of item type.

The form for entering this limit now appears below
the form for setting loan rules per patron category
and item type.  The form only appears if a specific
branch is chosen, not if the default branch is used.

Also, some terminology changes:

* "Amount Loanable" => "Current Checkouts Allowed"
* "Amount" => "Fine Amount"
* "Grace Period" => "Fine Grace Period"
* "Charging Interval" => "Fine Charging Interval"
* "Loan time" => "Loan Period"

Documentation change: new screenshots for the alternate
loan rules form.

squashme terminology

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:04 -05:00
Galen Charlton
9f2c77a686 bug 2000 - fix order of issuingrule lookup
Extended help on the alternate circulation rules
form to list the order of issuingrules lookup as
follows:

same library, same patron type, same item type</li>
same library, same patron type, default item type</li>
same library, default patron type, same item type</li>
same library, default patron type, default item type</li>
default library, same patron type, same item type</li>
default library, same patron type, default item type</li>
default library, default patron type, same item type</li>
default library, default patron type, default item type</li>

This includes modifying two routines in C4::Circulation to
follow this order: GetLoanLength() and GetIssuingRule().

The reason for this change is to have Koha exhaust all issuingrules
possibilities for a branch before checking the rules for
the default branch - this is consistent with what an admin
might expect from looking at the issuingrules forms, which display
settings a branch at a time, and is more consistent with how
circulation rules should work for indepdendent branches.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:03 -05:00
Galen Charlton
3e9a94c546 bug 2000 - alternate issuing rules - set sorting of rules
Issuing rules are now explicitly sorted by patron category,
then item type.  The default patron category sorts last; within
a list of item types for a given patron category, the default
item type sorts last.  This follows the order in which
the issuing rules are applied.

Since the primary sort is patron category, also moved that
to be the first column in the issuing rules table.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:03 -05:00
Galen Charlton
d6934ca397 bug 2000 - alternate issuing rules - some form cleanup
Improvements to smart-rules.pl to allow it to
replace issuingrules.pl.

* standardized "borrower type" to "patron category"
* made default item type and patron category ('Any')
  translatable
* regularized construction of parameters for rule
  deletion operatrion

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:00 -05:00
paul
5314a32914 adding string for translator
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:56 -05:00
paul
827203132c movin patron flags to template to have translatable strings
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:50 -05:00
paul
867788e8cf escaping field to deal with quotes in shelf name
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:49 -05:00
Galen Charlton
fff5631fc7 bug 2262 - fix delete guarantor button
Added an ID attribute so that the JavaScript
for the 'delete guarantor' button could
clear the guarantorid field.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 20:45:44 -05:00
22654a5977 Redesigning and bugfixing language-picker. Switching from fixed footer positioning to one with flows with page length. Fixing major unreported bug which prevented any but the first sublanguage menu from displaying.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 13:09:42 -05:00
Andrew Moore
6e52709824 Bug: 2259: eliminate lines too long for git to use.
This patch modifies 13 HTML templates and includes that have lines in them longer than 998 characters. Lines this long are known to break git.

I believe that none of these change behaviour at all, but I'm concerned about one of them. It adds whitespace (carraige returns) inside a <title> tag. I'm not certain that all browsers will deal with this OK.

No documentation changes necessary here.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 19:25:52 -05:00
Joshua Ferraro
6c9b83fbdc Resolves bug 2250: RFC: New System Preference to Determine which 'Types' and associated icons to display in advanced Search
For documentation, please indicate that as part of profiling,
staff can refer to the AdvancedSearchTypes system preference to
choose where to draw the advanced search 'Types' from. Currently
this is implemented as a choice, between itemtypes and ccodes,
but it's been designed to work with any authorised value so long
as an index exists for searching by that authorised value.

By default, and if this syspref doesn't exist, it will pull from
itemtypes as before.
2008-06-18 13:01:20 -05:00
89d34a7c48 A better fix for Bug 2229, I think. Text inside basket.js can be translated fine, this instance simply lacked the call to the dummy function for gettext. It's important /not/ to have the "Cart" text in masthead.inc because there should be no Cart link for users with javascript turned off.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 11:41:47 -05:00
d900b2a63d Adding required jquery files for update Cart notification popup.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 11:19:58 -05:00
be1ab41d2f Position of cart details popup needs to be specified numerically since jquery can't seem to accurately calculate the dimensions of the cart button.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:58:40 -05:00
4128725f69 Continuing work on Cart popup
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:58:40 -05:00
a0dfa0e5a6 Testing change to cart popup display system. Attempting to fix display flakiness associated with YUI method.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:58:39 -05:00
d8c60f6bdf Fix for Bug 2240, "opac-search.pl masthead does not include 'cart' and 'list' buttons, " and other minor markup corrections.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:36:04 -05:00
9821a11537 Fix for Bug 2097, "Extra bar after subject headings in OPAC."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 10:36:01 -05:00
374a07a5d2 Adding missing menu item for Stop Words. Fixes Bug 1995, "Link Missing from Admin Menu."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:53:20 -05:00
64d65d838a Restructuring guarantor display to address Bug 2220 ("Guarantor needs two fields to be labeled"). This change probably means an updated screenshot is necessary.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:52:52 -05:00
39576cd44c Whitespace was causing table sorting problem. Fixes Bug 2215, "In page JavaScript sort not working for title on holds tab for my summary."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:52:22 -05:00
37e4866b5b Correction to allow pop-up window to scroll. fixes Bug 2209, "Editing records in the inventory."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:51:49 -05:00
ac7c215be3 Markup corrections. You can't embed a <!-- TMPL_IF --> inside an HTML tag because it causes problems for the translation script.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:53 -05:00
904a148509 Markup correction. You can't embed a <!-- TMPL_IF --> inside an HTML tag because it causes problems for the translation script.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:50 -05:00
6c9eeabc71 Corrrecting layout for opacuserlogin = 0. Fixes Bug 2228, "Wrong page design on opac-main.pl when no login section."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:32:37 -05:00
5697bef959 Removing redundant column. Fixes Bug 2202, "No need for View Column on Authority Search"
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:58 -05:00
6729244bb5 Terminology correction (fixes Bug 2200, "Mislabeled Column on Overdues Report")
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:37 -05:00
691bcc631c Markup corrections to cataloging pages; Fixes for Bugs 2166 (" Book Jackets Not Showing on My Summary"), 2194 ("No results for Authority Search Shows blank record"), and 2196 ("Extra comma being added to record display")
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:09 -05:00
Daniel Kahn Gillmor
04a8fb567d fix coins/openurl breakage when search terms include author names. (thanks, chris on #koha@irc.katipo.nz!)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 06:26:41 -05:00
7cf8284078 In OPAC, verticaly align on top biblio records and book cover image
Without this patch, on OPAC result page, depending whether book cover
image is available or not, biblio records and book cover are badly
verticaly aligned. The information is in the middle of the cell.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-16 11:31:51 -05:00
Ryan Higgins
6b6dd30170 Spelling correction in template.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-16 10:24:25 -05:00
Galen Charlton
ee49d6d372 kohabug 2207 - improve indicator input in MARC editor
Instead of having one input field for both indicators
of a variable field, the bib and authority MARC editor
now has an input field for each indicator.  This has
two main advantages:

* it is easier to tell what the indicator values are,
  even when the first indicator is a space
* it is easier to set the first indicator to blank
  and the second indicator to non-blank.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-12 11:17:35 -05:00