From f12c79c6d7276839fa984e3a7fe6222e6b9671b6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 1 Mar 2012 10:30:02 -0500 Subject: [PATCH] [Signed Off] Bug 7633 - Move display of patron image in self checkout Content-Type: text/plain; charset="utf-8" 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 Confirmed working as expected. Passes template tests. Signed-off-by: Liz Rea another test http://bugs.koha-community.org/show_bug.cgi?id=6473 --- .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 21 +++++++++++-------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt index fb9e0be..2fb6342 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt @@ -1,4 +1,4 @@ -[% INCLUDE 'doc-head-open.inc' %][% LibraryName %] › Self Checkout +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self Checkout @@ -67,7 +67,6 @@ $(document).ready(function() {

[% LibraryName %] Self Checkout System

-
[% IF ( impossible ) %]

Item cannot be checked out.

Sorry, This item cannot be checked out at this station.

@@ -161,10 +160,7 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a [% IF ( patronid ) %] [% IF ( validuser ) %] -

You are logged in as [% borrowername %].

- [% IF ( display_patron_image ) %] - - [% END %] +

You are logged in as [% borrowername %].

[% END %]
[% IF ( nouser ) %] @@ -178,6 +174,7 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a
[% END %] [% IF ( validuser ) %] + [% IF ( display_patron_image ) %]
[% END %]
Check out[% IF ( AllowSelfCheckReturns ) %], return[% END %] or renew an item: @@ -190,7 +187,14 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a
- + [% IF ( display_patron_image ) %]
[% END %] + [% IF ( display_patron_image ) %] +
+ +
+ [% END %] +
+
[% IF ( issues_count ) %] @@ -233,7 +237,7 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a [% ELSE %]

You currently have nothing checked out.

[% END %] - + [% ELSE %]
@@ -257,6 +261,5 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a [% END %]
- [% INCLUDE 'opac-bottom.inc' %] -- 1.7.2.5
Checkouts for [% borrowername %] ([% issues_count %] total)