From 6713ec802ab38995fa37c78b7ec629ad7732ef2b Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Wed, 19 Mar 2014 16:56:23 +0100
Subject: [PATCH] Bug 9032: (follow-up) loop variable and Cancel button

[1] Use loop variable instead of $_ in opac-shareshelf.pl
[2] Adds Cancel button to Invite form (prog and bootstrap) in
    opac-shareshelf.tt.  Likewise adds Return link under an error
    message in opac-shareshelf.tt.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt | 2 ++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt      | 2 ++
 opac/opac-shareshelf.pl                                     | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
index 433b17ab6c..b446252198 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
@@ -40,6 +40,7 @@
         [% IF errcode==6 %]<div class="alert">Sorry, but you did not enter any valid email address.</div>[% END %]
         [% IF errcode==7 %]<div class="alert">Sorry, but we could not accept this key. The invitation may have expired. Contact the patron who sent you the invitation.</div>[% END %]
         [% IF errcode==8 %]<div class="alert">As owner of a list you cannot accept an invitation for sharing it.</div>[% END %]
+        <p><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Return to your lists</a></p>
 
     [% ELSIF op=='invite' %]
         <div id="invite">
@@ -57,6 +58,7 @@
         </fieldset>
         <fieldset class="action">
             <input type="submit" value="Send" class="btn" />
+            <a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" class="cancel">Cancel</a>
         </fieldset>
         </form>
         </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt
index 9d00492b45..074425cac0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt
@@ -21,6 +21,7 @@
         [% IF errcode==6 %]<div class="dialog alert">Sorry, but you did not enter any valid email address.</div>[% END %]
         [% IF errcode==7 %]<div class="dialog alert">Sorry, but we could not accept this key. The invitation may have expired. Contact the patron who sent you the invitation.</div>[% END %]
         [% IF errcode==8 %]<div class="dialog alert">As owner of a list you cannot accept an invitation for sharing it.</div>[% END %]
+        <p><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Return to your lists</a></p>
 
     [% ELSIF op=='invite' %]
         <form method="post" onsubmit="return $('#invite_address').val().trim()!='';">
@@ -35,6 +36,7 @@
 
             <fieldset class="action">
                 <input type="submit" value="Send" />
+                <a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" class="cancel">Cancel</a>
             </fieldset>
         </form>
 
diff --git a/opac/opac-shareshelf.pl b/opac/opac-shareshelf.pl
index 9e12266c79..97fe8b29fb 100755
--- a/opac/opac-shareshelf.pl
+++ b/opac/opac-shareshelf.pl
@@ -283,8 +283,8 @@ sub stringtokey {
 
 sub alphabet_ordinal {
     my ($char, $alphabet) = @_;
-    for( 0..$#$alphabet ) {
-        return $_ if $char eq $alphabet->[$_];
+    for my $ord ( 0..$#$alphabet ) {
+        return $ord if $char eq $alphabet->[$ord];
     }
     return ''; #ignore missing chars
 }
-- 
2.11.0