From 766639aa0ae8c06e669a75410cc1cf7c6913abaf Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 25 Mar 2008 15:22:56 -0500
Subject: [PATCH] Tweaking the interface of OPAC shelves to more closely match
 the pattern set by the staff client. Simplifies and focuses on specific
 tasks.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css      |  33 ++++++++++-
 .../prog/en/modules/opac-shelves.tmpl         |  55 +++++++++++-------
 .../opac-tmpl/prog/images/shelf-delete.gif    | Bin 0 -> 117 bytes
 .../opac-tmpl/prog/images/shelf-edit.gif      | Bin 0 -> 303 bytes
 koha-tmpl/opac-tmpl/prog/images/shelf-new.gif | Bin 0 -> 305 bytes
 5 files changed, 65 insertions(+), 23 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/shelf-delete.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/shelf-edit.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/shelf-new.gif

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 87f3fe22aa..ac4463b9a0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -8,7 +8,7 @@ a, a:visited {
 	color : #006699;
 }
 
-a:hover {
+a:hover,input.editshelf:hover,a.editshelf:hover,input.deleteshelf:hover {
 	color : #990033;
 }
 
@@ -1572,3 +1572,34 @@ a#MARCview, a#ISBDview, a#Normalview {
 #shelfbrowser em {display:block;font-weight:bold;margin-bottom:5px;font-style:normal;}
 #shelfbrowser dl div {float:left;}
 #shelfbrowser img {margin-top:3.5em;}
+input.editshelf,a.editshelf {
+	background : transparent url("../../images/shelf-edit.gif") center left no-repeat;
+	border : 0;
+	color : #006699;
+	cursor : pointer;
+	margin:0pt 0.5em;
+	padding-left : 15px;
+	text-decoration : none;
+}
+input.newshelf,a.newshelf {
+	background : transparent url("../../images/shelf-new.gif") center left no-repeat;
+	border : 0;
+	color : #006699;
+	cursor : pointer;
+	margin:0pt 0.5em;
+	padding-left : 15px;
+	text-decoration : none;
+}
+input.deleteshelf {
+	background : transparent url("../../images/shelf-delete.gif") center left no-repeat;
+	border : 0;
+	color : #006699;
+	cursor : pointer;
+	font-size : 100%;
+	margin:0pt 0.5em;
+	padding-left : 13px;
+}
+
+input.editshelf:active,input.deleteshelf:active {
+	border : 0;
+}
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index eedda6cbf6..10ba215dcd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -82,14 +82,22 @@ $.tablesorter.addParser({
 <!-- /TMPL_IF --> 
 
     <div class="yui-g">
+	
+	
     <!-- TMPL_IF NAME="viewshelf" -->
+	<!--  Viewing a particular shelf -->
     <h3><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> <em><!-- TMPL_VAR NAME="shelfname" --></em></h3>
         <!-- TMPL_IF NAME="itemsloop" -->
     <form action="/cgi-bin/koha/opac-shelves.pl" method="post" name="myform" class="checkboxed">
         <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
         <input type="hidden" name="modifyshelfcontents" value="1" />
-		<!-- TMPL_IF NAME="manageshelf" --><span class="checkall"></span>
-		<span class="clearall"></span><!-- /TMPL_IF --><table id="listcontents">
+		<!-- TMPL_IF NAME="manageshelf" --><div><span class="checkall"></span>
+		<span class="clearall"></span> | <a class="editshelf" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->&amp;op=modif">Edit List</a> <form method="post" action="opac-shelves.pl">
+<input type="hidden" value="1" name="shelves"/>
+<input type="hidden" value="1" name="DEL-1"/>
+<input type="submit" class="deleteshelf" value="Delete List" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));"/>
+</form>
+</div><!-- /TMPL_IF --><table id="listcontents">
         <thead><tr>
             <!-- TMPL_IF NAME="manageshelf" --><th>&nbsp;</th><!-- /TMPL_IF -->
             <!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th><!-- /TMPL_UNLESS -->
@@ -121,43 +129,45 @@ $.tablesorter.addParser({
             <!-- TMPL_ELSE -->
         <div class="dialog message">This List is empty.  You can add to your lists from the results of any <a href="opac-main.pl">search</a>!</div>
             <!-- /TMPL_IF --><!-- /itemsloop -->
-    <!-- /TMPL_IF --><!-- /viewshelf -->
+    <!-- /TMPL_IF -->
+	<!-- /viewshelf -->
 
-    <!-- TMPL_IF NAME="manageshelf" -->
+	<!-- TMPL_IF NAME="manageshelf" -->
+	<!-- Editing shelf -->
 		<form method="post" action="/cgi-bin/koha/opac-shelves.pl">
         <!-- TMPL_IF NAME="itemsloop" -->
     		<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
     		<input type="hidden" name="modifyshelfcontents" value="1" />
-    		<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete('Are you sure you want to remove these items from the list?')" />
+    		<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete(_('Are you sure you want to remove these items from the list?'))" />
         <!-- TMPL_ELSE -->
 			<input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" value="1" />
 			<input type="hidden" name="shelves" value="1" />
-			<input type="submit" class="icon delete" value="Delete this List" onclick="return confirmDelete('Are you sure you want to delete this List?')" />
+			<input type="submit" class="icon delete" value="Delete this List" onclick="return confirmDelete(_('Are you sure you want to delete this List?'))" />
         <!-- /TMPL_IF -->
 		</form>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="edit" -->
+	<h3><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->"><em><!-- TMPL_VAR NAME="shelfname" --></em></a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Editing</h3>
         <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
             <input type="hidden" name="op" value="modifsave" />
             <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-            <div class="form">
-            <table>
-            <caption>Edit List <em><!-- TMPL_VAR NAME="shelfname" --></em></caption>
-            <tr><th><label for="shelfname">List Name: </label></th><td><input type="text" id="shelfname" name="shelfname" size="60" value="<!-- TMPL_VAR NAME="shelfname"-->" /></td></tr>
-            <tr><th><label for="sortfield" >Select sort field for this List: </label></th>
-            <td><select name="sortfield">
+            <fieldset class="rows">
+            <ol>
+            <li><label for="shelfname">List Name: </label><input type="text" id="shelfname" name="shelfname" size="60" value="<!-- TMPL_VAR NAME="shelfname"-->" /></li>
+            <li><label for="sortfield" >Sort this list by: </label>
+            <select name="sortfield">
             <option value="title" <!-- TMPL_IF NAME="sort_title" -->selected="1"<!-- /TMPL_IF -->>title</option>
             <option value="author" <!-- TMPL_IF NAME="sort_author" -->selected="1"<!-- /TMPL_IF -->>author</option>
             <option value="copyrightdate" <!-- TMPL_IF NAME="sort_copyrightdate" -->selected="1"<!-- /TMPL_IF -->>copyrightdate</option>
-            </select></td></tr>
-            </table>
-            <p><input type="hidden" name="category" value="1" /><input type="submit" value="Save Changes" class="submit" /></p>
-            </div>
+            </select></li>
+            </ol>
+            </fieldset>
+            <fieldset class="action"><input type="hidden" name="category" value="1" /><input type="submit" value="Save" class="submit" /> <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->">Cancel</a></fieldset>
         </form>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_UNLESS NAME="viewshelf" -->
+   <!-- TMPL_UNLESS NAME="edit" --> <!-- TMPL_UNLESS NAME="viewshelf" --> <!-- TMPL_UNLESS NAME="shelves" -->
         <h2>Lists</h2>
         <ul class="link-tabs">
         <!-- TMPL_IF NAME="showprivateshelves" -->
@@ -195,7 +205,7 @@ $.tablesorter.addParser({
 				<form action="opac-shelves.pl" method="get">
 					<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelf" -->" />
 					<input type="hidden" name="op" value="modif" />
-					<input type="submit" value="Edit" />
+					<input type="submit" class="editshelf" value="Edit" />
 				</form>
 				<form action="opac-shelves.pl" method="post">
 					<input type="hidden" name="shelves" value="1" />
@@ -204,7 +214,7 @@ $.tablesorter.addParser({
 					<input type="hidden" name="CONFIRM-<!-- TMPL_VAR NAME="confirm" -->" value="1" />
 					<input type="submit" class="confirm" value="Confirm" />
 					<!-- TMPL_ELSE -->
-					<input type="submit" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));" value="Delete" />
+					<input type="submit" class="deleteshelf" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));" value="Delete" />
 					<!-- /TMPL_IF -->
 				</form>
 			<!-- /TMPL_IF -->&nbsp;
@@ -215,6 +225,7 @@ $.tablesorter.addParser({
             <tr><td colspan="4">No Private Lists.</td></tr>
             <!-- /TMPL_IF --><!-- /shelveslooppriv -->
         </table>
+		<a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a>
         <!-- TMPL_ELSE --><!-- /loggedinusername -->
         	<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>
         <!-- /TMPL_IF --><!-- /loggedinusername -->
@@ -243,9 +254,9 @@ $.tablesorter.addParser({
         	<!-- TMPL_IF NAME="showpublicshelves" -->No Public Lists.<!-- /TMPL_IF -->
         <!-- /TMPL_IF --><!-- /shelvesloop -->
         </div><!-- /publicshelves -->
-    <!-- /TMPL_UNLESS --><!-- /viewshelf -->
+    <!-- /TMPL_UNLESS --><!-- /viewshelf --><!-- /TMPL_UNLESS --><!-- /edit --><!-- /TMPL_UNLESS --><!-- /shelves -->
 
-    <!-- TMPL_IF NAME="showadd" -->
+        <!-- TMPL_IF NAME="shelves" -->
         <div id="addshelf"><form method="post" action="/cgi-bin/koha/opac-shelves.pl">
 		<fieldset class="rows">
 		<legend>Create a New List</legend>
@@ -259,7 +270,7 @@ $.tablesorter.addParser({
 				<input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /></li>
 </ol>
 		</fieldset>
-            <fieldset class="action"><input type="hidden" name="category" value="1" /><input type="submit" value="Add New List" class="submit" /></fieldset>
+            <fieldset class="action"><input type="hidden" name="category" value="1" /><input type="submit" value="Save" class="submit" /> <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl">Cancel</a></fieldset>
         </form>    </div>
 	<!-- /TMPL_IF --><!-- /showadd -->
     </div>
diff --git a/koha-tmpl/opac-tmpl/prog/images/shelf-delete.gif b/koha-tmpl/opac-tmpl/prog/images/shelf-delete.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6de7fa734f4a7fc2a29c2ec3d73e24c95290c708
GIT binary patch
literal 117
zcmZ?wbhEHb<YeGx*v!lDIg;mwz1l@fy-OB)pCWl)2a4XbSHEGe{yB>0qJ`e8K+%UD
za%YT<|NsBb00xRbSr{1@co}p+Jdha-EJ_<rdTP6-C@D<M_gd)V9U10U5Yjn;=j4$y
QXU}+;)J4~bGBQ{L0Kifu-v9sr

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/shelf-edit.gif b/koha-tmpl/opac-tmpl/prog/images/shelf-edit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d0f28d3bf411bddec77fd2c39c42c4844121cc4d
GIT binary patch
literal 303
zcmZ?wbhEHb<YeGxxT?;e6xgU0-K!nltDiVUKWWOVFMpMT8o&MeZ<spWs`Y|y{KOC6
z|GoVD@7wQxs-dm--u}@D?|A(F@1MW_RYO`|e);?R@4pY<{%S;Y8l_Bs`T6gw&;N{4
zrz`l^-Fy4@@rS><aT9doC)|De$1r93#LZW~{rV^GTk{_b7^nmkf3h$#FsL)=fXoB=
ziGj`Mz~q7oEy4Dsmo!fL^!dq5zH-u%QH3oiDTHy3jLM~jg7fC+iFrKx92w)+#IxAp
kVg}Rle)cWwt|ICzin6l&ii*tYN=nkwN)i$r>W&Q7026*|>i_@%

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/shelf-new.gif b/koha-tmpl/opac-tmpl/prog/images/shelf-new.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d42e57bcc0ef1933330b12f8f7b106104c56bc4a
GIT binary patch
literal 305
zcmZ?wbhEHb<YeGxxT?kQ{|&?Mj|c9({rmXCU)}hLFTec#^Y{O~w|~C<`v3CtzgJ)W
zYDM>Igm?UZlBOEksvX^{pEyN7Y08K1|2};C`}qA|)sWV2zyB%t*BPcxR|;&LaKuR?
zqSGj4`peIMUw!@;yC}*ib-Hfc1l{-v%0Z2H-~KU7nJ({J^X=Ea|3Gji4M;Fh1{8m?
zFfuS`G3bDd0r`o6&Cg+KfrrjACe6t~KQEdviBAz>^~em8Jp95$iqTH%_{)|JJ=&|z
wwp`?FRgu2BcyfS<&Ae7E6M?U;A}m^hDojl5Dk=h6s;UYKsxmSXT8<3X08iX;oB#j-

literal 0
HcmV?d00001

-- 
2.39.5