From c52b202c992e498d76dca5cb2f034839d9aeaecd Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 5 Jun 2013 12:22:02 -0400
Subject: [PATCH] Bug 9032: (follow-up) adjust the "share a list" template

This patch makes a few changes to the "share a list" template:

- We don't use tables for layout of forms. This patch corrects the
  display of the share form to use Koha standard form markup.
- Revise the confirmation message displayed after a list is shared to be
  more readable.
- Add a link back to private lists to the confirmation message.
- Add T:T markup to make this page display the left-hand navigation
  which is shown on other patron-related pages when a user is logged in.

To test, apply this patch on top of other patches pending for Bug 9032
and confirm that the list share form looks correct and works correctly.
Confirm that share confirmation page reads well.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../prog/en/modules/opac-shareshelf.tt        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

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 9da9628f41..58a2b514b1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shareshelf.tt
@@ -24,25 +24,25 @@
         <form method="post" onsubmit="return $('#invite_address').val().trim()!='';">
             <input type="hidden" name="op" value="conf_invite"/>
             <input type="hidden" name="shelfnumber" value="[% shelfnumber %]"/>
-            <table>
-            <tr>
-            <td><label for="list_name">List name</label></td>
-            <td>[% shelfname %]</td>
-            </tr>
-            <tr>
-            <td><label for="invite_address">Email address</label></td>
-            <td><input id="invite_address" name="invite_address"/></td>
-            </tr>
-            </table>
-            <input type="submit" value="Send"/>
+            <fieldset class="rows">
+                <ol>
+                    <li><span class="label">List name:</span> [% shelfname %]</li>
+                    <li><label for="invite_address">Email address:</label> <input id="invite_address" name="invite_address"/></li>
+                </ol>
+            </fieldset>
+
+            <fieldset class="action">
+                <input type="submit" value="Send" />
+            </fieldset>
         </form>
 
     [% ELSIF op=='conf_invite' %]
-        <p>We have sent invitation emails to share list [% shelfname %] to the mail queue for [% approvedaddress %].</p>
+        <p>An invitation to share list <i>[% shelfname %]</i> has been sent to [% approvedaddress %].</p>
         [% IF failaddress %]
             <p>The following addresses appear to be invalid. Please correct them and try again. These are: [% failaddress %]</p>
         [% END %]
         <p>You will receive an email notification if someone accepts your share within two weeks.</p>
+        <p><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Return to your lists</a></p>
 
     [% ELSIF op=='accept' %]
         [%# TODO: Replace the following two lines %]
@@ -57,11 +57,11 @@
 </div>
 
 [% IF ( OpacNav ) %]
-  <div class="yui-b">
-  <div id="opacnav" class="container">
-  [% INCLUDE 'navigation.inc' %]
-  </div>
-  </div>
+    <div class="yui-b">
+        <div id="leftmenus" class="container">
+            [% INCLUDE 'navigation.inc' IsPatronPage=1 %]
+        </div>
+    </div>
 [% END %]
 
 </div>
-- 
2.39.5