From 65d04a5c546b59493b334c92174a0c35500e7560 Mon Sep 17 00:00:00 2001
From: gfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Mon, 4 May 2009 02:19:58 +0000
Subject: [PATCH] add more 'go back/cancel' links; put consistent wording on
 them all

Beta testers noted that there were many places where a Go-back or
Cancel link was desirable. I've tried to add one in all the obvious
places.


git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@448 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---
 conifer/templates/components/course.xhtml        | 1 +
 conifer/templates/course_invitation.xhtml        | 2 +-
 conifer/templates/course_join.xhtml              | 2 +-
 conifer/templates/edit_course.xhtml              | 4 ++--
 conifer/templates/generic/delete.xhtml           | 3 +--
 conifer/templates/generic/edit.xhtml             | 5 ++---
 conifer/templates/item/item_add_cat_search.xhtml | 4 +++-
 conifer/templates/item/item_add_elec.xhtml       | 4 +++-
 conifer/templates/item/item_add_heading.xhtml    | 1 +
 conifer/templates/item/item_add_url.xhtml        | 1 +
 conifer/templates/item/item_delete_confirm.xhtml | 2 +-
 conifer/templates/item/item_relocate.xhtml       | 4 +++-
 conifer/templates/master.xhtml                   | 5 +++++
 conifer/templates/phys/checkout.xhtml            | 2 +-
 conifer/templates/phys/mark_arrived.xhtml        | 2 +-
 15 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/conifer/templates/components/course.xhtml b/conifer/templates/components/course.xhtml
index bd9ce9c..9268873 100644
--- a/conifer/templates/components/course.xhtml
+++ b/conifer/templates/components/course.xhtml
@@ -120,5 +120,6 @@ searchtext = _('search this course...')
     <div py:def="offer_to_delete(item)" class="little_action_panel" py:if="item.id">
       <a href="../delete/">Delete this item</a>
     </div>
+
 </html>
 
diff --git a/conifer/templates/course_invitation.xhtml b/conifer/templates/course_invitation.xhtml
index 20879fb..75de717 100644
--- a/conifer/templates/course_invitation.xhtml
+++ b/conifer/templates/course_invitation.xhtml
@@ -25,7 +25,7 @@ title = _('Join a course using an Invitation Code')
   <table class="metadata_table">
     <tr><th>Invitation Code:</th><td><input type="text" id="code" name="code" size="30" value="${code}"/></td></tr>
   </table>
-<p><input type="submit" value="Continue"/> <a style="margin-left: 12px;" href="../">or go back</a></p>
+<p><input type="submit" value="Continue"/> ${go_back_link()}</p>
   </form>
   <div class="gap"/>
 </body>
diff --git a/conifer/templates/course_join.xhtml b/conifer/templates/course_join.xhtml
index d8cbe47..e369e35 100644
--- a/conifer/templates/course_join.xhtml
+++ b/conifer/templates/course_join.xhtml
@@ -17,7 +17,7 @@ title = _('Join this course?')
     <p>If you choose to join this course, it will be added to your "My
     Courses" list.</p>
     <form action="." method="POST">
-      <p><input type="submit" value="Yes, join this course"/> <a style="margin-left: 12px;" href="../">or go back</a></p>
+      <p><input type="submit" value="Yes, join this course"/> ${go_back_link()}</p>
     </form>    
 
   </body>
diff --git a/conifer/templates/edit_course.xhtml b/conifer/templates/edit_course.xhtml
index 7462e9f..7f7ec0c 100644
--- a/conifer/templates/edit_course.xhtml
+++ b/conifer/templates/edit_course.xhtml
@@ -36,7 +36,7 @@ else:
     ${field_row(form.department)}
     <!-- <tr><th>Department</th><td>${Markup(form.department)} ${errorlist(form.department)}</td></tr> -->
   </table>
-  <p><input type="submit" value="Continue"/></p>
+  <p><input type="submit" value="Continue"/> ${go_back_link()}</p>
   </form>
   <div class="gap"/>
   <div py:if="instance.id">
@@ -45,7 +45,7 @@ else:
       <p><input type="checkbox" name="confirm_delete" id="confirm_delete"/>
       <label for="confirm_delete">Yes, I want to delete this course site and all of its contents.</label>
       </p>
-      <p><input type="submit" value="Delete this course"/></p>
+      <p><input type="submit" value="Delete this course"/> ${go_back_link()}</p>
     </form>
   </div>
 </body>
diff --git a/conifer/templates/generic/delete.xhtml b/conifer/templates/generic/delete.xhtml
index f3d5ce9..94ccd25 100644
--- a/conifer/templates/generic/delete.xhtml
+++ b/conifer/templates/generic/delete.xhtml
@@ -17,8 +17,7 @@ title = _('Delete %s?') % form.Meta.model.__name__
       <td>${instance}</td>
     </tr>
   </table>
-  <p><input type="submit" value="Delete"/></p>
-  <p><a href="../">Cancel</a></p>
+  <p><input type="submit" value="Delete"/>${go_back_link('../')}</p>
   </form>
 </body>
 </html>
diff --git a/conifer/templates/generic/edit.xhtml b/conifer/templates/generic/edit.xhtml
index 79fdecd..af80198 100644
--- a/conifer/templates/generic/edit.xhtml
+++ b/conifer/templates/generic/edit.xhtml
@@ -15,9 +15,8 @@ else:
   <h1>${title}</h1>
   <form action="." method="POST">
   <table class="metadata_table">${Markup(form.as_table())}</table>
-  <p><input type="submit" value="Save changes"/></p>
-  <p><a href="../">Cancel changes</a></p>
-  <p><a href="delete">Delete this record</a></p>
+  <p><input type="submit" value="Save changes"/> ${go_back_link()}</p>
+  <p py:if="instance is not None"><a href="delete">Delete this record</a></p>
   </form>
 </body>
 </html>
diff --git a/conifer/templates/item/item_add_cat_search.xhtml b/conifer/templates/item/item_add_cat_search.xhtml
index 006e176..249e9bb 100644
--- a/conifer/templates/item/item_add_cat_search.xhtml
+++ b/conifer/templates/item/item_add_cat_search.xhtml
@@ -26,8 +26,10 @@ dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']
     <h2>${title}</h2>
     <form method="POST" action=".">
       <input type="text" id="query" name="query" value="${query}" 
-	     style="font-size: larger; width: 600;"/>
+	     style="font-size: larger; width: 600px;"/>
       <input type="submit" value="Search"/>
+	${go_back_link()}
+
     </form>
 
     <table class="pagetable" py:if="request.method == 'POST'">
diff --git a/conifer/templates/item/item_add_elec.xhtml b/conifer/templates/item/item_add_elec.xhtml
index 06c27c5..57ef9d6 100644
--- a/conifer/templates/item/item_add_elec.xhtml
+++ b/conifer/templates/item/item_add_elec.xhtml
@@ -30,7 +30,9 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
 	  <tr><th>File</th><td><input type="file" name="file"/></td></tr>
 	</table>
 	${item_metadata_formset()}
-	<p><input type="submit" value="Upload file and Create item"/></p>
+	<p><input type="submit" value="Upload file and Create item"/>
+	${go_back_link()}
+	</p>
       </form>
     </div>
 
diff --git a/conifer/templates/item/item_add_heading.xhtml b/conifer/templates/item/item_add_heading.xhtml
index c92fd73..db337b3 100644
--- a/conifer/templates/item/item_add_heading.xhtml
+++ b/conifer/templates/item/item_add_heading.xhtml
@@ -31,6 +31,7 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
       <p>
 	<input py:if="not is_edit" type="submit" value="Add heading"/>
 	<input py:if="is_edit" type="submit" value="Update heading"/>
+	${go_back_link()}
       </p>
 
     </form>
diff --git a/conifer/templates/item/item_add_url.xhtml b/conifer/templates/item/item_add_url.xhtml
index e488aff..ee75605 100644
--- a/conifer/templates/item/item_add_url.xhtml
+++ b/conifer/templates/item/item_add_url.xhtml
@@ -29,6 +29,7 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
       <p>
 	<input py:if="not is_edit" type="submit" value="Add URL"/>
 	<input py:if="is_edit" type="submit" value="Update URL"/>
+	${go_back_link('../meta')}
       </p>
     </form>
 </body>
diff --git a/conifer/templates/item/item_delete_confirm.xhtml b/conifer/templates/item/item_delete_confirm.xhtml
index c62977e..eba3481 100644
--- a/conifer/templates/item/item_delete_confirm.xhtml
+++ b/conifer/templates/item/item_delete_confirm.xhtml
@@ -33,7 +33,7 @@ metadata = item.metadata_set.all()
     <p>
     <form action="." method="POST">
       <input type="submit" name="yes" value="Yes, delete it" style="padding: 4 12; margin-right: 24;"/>
-      <input type="submit" name="no" value="Cancel"/>
+      ${go_back_link()}
     </form>
     </p>
   </body>
diff --git a/conifer/templates/item/item_relocate.xhtml b/conifer/templates/item/item_relocate.xhtml
index 0ce3a8a..1b13aec 100644
--- a/conifer/templates/item/item_relocate.xhtml
+++ b/conifer/templates/item/item_relocate.xhtml
@@ -30,7 +30,9 @@ title = 'Move item under a different heading'
 	  </tr>
 	  <tr>
 	    <th/>
-	    <td><input type="submit" value="Move item"/></td>
+	    <td><input type="submit" value="Move item"/>    
+	    ${go_back_link()}
+	    </td>
 	  </tr>
 	</tbody>
       </table>
diff --git a/conifer/templates/master.xhtml b/conifer/templates/master.xhtml
index eb3ae80..eac7f78 100644
--- a/conifer/templates/master.xhtml
+++ b/conifer/templates/master.xhtml
@@ -65,4 +65,9 @@ import os
       </div>
     </body>
   </py:match>
+
+  <span py:def="go_back_link(url=None, msg=_('or Cancel'))" py:with="url=url or request.META.get('HTTP_REFERER', '../')">
+    <a style="margin-left: 12px;" href="${url}">${msg}</a>
+  </span>
+
 </html>
diff --git a/conifer/templates/phys/checkout.xhtml b/conifer/templates/phys/checkout.xhtml
index 3f82874..6bf1546 100644
--- a/conifer/templates/phys/checkout.xhtml
+++ b/conifer/templates/phys/checkout.xhtml
@@ -60,7 +60,7 @@ title = _('Patron Checkout of Item')
       </tr>
       <tr>
 	<th/>
-	<td><input type="submit" value="${step==3 and _('Check out another item') or _('Continue')}"/></td>
+	<td><input type="submit" value="${step==3 and _('Check out another item') or _('Continue')}"/> ${go_back_link()}</td>
       </tr>
       <tr py:if="step==3">
 	<th/>
diff --git a/conifer/templates/phys/mark_arrived.xhtml b/conifer/templates/phys/mark_arrived.xhtml
index 4f52eab..fc87a88 100644
--- a/conifer/templates/phys/mark_arrived.xhtml
+++ b/conifer/templates/phys/mark_arrived.xhtml
@@ -28,7 +28,7 @@ title = _('Mark Items as Arrived')
       </tr>
       <tr>
 	<th/>
-	<td><input type="submit" value="${False and _('Check out another item') or _('Continue')}"/></td>
+	<td><input type="submit" value="${False and _('Check out another item') or _('Continue')}"/> ${go_back_link()}</td>
       </tr>
     </table>
   </div>
-- 
2.11.0