Bugzilla – Attachment 8018 Details for
Bug 6473
Test bug for Git-bz ✔ ❤ ★
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[Signed Off] Bug 7633 - Move display of patron image in self checkout
Signed-Off-Bug-7633---Move-display-of-patron-image.patch (text/plain), 4.47 KB, created by
Liz Rea
on 2012-03-05 17:29:54 UTC
(
hide
)
Description:
[Signed Off] Bug 7633 - Move display of patron image in self checkout
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2012-03-05 17:29:54 UTC
Size:
4.47 KB
patch
obsolete
>From f12c79c6d7276839fa984e3a7fe6222e6b9671b6 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 <wizzyrea@gmail.com> >Confirmed working as expected. Passes template tests. > >Signed-off-by: Liz Rea <wizzyrea@gmail.com> >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 </title> >+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self Checkout </title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> > <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" /> >@@ -67,7 +67,6 @@ $(document).ready(function() { > > <div id="masthead"><h1>[% LibraryName %] Self Checkout System</h1></div> > <div id="bd"> >- <div class="yui-g"> > > [% IF ( impossible ) %]<!-- We tried to issue, but failed. --> > <div class="dialog alert"><h3>Item cannot be checked out.</h3><p>Sorry, This item cannot be checked out at this station. </p> >@@ -161,10 +160,7 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a > > [% IF ( patronid ) %] > [% IF ( validuser ) %] >- <h3 class="warning">You are logged in as [% borrowername %].</h3> >- [% IF ( display_patron_image ) %] >- <img src="/cgi-bin/koha/sco/sco-patron-image.pl?cardnumber=[% cardnumber %]" alt="" /> >- [% END %] >+ <h3 class="warning">You are logged in as [% borrowername %].</h3> > [% END %] > </div> > [% IF ( nouser ) %] >@@ -178,6 +174,7 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a > <br /> > [% END %] > [% IF ( validuser ) %] >+ [% IF ( display_patron_image ) %]<div class="yui-ge"><div class="yui-u first">[% END %] > <div id="newcheckout" class="sco_entry"> > <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit="return checkout_confirm('[% patronid %]');"> > <fieldset><legend> Check out[% IF ( AllowSelfCheckReturns ) %], return[% END %] or renew an item: </legend> >@@ -190,7 +187,14 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a > </form> > <div><form method="post" action="/cgi-bin/koha/sco/sco-main.pl?op=logout" ><input type="submit" value="Finish" class="finish" /></form></div> > </div> <!-- sco_entry --> <!-- newcheckout --> >- >+ [% IF ( display_patron_image ) %]</div> <!-- /yui-u first -->[% END %] >+ [% IF ( display_patron_image ) %] >+ <div class="yui-u"> >+ <img src="/cgi-bin/koha/sco/sco-patron-image.pl?cardnumber=[% cardnumber %]" alt="" /> >+ </div> >+ [% END %] >+ </div> <!-- /yui-ge --> >+ <div class="yui-g"> > <div id="borrowerdetails"> > [% IF ( issues_count ) %] > <table id="loanTable"><caption>Checkouts for [% borrowername %] <span class="count">([% issues_count %] total)</span></caption> >@@ -233,7 +237,7 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a > [% ELSE %] > <h3>You currently have nothing checked out.</h3> > [% END %] >- >+</div> <!-- /yui-g --> > [% ELSE %]<!-- not validuser --> > <div class="sco_entry" > > <form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="mainform" method="post"> >@@ -257,6 +261,5 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a > [% END %] <!-- ( / hide main) --> > > </div> >- </div> > </div> > [% INCLUDE 'opac-bottom.inc' %] >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6473
:
4386
|
6837
|
6838
|
6839
|
6840
|
6841
|
6842
|
6843
|
7154
|
7155
|
7567
|
7994
|
7995
|
7996
|
7997
|
8018
|
9807
|
9808
|
9813
|
9831
|
9832
|
9836
|
9854
|
10842
|
10843
|
10844
|
10845
|
10846
|
10847
|
10848
|
10849
|
10850
|
10851
|
10852
|
10853
|
10854
|
10855
|
10856
|
10857
|
10858
|
11540
|
11543
|
11544
|
12502
|
12513
|
12514
|
12515
|
12516
|
12517
|
12518
|
12519
|
13473
|
13673
|
14955
|
14969
|
14970
|
14972
|
15201
|
18949
|
18950
|
18951
|
18952
|
18953
|
18954
|
18955
|
18956
|
18957
|
18958
|
18959
|
18960
|
18961
|
18962
|
18963
|
18971
|
18972
|
19518
|
19519
|
19591
|
19592
|
19871
|
19879
|
19880
|
19881
|
19882
|
20011
|
20012
|
20013
|
20014
|
22477
|
22481
|
22482
|
22496
|
22502
|
22503
|
31958
|
32444
|
32445
|
32446
|
32447
|
32448
|
32449
|
32450
|
32451
|
32452
|
34200
|
34201
|
34625
|
34999
|
35130
|
35269
|
35273
|
35274
|
35275
|
35276
|
35277
|
35279
|
35280
|
35303
|
40954
|
40957
|
45345
|
45349
|
45731
|
45732
|
45733
|
45734
|
47283
|
47284
|
47298
|
47299
|
47300
|
47334
|
47336
|
49083
|
56974
|
61059
|
61069
|
62038
|
65313
|
77301
|
78016
|
79959
|
80178
|
80179
|
80180
|
80181
|
80182
|
84400
|
86644
|
86645
|
87152
|
88128
|
95586
|
95716
|
97394
|
99026
|
99027
|
114217
|
114218
|
114219
|
114220
|
114221
|
114222
|
114223
|
114224
|
114225
|
114226
|
119255
|
121181
|
131891
|
131893
|
131894
|
134862
|
144109
|
144144
|
144671
|
144672
|
144673
|
147183
|
149030
|
149031
|
149032
|
149033
|
160566
|
160567
|
160568