[Koha-patches] [PATCH] Interface corrections and improvements to OPAC lists

Owen Leonard oleonard at myacpl.org
Thu Dec 31 18:45:54 CET 2009


- improving behavior for users with no javascript
- style improvements to list "toolbar"
- adding new toolbar icons
- adding display of subtitle to lists
---
 C4/VirtualShelves/Page.pm                          |    2 +
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |  258 ++++++++++++--------
 .../prog/en/modules/opac-downloadshelf.tmpl        |   31 ++-
 .../prog/en/modules/opac-sendshelfform.tmpl        |    8 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |   66 +++---
 koha-tmpl/opac-tmpl/prog/images/download.png       |  Bin 0 -> 369 bytes
 koha-tmpl/opac-tmpl/prog/images/empty-small.png    |  Bin 0 -> 474 bytes
 .../opac-tmpl/prog/images/place-hold-small.png     |  Bin 0 -> 430 bytes
 koha-tmpl/opac-tmpl/prog/images/print-small.png    |  Bin 0 -> 507 bytes
 koha-tmpl/opac-tmpl/prog/images/send.png           |  Bin 0 -> 472 bytes
 koha-tmpl/opac-tmpl/prog/images/tags-small.png     |  Bin 0 -> 361 bytes
 11 files changed, 216 insertions(+), 149 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/download.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/empty-small.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/place-hold-small.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/print-small.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/send.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/tags-small.png

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 9e618c5..76b575f 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -181,6 +181,7 @@ SWITCH: {
 			}
 			($items, $totitems) = GetShelfContents($shelfnumber, $shelflimit, $shelfoffset);
 			for my $this_item (@$items) {
+				my $record = GetMarcBiblio($this_item->{'biblionumber'});
 				# the virtualshelfcontents table does not store these columns nor are they retrieved from the items
 				# and itemtypes tables, so I'm commenting them out for now to quiet the log -crn
 				#$this_item->{imageurl} = $imgdir."/".$itemtypes->{ $this_item->{itemtype}  }->{'imageurl'};
@@ -188,6 +189,7 @@ SWITCH: {
 				$this_item->{'dateadded'} = format_date($this_item->{'dateadded'});
                 $this_item->{'imageurl'} = getitemtypeinfo($this_item->{'itemtype'})->{'imageurl'};
                 $this_item->{'coins'} = GetCOinSBiblio($this_item->{'biblionumber'});
+				$this_item->{'subtitle'} = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $record, '');
 			}
 			push @paramsloop, {display => 'privateshelves'} if $category == 1;
 			$showadd = 1;
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 9e30270..0b68fdc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -389,11 +389,50 @@ a .term {
 	padding : .3em 0;
 }
 
-#action a, #toolbar a {
+#action a {
 	background-position : 5px center;
 	background-repeat : no-repeat;
 	text-decoration : none;
-	padding-left : 26px;
+	padding-left : 35px;
+}
+
+#action a.print {
+	background-image:url(../../images/print.gif);
+}
+
+#action a#furthersearches {
+	background : transparent url(../../images/menu-arrow.gif) no-repeat right center;
+	border : 1px solid #F3F3F3;
+	margin-left : 5px;
+	padding : 2px 26px 2px 10px;
+	text-decoration : none;
+}
+
+#action a#furthersearches:hover {
+	border-top : 1px solid #FFF;
+	border-left : 1px solid #FFF;
+	border-right : 1px solid #979797;
+	border-bottom : 1px solid #979797;
+}
+
+#action a.reserve,
+.searchresults a.reserve {
+	background-image:url(../../images/placereserve.gif);
+}
+
+#action a.addtoshelf, #toolbar a.addtoshelf {
+	background-image:url(../../images/addtoshelf.gif);
+}
+
+#action a.addtocart, #toolbar a.addtocart {
+	background-image:url(../../images/cart2.gif);
+}
+
+/* toolbar buttons */
+
+#toolbar a,
+#toolbar input {
+	white-space : nowrap;
 }
 
 #toolbar ul {
@@ -413,82 +452,147 @@ a .term {
 	border-left : 0;
 }
 
-#action a.reserve, #toolbar a.reserve, .searchresults a.reserve {
-	background-image:url(../../images/placereserve.gif);
+
+#toolbar a.print {
+	background: transparent url(../../images/print-small.png) 5px 50% no-repeat;
+	display : none;
+	text-decoration : none;
+	padding-left : 23px;
 }
 
-.searchresults a.highlight_toggle {
-	background : transparent url(../../images/highlight.gif) -4px center no-repeat;
-	display: none;
-	font-weight: normal;
-	padding : 0 10px 0 21px;
+#toolbar a.brief {
+	background: transparent url(../../images/brief.gif) 5px 50% no-repeat;
+	text-decoration : none;
+	padding-left : 23px;
 }
 
-#action a.addtoshelf, #toolbar a.addtoshelf {
-	background-image:url(../../images/addtoshelf.gif);
+#toolbar a.detail {
+	background: transparent url(../../images/detail.gif) 5px 50% no-repeat;
+	text-decoration : none;
+	padding-left : 27px;
 }
 
-#action a.addtocart, #toolbar a.addtocart {
-	background-image:url(../../images/cart2.gif);
+#toolbar a.download {
+	background : transparent url("../../images/download.png") 7px 50% no-repeat;
+	padding-left : 24px;
+	text-decoration : none;
 }
 
-#action a.print, #toolbar a.print {
-	background-image:url(../../images/print.gif);
+#toolbar a.editshelf {
+	background : transparent url("../../images/shelf-edit.gif") 12px 50% no-repeat;
+	padding-left : 26px;
+	text-decoration : none;
 }
 
-#action a#furthersearches {
-	background : transparent url(../../images/menu-arrow.gif) no-repeat right center;
-	border : 1px solid #F3F3F3;
-	margin-left : 5px;
-	padding : 2px 26px 2px 10px;
+#toolbar a.empty {
+	background: transparent url(../../images/empty-small.png) 5px 50% no-repeat;
 	text-decoration : none;
+	padding-left : 21px;
 }
 
-#action a#furthersearches:hover {
-	border-top : 1px solid #FFF;
-	border-left : 1px solid #FFF;
-	border-right : 1px solid #979797;
-	border-bottom : 1px solid #979797;
+#toolbar a.hide {
+	background: transparent url(../../images/close.gif) 5px 50% no-repeat;
+	text-decoration : none;
+	padding-left : 26px;
 }
 
-#toolbar a.brief {
-	background-image: url(../../images/brief.gif);
+#toolbar a.hold {
+	background: transparent url(../../images/place-hold-small.png) 5px 50% no-repeat;
+	text-decoration : none;
+	padding-left : 23px;
 }
 
-#toolbar  a.detail {
-	background-image: url(../../images/detail.gif);
+#toolbar a.newshelf {
+	background : transparent url("../../images/shelf-new.gif") 5px 50% no-repeat;
+	padding-left : 23px;
+	text-decoration : none;
 }
 
-#toolbar a.print {
-	background-image: url(../../images/print.gif);
+#toolbar a.send,
+a.send {
+	background: transparent url(../../images/send.png) 2px 50% no-repeat;
+	text-decoration : none;
+	padding-left : 28px;
 }
 
-#toolbar a.hide {
-	background-image: url(../../images/close.gif);
+#toolbar a.new {
+	background : transparent url("../../images/new.gif") 5px 50% no-repeat;
+	padding-left : 23px;
+	text-decoration : none;
 }
 
-#toolbar a.send {
-	background-image: url(../../images/send.gif);
+#toolbar input.download {
+	background : transparent url("../../images/download.png") 7px 50% no-repeat;
+	border : 0;
+	color : #006699;
+	cursor : pointer;
+	padding-left : 24px;
+	text-decoration : none;
 }
-.sendlist {
-	display : none;
+
+#toolbar input.editshelf,
+input.editshelf {
+	background : transparent url("../../images/shelf-edit.gif") 10px 50% no-repeat;
+	border : 0;
+	color : #006699;
+	cursor : pointer;
+	font-size : 100%;
+	padding-left : 29px;
+	text-decoration : none;
 }
-a.send {
-	background-image: url(../../images/send.gif);
-	background-position : 0px center;
-	background-repeat : no-repeat;
+
+#toolbar input.newshelf {
+	background : transparent url("../../images/shelf-new.gif") center left no-repeat;
+	border : 0;
+	color : #006699;
+	cursor : pointer;
+	font-size : 100%;
+	margin: 0 0.5em;
+	padding-left : 15px;
 	text-decoration : none;
-	padding-left : 21px;
-	padding-right : 5px;
 }
-a.hold,
+
+#toolbar input.deleteshelf,
+input.deleteshelf {
+	background : transparent url("../../images/shelf-delete.gif") 7px 50% no-repeat;
+	border : 0;
+	color : #006699;
+	cursor : pointer;
+	font-size : 100%;
+	padding-left : 20px;
+}
+
+#toolbar input.deleteshelf:hover {
+	color: #990033;
+}
+
+
+#toolbar input.editshelf:active,input.deleteshelf:active {
+	border : 0;
+}
+
+#tagsel_span input.submit,
+#tagsel_tag {
+	background-image: url(../../images/tags-small.png);
+	background-position : 7px center;
+	background-repeat : no-repeat;
+	padding-left : 25px;
+	text-decoration: none;
+}
+
+#placehold input.submit:hover,
+#tagsel_span input.submit:hover {
+	color: #990033;
+}
+
 #placehold input.submit {
-	background-image: url(../../images/placereserve.gif);
+	background-image:url(../../images/placereserve.gif);
 	background-position : 9px center;
 	background-repeat : no-repeat;
 	text-decoration : none;
-	padding-left : 34px;
+	padding-left : 23px;
 }
+
 #placehold input.submit,
 #tagsel_span input.submit {
 	border : 0;
@@ -499,22 +603,11 @@ a.hold,
 	color : #336699;
 	cursor : pointer;
 }
-#tagsel_span input.submit,
-#tagsel_tag {
-	background-image: url(../../images/tags.gif);
-	background-position : 9px center;
-	background-repeat : no-repeat;
-	padding-left : 24px;
-	text-decoration: none;
-}
-#tagsel_tag {
-	padding-left: 27px;
-}
-#placehold input.submit:hover,#tagsel_span input.submit:hover {
-	color: #990033;
-}
-#toolbar a.empty {
-	background-image: url(../../images/trash.gif);
+.searchresults a.highlight_toggle {
+	background : transparent url(../../images/highlight.gif) -4px center no-repeat;
+	display: none;
+	font-weight: normal;
+	padding : 0 10px 0 21px;
 }
 
 /* the itemtype list in advanced search */
@@ -1739,47 +1832,6 @@ a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview {
 #shelfbrowser a {
 	display : block;
 }
-a.new {
-	background : transparent url("../../images/new.gif") center left no-repeat;
-	border : 0;
-	color : #006699;
-	cursor : pointer;
-	margin:0pt 0.5em;
-	padding-left : 15px;
-	text-decoration : none;
-}
-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;
-	font-size : 100%;
-	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;
-}
 
 #comments .commentline {
 	border-bottom : 2px solid #eeeeeb;
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl
index 52203f5..b5effbc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl
@@ -1,11 +1,18 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Download shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Download list<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript">//<![CDATA[
+	$(document).ready(function(){
+		$(".close").html("Close this window");
+	});
+//]]>
+</script>
 </head>
-<body>
-<!-- TMPL_IF NAME="format" -->
-    Your Download should automatically start
+<body style="padding:1em;">
+<div class="container"><!-- TMPL_IF NAME="format" -->
+    <p>Your download should begin automatically.</p>
 <!-- TMPL_ELSE -->
-<div id="export" class="detailtagcell">    <form method="post" action="/cgi-bin/koha/opac-downloadshelf.pl">
-	<label for="format">Download shelf:</label>
+<form method="post" action="/cgi-bin/koha/opac-downloadshelf.pl">
+<fieldset class="rows">
+	<ol><li><label for="format">Download list:</label>
         <select name="format" id="format">
 	    <option value="">-- Choose Format --</option>
 	    <option value="iso2709">iso2709</option>
@@ -15,14 +22,14 @@
 	    <option value="<!-- TMPL_VAR NAME="export_format_id" -->">CSV - <!-- TMPL_VAR NAME="profile" --></option>
 	    <!-- /TMPL_LOOP -->
 
-	</select>
-	<input type="hidden" name="shelfid" value="<!-- TMPL_VAR NAME="shelfid" -->" />
-	<input type="submit" name="save" value="Go" />
+	</select></li></ol>
+</fieldset>
+<fieldset class="action">	<input type="hidden" name="shelfid" value="<!-- TMPL_VAR NAME="shelfid" -->" />
+	<input type="submit" name="save" value="Go" /></fieldset>
     </form>
 
-    <p><a class="button" href="#" onclick="javascript:window.close()">Close this window</a></p>
-    </div>
+    <p><a class="button close" href="/cgi-bin/koha/opac-shelves.pl">Back to lists</a></p>
 
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --></div>
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
index 41f7d32..9d0e717 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
@@ -1,5 +1,11 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your List
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript">//<![CDATA[
+	$(document).ready(function(){
+		$(".close").html("Close this window");
+	});
+//]]>
+</script>
 </head>
 <body style="padding: 1em;" id="sendbasket">
 <div class="container"><!-- TMPL_IF NAME="email" -->
@@ -7,7 +13,7 @@
     <!-- TMPL_IF NAME="SENT" -->
         <h3>Message Sent</h3>
         <p>The list was sent to: <!-- TMPL_VAR NAME="email" --></p>
-        <p><a class="close focus" href="#">Close window</a></p>
+        <p><a class="focus close" href="/cgi-bin/koha/opac-shelves.pl">Back to lists</a></p>
     <!-- /TMPL_IF  -->
     <!-- TMPL_IF NAME="error" -->
     <p>Problem sending the list...</p>
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 1741d64..bd5685b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -72,9 +72,9 @@ function tagAdded() {
 }
 
 $(function() {
-    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_('Clear All')+"<\/a>");
-    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_('Select All')+"<\/a>");
-	$(".sendlist").show();
+    <!-- TMPL_IF NAME="loggedinusername" -->$("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_('Clear All')+"<\/a>|");
+    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_('Select All')+"<\/a>");<!-- /TMPL_IF -->
+	$("a.print").show();
     <!-- TMPL_IF NAME="RequestOnOpac" -->$("#placehold").html("<a href=\"#\" class=\"hold tag_hides\">"+_('Place Hold')+"<\/a>");
 	$("a.hold").click(function(){
 		 holdSelections();
@@ -116,7 +116,7 @@ $(function() {
 		tagSelected();
 		return false;
 	});
-	$("#addtags").html("<a id=\"tagsel_tag\" href=\"#\">"+_("Tag")+"<\/a>");
+	$("#addtags").html("<a id=\"tagsel_tag\" href=\"#\">"+_("Tag")+"<\/a> |");
     $("#tagsel_button").click(function(){
         tagAdded();
         return false;
@@ -127,7 +127,7 @@ $(function() {
 </script>
 </head>
 <!-- TMPL_IF NAME="loggedinusername" --><body id="opac-userlists"><!-- TMPL_ELSE --><body id="opac-lists"><!-- /TMPL_IF -->
-  <!-- TMPL_IF EXPR="OpacNav||loggedinusername" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSIF NAME="loggedinusername" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
     <div id="bd">
       <!-- TMPL_INCLUDE NAME="masthead.inc" -->
       <div id="yui-main">
@@ -178,28 +178,12 @@ $(function() {
             <!-- 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" ESCAPE="html" --></em></h3>
               <!-- TMPL_IF NAME="itemsloop" -->
-                <!-- TMPL_IF NAME="manageshelf" -->
                   <div id="toolbar" class="list-actions">
-                    <span class="checkall"></span>
+<!-- TMPL_IF NAME="loggedinusername" -->                    <span class="checkall"></span>
                     <span class="clearall"></span>
-                    |
-						<span class="sendlist"><a href="#" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send List</a></span>
-                      <a href="#" class="download tag_hides" onclick="open(CGIBIN+'opac-downloadshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Download List</a>
-                      <a class="editshelf tag_hides" 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" class="tag_hides">
-                        <input type="hidden" value="1" name="shelves"/>
-                    <!-- TMPL_IF NAME="showprivateshelves" -->
-                         <input type="hidden" name="display" value="privateshelves" />
-                    <!-- /TMPL_IF -->
-                         <input type="hidden" value="1" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->"/>
-                         <input type="submit" class="deleteshelf" value="Delete List" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));"/>
-                      </form>
-
-		      <a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print</a>
 
-                      <a href="#" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
 <!-- TMPL_IF NAME="RequestOnOpac" -->
-                      <span id="placehold"></span>
+                      <span id="placehold"></span><!-- TMPL_UNLESS NAME="TagsEnabled" --> |<!-- /TMPL_UNLESS -->
 <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="TagsEnabled" -->
                     <span id="addtags"></span>               
@@ -209,11 +193,29 @@ $(function() {
                       <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button"
                              type="submit" value="Add" style="display:inline" />
                       <a href="#" id="tagsel_cancel" onclick="tagCanceled(); return false;" style="display:inline">Cancel</a>
-                    </span>
-    <!-- /TMPL_IF -->
+                  </span>
+    <!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+                      <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->" class="download tag_hides" onclick="open(CGIBIN+'opac-downloadshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false;">Download List</a>
+
+<span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send List</a></span>
+
+
+                <!-- TMPL_IF NAME="manageshelf" --><a class="editshelf tag_hides" 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" class="tag_hides">
+                        <input type="hidden" value="1" name="shelves"/>
+                    <!-- TMPL_IF NAME="showprivateshelves" -->
+                         <input type="hidden" name="display" value="privateshelves" />
+                    <!-- /TMPL_IF -->
+                         <input type="hidden" value="1" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->"/>
+                         <input type="submit" class="deleteshelf" value="Delete List" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));"/>
+                      </form> <!-- /TMPL_IF -->
+
+		      <a class="print tag_hides" href="opac-shelves.pl" onclick="print(); return false;">Print List</a>
+<!-- TMPL_UNLESS NAME="loggedinusername" -->
+				| <span><a class="login" href="/cgi-bin/koha/opac-user.pl">Log in</a> to place holds or add tags</span><!-- /TMPL_UNLESS -->
                   </div>
-				<!-- TMPL_ELSE -->
-				<div style="margin-left:1em;"><span class="sendlist"><a href="#" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send List</a></span> | <span><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to place holds or add tags</span></div>
+
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="manageshelf" -->
                   <form action="/cgi-bin/koha/opac-shelves.pl" method="post" name="myform" class="checkboxed">
@@ -348,7 +350,7 @@ $(function() {
                   <!-- /TMPL_IF -->
         
                   <!-- TMPL_IF NAME="loggedinusername" -->
-                    <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a>
+                    <div id="toolbar"><a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a></div>
                   <!-- TMPL_IF NAME="showprivateshelves" -->
                     <!-- TMPL_IF NAME="shelveslooppriv" -->
                       <!-- TMPL_VAR name='pagination_bar'-->
@@ -375,8 +377,7 @@ $(function() {
                                 <!-- TMPL_IF NAME="viewcategory3" -->Open<!-- /TMPL_IF -->
                               </td>
                               <td>
-                              <span class="sendlist"><a href="#" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send List</a></span>
-                            <!-- TMPL_IF NAME="mine" -->
+                              <!-- TMPL_IF NAME="mine" -->
                                 <form action="/cgi-bin/koha/opac-shelves.pl" method="get">
                                   <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelf" -->" />
                                   <input type="hidden" name="display" value="privateshelves" />
@@ -416,7 +417,7 @@ $(function() {
                     <div id="publicshelves" class="tab-container" style="display:none;">
                   <!-- /TMPL_IF -->
                   <!-- TMPL_IF NAME="loggedinusername" -->
-                  <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a>
+                 <div id="toolbar"> <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a></div>
                   <!-- TMPL_ELSE -->
                   <div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>
                   <!-- /TMPL_IF -->
@@ -444,8 +445,7 @@ $(function() {
                             <!-- TMPL_IF NAME="viewcategory3" -->Open<!-- /TMPL_IF -->
 	                      </td>
                           <td>
-							<span class="sendlist"><a href="#" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send List</a></span>
-                            <!-- TMPL_IF NAME="mine" -->
+							<!-- TMPL_IF NAME="mine" -->
                               <form action="/cgi-bin/koha/opac-shelves.pl" method="get">
                                 <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelf" -->" />
                                 <input type="hidden" name="op" value="modif" />
diff --git a/koha-tmpl/opac-tmpl/prog/images/download.png b/koha-tmpl/opac-tmpl/prog/images/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf1394d0c3a442ff33170c608aabe262ce0851c5
GIT binary patch
literal 369
zcmeAS at N?(olHy`uVBq!ia0vp^oIuRY!3-p4wTEj0DVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5XN&|dCT>t<7pV+#}HfQ#Qho2{|
zJg6GlcIV|cdEXk1h%VclIjW(pcV2#f_w8 at Rv@L$+3*UYFclYJDMf-36{`>#Mr$72h
zQ|)qQzxec5Ik55TuYd2q{Zk5TN^D)J7TWsg!=JC;E@;Q}D*D%J$MkJI`|SCrzj_H1
zbrU8k`q!<M{U;7|K$EA7V at SoVqy!*HPiLRRz{uj1#lz(wq|o5t5#zz-!NelK%q*_G
znnim$53>V<p+Uh1?@ymU6c{kD2n0mLMfyZcY-ChukdTOo2uTf%h>&1l>S&zq+u++W
zdv>olNaCQwtcij^#*Z0KXUv>AmE|W$MQ3Mc at DyR7=@JavmNWOn{CIc+=o$u3S3j3^
HP6<r_I+2vN

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/empty-small.png b/koha-tmpl/opac-tmpl/prog/images/empty-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..74fe623cc27131a1c9bbf9d945c4f3c3f2f2d173
GIT binary patch
literal 474
zcmeAS at N?(olHy`uVBq!ia0vp^oIuRY!3-p4wTEj0DVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5XrUm$fxT=M=>c&kpOrEOfSEn4@
zq!&Ly!LRn!=f6LH|NHXu-;Y246a(rt!aMX6CL1PA(~RnV_2sW>XscpC!{?v>9=`jd
z;9sW~H&H#j<K4G^Pe1%MNStDrG*vf#;>*u}zx?>89n<&l{okK|{ylvE=iRrz8WA1(
ziIac){`d6bU!{Nso!CBk-x{r`ZsnjR1;09#peDoQY5&2%`PY;vpbL#kg8YIZA|#Lu
zya6-b19kU!x;TbZ+)6SqF}ZT-64N9G#v=(UPV1~%z4~+-hkyf*)Ezd31&S;{R+Uv%
zm6er_RTW5y#)*Y1jx9Zw08-NSXpT*h)*-Dnki-f7g==|Qz|0jV*J&!~ug(OkNqS}U
zs%O#~h?><4v=*&WNd-$>^7&Qs>(?)!1RDcK25;ZXS>Bt0?qcwC^>bP0l+XkKuKeS?

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/place-hold-small.png b/koha-tmpl/opac-tmpl/prog/images/place-hold-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..deb5181e4e0f4aad6532f6cc6c0e1f0a679d0c13
GIT binary patch
literal 430
zcmeAS at N?(olHy`uVBq!ia0vp at K+M6x3?xN=wEhKBEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>R1^9%x{{H*_-M4=)KK(UFn)>Md
zU&Ev+%7Kmg at e@@;Ti<>A`|a011;2WYh_2s%{=Ww)`}6JRKef=dM<4#EhP3L%PgD+S
zR10lY at UPR3>D7$v)JvFTkTgX<VUk|_B#p>UjfhU|n7-eC|GoJ9S0|?L>#u*0-v2R7
znkw&G^B)Y({3rnVMXMypFBl?11j%5u;zJBjSA(aEV at SoVqzhNBgtRmH`Zh2CnIhL4
z81g`DrcW-C6{3<iL_}|zm at +bTI8JtUZSZ#WY3+6nh!9q2kT7{_`Bbt}!t&>nrz&6t
zjq#qIj-8#Jk&aH0l0XGZB0 at q#BSTtmq~1(*VE~#iYwFa<-bi0x-i)bg4h at V9EBU!?
U<L}Ql0lJ03)78&qol`;+0MwYr;{X5v

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/print-small.png b/koha-tmpl/opac-tmpl/prog/images/print-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfae1adb94733a1c231e2172fe28f878ca9cb33f
GIT binary patch
literal 507
zcmeAS at N?(olHy`uVBq!ia0vp^JRr=$3?vg*uel1OSkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%cAK(+>s_0*@64Ig`*7o_wzh8g;
zX+(5sM09FIc4<a*-g@&-$-m+8hd;_eO_~v13VyYkk)4VG4F-vm4U?wsd-zW~x<@IX
zUNNBFD0$keFMnTu`Kue(|M>kMz4%G`iBtAH__y!jf90S?y at ZL6-~ZK$?lDZ7rr=j+
zm^}6Ihrc?p{WstI{q*DCndkphLs|@zr|HJ_pLzE0)|<cbzBOC#{)Yg;xaJo?r<#@o
z`2|CTNTL{Owq5{*+(J(m$B>F!Nd}Be&Ke9H3Tz6q&r9%x_%bkYoDfV%6nHF@%D4&0
z>8O~ob;i~$TSR<(KvEYcUPw&2GVzL`AtQ%^Lc3>dXLM}T+>=LG6dELaEFx~+xKSDT
z^QI+GZHMDc4n7wU?e84t9O3Nc at 9*!&4^)=2<*TCr#}-jWpj5zRhsy^TS}aq6oP#dD
luHhcO;lAPFcUTk-Fl3(<`BL}c0yogH44$rjF6*2UngBUF>q-Cs

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/send.png b/koha-tmpl/opac-tmpl/prog/images/send.png
new file mode 100644
index 0000000000000000000000000000000000000000..84443ac3736cdfd03a68fac57a6a94efced37c0b
GIT binary patch
literal 472
zcmeAS at N?(olHy`uVBq!ia0vp^azHG>!3-pCZQt7qq*&4&eH|GX)}JtE?Rp91OP07s
zlmzFem6RtIr7}3C<R_&nc;+Uirv{}arc at T5Otk?jN(=A_ah3P2F-V&F|NsBrfB!#v
z|L5zke;N^8FFyU%j_FhMuY33HuWD$kVbavEKmREQHa`0B=h6GW%0Z1vK~3+!{nLw|
zs1ws`m^4KrvQxpoPBo<U{kOj_KL6EAnDqPazvm!BdNm_Efrd{o(~$<+s8kZ<7YyX$
z2MoLy4i^GdpYn8Z45_%46mW!_fvJOWzlj5b-~=`f1*S_3j4lpR3Jn|{%q#+onGFm|
z3cLaiEK3-fI6P-DGCoLRU~Ex2d-5a;;~b#^!v+SYNn%OQlG&Id?a~}~NH{PkdKPcq
z<n?LOrlQZAiVh!T0BQ5}n$yk8(kcqktb1PZte*O*bLY+-WE5xSP*BN~6ceix6Jt~m
zYwTuZ5twAc&#x at eVQ6#+sJp{q0|S~nIvS82%f_(aL`aQLi0)0GuNXXC{an^LB{Ts5
DAW6NJ

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/tags-small.png b/koha-tmpl/opac-tmpl/prog/images/tags-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..cecd0bf1e19b03de93778c4736d502995114cf60
GIT binary patch
literal 361
zcmeAS at N?(olHy`uVBq!ia0vp^+(695!3-or^+GlRDVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5X0t0+PTy<jm^%5o<CQp6z{*Ov<
zi)K`}yl;(qc)LN;RMn6cgXF2YvHkDA{nL!<Q3`C(OPKWH^WR4w{;G#}y!iB2!N2a^
zw|~F?{#OcY{QB$Pe=u0J_|$Wt;nF2Re!&nCY$Sua3AZUwS-Gc+V at SoVqzOz+W|{^J
z913g#-YzU>*f<mvqFr2Kf at F>WnQV523f?|FtS3NhO+P~gZ>OeMFD`|KhO8Eq2A#mb
zFwF)ArcFyLDjReX6WM_5jZ1g1Ht3|e0hybZ{$QOcX*q*|iQ~|;M~@OFO=99OV9 at 8{
VSgWA5<P^{e44$rjF6*2UngCF*jxzuN

literal 0
HcmV?d00001

-- 
1.6.3.3




More information about the Koha-patches mailing list