Commit graph

31 commits

Author SHA1 Message Date
9c3aaa0de9 Bug 8111 - Language chooser display problem in self-checkout
- Adds required JavaScript and JavaScript linked files
- Updates CSS with changes relevant to this feature which had
  been made to the main CSS file.
- Removes an image file which has been made obsolete now that
  sco.css uses the main image sprite like opac.css does.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-06-05 15:48:56 +02:00
Liz Rea
8eeda3a65c Bug 7953 - add opacuserjs to the sco template
To test:
add some jquery to opacuserjs that would change the screen
a la: $(".checkout label[for='patronid']").css("border","3px solid red");
verify you see a red box on the sco-main page.

Also adds the ability to use opacusercss to style sco-main.tt

to test:
Add some css to opacusercss that would change the screen:
.checkout { background: grey; }
verify you see a grey box around the checkout div.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

http://bugs.koha-community.org/show_bug.cgi?id=7959
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:16:49 +02:00
Chris Cormack
f12a3cc7e7 Bug 7743 follow up fixing syntax to so templates pass test
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Failing test was: xt/author/valid-templates.t

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-10 14:30:35 +02:00
3a0b35cfbc Bug 2780 - Capitalize strings consistently (OPAC pages)
Correcting capitalization in OPAC templates

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passes tests, changes look consistent by reading through the patch.

What a doozy!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-06 18:27:55 +02:00
Julian Maurice
e1148ec52a Bug 7743: Update sco/sco-main.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:43 +02:00
7bda8970ae Bug 7633 - Move display of patron image in self checkout
This patch moves the display of the patron image in self-checkout
from above the checkout form into a column to the right of the
form.

The patch also corrects an error in the display of the page title
which was preventing correct display of the library name. To test
this change confirm that the page title shows the value of your
LibraryName system preference or "Koha" if the preference is empty.

http://bugs.koha-community.org/show_bug.cgi?id=7631
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirmed working as expected. Passes template tests.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-13 15:16:58 +01:00
a3515e798f Bug 7629 - Update sco.css to include CSS Gradients and prevent error upon missing background image file
Copying CSS gradients for input buttons and dialogs from opac.css. Also copied missing
CSS for language-picker footer. Markup corrected in a couple of places in order
for the right style to be applied.

To test corrections to dialog CSS, enter an invalid patron barcode.
Multiple languages will have to be enabled in order to see the footer
correction working.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Dialog CSS looks correct, footer also looks correct with multi languages.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-08 17:10:04 +01:00
Ian Walls
a291cc52ca Bug 6633: SCO return button doesn't work
A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
the fines column even if no fines column header was displaying.

This patch adjusts the scope of several T:T variables on the sco-main template to fix this

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-30 09:19:03 +13:00
Katrin Fischer
4530159ce1 Bug 6458: Incorrect translation processing / sco-main.tt
Patch removes templates directives from HTML tags in sco-main.tt

Problems were related to buttons for renewing items.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222

After, no errors

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:33:06 +12:00
714c8b924e Fix for Bug 6640, Locations not showing in circ reports
An invalid template syntax for defining a variable's default
value is found in the circ report template and several
others:

[% DEFAULT LibraryNameTitle="Koha Online" %]

Based on the T:T docs this appears to be the correct way of defining
a default value:

[% LibraryNameTitle or "Koha Online" %]

Reference:

http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 20:57:32 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
Ian Walls
b2a233f480 Bug 5578: Self checkout by Login enhancement
Enables the library to choose whether to have patrons scan their barcodes for self checkout, or login
with username and password.  Uses 'checkpw' for compatibility with LDAP authentication.

Also introduces a few new system preferences to make Self Checkout more secure and manageable:

  SelfCheckTimeOut:      the number of seconds before the self-checkout login times out for a patron
  AllowSelfCheckReturns: indicate whether or not patrons can return materials via self-checkout
  SelfCheckHelpMessage:  user-configurable HTML to show specific text on the Help page.

Thank you to Marlboro College in Marlboro, VT for sponsoring and testing this development!

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 15:18:40 +13:00
49eb7b7a68 followup - update SCO to recognize ITEMNOTSAMEBRANCH
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:18:58 -04:00
Nicolas Morin
d1235852e4 text for SCO Finish button
Simplifying finish button on SCO screen: it was a long sentence with a button saying "click here if you're done". Changed to "Finish". Changed the help accordingly.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:12:10 -04:00
Srdjan Jankovic
863938f16c Escape input that goes in HTML; Reworked search history insert SQL
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:12:01 -04:00
79616840b1 Fix for Bug 4244, Use "checkouts" instead of "issues"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:11:58 -04:00
Galen Charlton
069864d3a2 bug 3436: improve error messages in self-check
Improved the error messages displayed to users
by web-based self-checkout when a problem with
a loan occurs.

This changed was sponsored by the Plano Independent
School District.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-16 07:36:37 -04:00
Galen Charlton
7c7e1dc41d bug 3436: enhance sorting of loans (self-check)
[1] Change the default sort order of checked out
    items to have the most recent loans displayed
    first.

[2] Add the ability (via jQuery tablesorter) for
    the user to sort the list of loans.

Also fixed the formatting of the due date.

This change was sponsored by the Plano Independent School
District.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-16 07:36:35 -04:00
Galen Charlton
121a4ca0d1 bug 3436: add patron images to web self-check
Adds a new system preference, ShowPatronImageInWebBasedSelfCheck;
if this preference is ON, a patron's image is displayed
if available when using web-based self-check.

Note: a patch for updatedatabase.pl will be made when this
change is ready to push.

This change is sponsored by the Plano Independent School
District.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-16 07:36:31 -04:00
Galen Charlton
b10cd79ba3 additional SCO template fixes
* removed sco.js, which is no longer used
* fixed XHTML warnings in sco-main.tmpl

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-03 14:37:34 -05:00
Joe Atzberger
ece3a31fca Cleanup SCO - OPAC self checkout
~ vestigial broken scripts and templates removed
~ meaningless dependencies removed
~ Focus handling issues resolved for cross-browsers
~ Timeout only invoked for non-first screen.  This keeps the refresh from
flooding the logs continuously for no purpose.
~ two halves of "validuser" conditional linked in TMPL
~ elsif's used for $op conditionals

The focus should now appear on the "Return to Account Summary" button during errors.
The user can scan anything (w/ carriage return) and get back to the first screen.
Also, special functionality is added for the magic barcode "__KOHA_NEW_CIRC__".
This effectively ends the patron session and logs them out so the next patron can begin.
The purpose is for patrons to avoid having to use a keyboard at all, if libraries
print and have this special barcode available for patrons at the SCO station.

Enhancement was requested by Plano Independent School District.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-03 14:01:02 -05:00
Mason James
edacb17ba6 bug-2923: replaces 'renew/not renew' text with nice 'renew/return 'yui buttons.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-04 16:28:23 -06:00
Mason James
41cb983c3b fix for bug-2923, corrects renew status in SCO
- removes unneeded  HTML::Template::Pro
 - some indent/newline tidies

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-04 16:28:17 -06:00
Galen Charlton
d5b98d3bb0 bug 2613: allow web self-check to accept patron ID
Use 'patronid' instead of 'userid' as the query parameter
for passing the patron userid or barcode around; 'userid'
is claimed by C4::Auth and should be used only for
authentication pages.

Fixes the problem where entering a patron's card
number would cause a redirect to the OPAC login
page.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-12-08 08:46:36 -06:00
e8d14a6cde Cleaning up Self-Checkout interface, adding some basic formatting based on other standard styles.
Patch also removes a hard-coded English string from the script and some unused functions from sco.js.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-12-05 16:28:25 -06:00
182f9df495 More fixes for Bug 2600, enabling the appearance of HTML tags in item titles. Resubmission.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-26 09:06:13 -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
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
Galen Charlton
d202aac596 fix typo: "Ok" => "OK"
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-26 14:27:54 -06:00
Joshua Ferraro
85092daa56 Warning: Big Commit. Fixing Virtual Shelves
* prior to this commit, virtual shelvesn't did not function in
    the OPAC! Now they do, except for deletion from virtual shelves
    in list form
  * I've re-named 'Virtual Shelves' to 'Lists' as per our agreed
    upon convention

  * while vshelves aren't perfect yet, they're in enough of a working
    state for the RC1 now

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-23 14:31:14 -06:00
Joshua Ferraro
a0b220f855 much-awaited web-based self-checkout system
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-25 23:45:52 -06:00