Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl
[koha.git] / koha-tmpl / opac-tmpl / prog / en / modules / opac-shelves.tmpl
index 7013a1c..3c04429 100644 (file)
@@ -6,12 +6,7 @@
 var MSG_NO_TAG_SPECIFIED = _("No tag was specified.");
 var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?");
 var MSG_CONFIRM_DELETE_LIST = _("Are you sure you want to delete this list?");
-$.tablesorter.addParser({
-    id: 'articles', 
-    is: function(s) {return false;  }, 
-    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); }, 
-    type: 'text' 
-});
+
 <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="RequestOnOpac" -->
 function holdSelections() {
     var checkedBoxes = $(":checkbox:checked");
@@ -69,26 +64,17 @@ function tagAdded() {
 }<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 $(function() {
+    <!-- TMPL_IF name="opacbookbag" -->$(".addtocart").show();<!-- /TMPL_IF -->
     $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_('Clear All')+"<\/a>|");
     $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_('Select All')+"<\/a>");
   $("a.print").show();
+
     <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="RequestOnOpac" -->$("#placehold").html("<a href=\"#\" class=\"hold tag_hides\">"+_('Place Hold')+"<\/a>");
       $("a.hold").click(function(){
          holdSelections();
          return false;
       });<!-- /TMPL_IF --><!-- /TMPL_IF -->
-    $("#listcontents").tablesorter({
-        widgets : ['zebra'],
-          <!-- TMPL_IF NAME="authorsort" -->
-          sortList: [[2,0]],
-          <!-- TMPL_ELSIF NAME="yearsort" -->
-          sortList: [[3,1]],
-          <!-- TMPL_ELSE -->
-          sortList: [[1,0]],
-          <!-- /TMPL_IF -->
-          headers: { 0: { sorter: false },1:{sorter: 'articles'}
-        }
-    }); 
+
     $("#CheckAll").click(function(){
         $(".checkboxed").checkCheckboxes();
         return false;
@@ -97,17 +83,38 @@ $(function() {
         $(".checkboxed").unCheckCheckboxes();
         return false;
     });
+
     <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" -->
           $("#addtags").click(function(){
             tagSelected();
             return false;
           });
           $("#addtags").html("<a id=\"tagsel_tag\" href=\"#\">"+_("Tag")+"<\/a> |");
+
+        $(".tagbutton").click(KOHA.Tags.add_tag_button);
+      <!-- TMPL_IF NAME="TagsInputOnList" -->
+      <!-- TMPL_IF NAME="loggedinusername" -->
+            $("#tagsel_tag").click(function(){
+                tagSelected();
+                return false;
+            });
+            $("#tagsel_cancel").click(function(){
+                tagCanceled();
+                return false;
+            });
             $("#tagsel_button").click(function(){
                 tagAdded();
                 return false;
             });
-            <!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            $("#tagsel_tag").click(function(){
+                window.location = "/cgi-bin/koha/opac-user.pl";
+                return false;
+            });
+        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+  <!-- TMPL_IF NAME="GoogleJackets" -->KOHA.Google.GetCoverFromIsbn();<!-- /TMPL_IF -->
 });
       function Check(f) {
                var _alertString="";
@@ -148,7 +155,7 @@ $(function() {
                     <!-- TMPL_IF NAME="need_confirm" -->
                       <div class="dialog alert">
                         The list <i><!-- TMPL_VAR NAME="need_confirm" --></i> is not empty.
-                        <br />It has <b><!-- TMPL_VAR NAME="count" --></b> entries.
+                        <br />It has <b><!-- TMPL_VAR NAME="count" --></b> <!-- TMPL_IF NAME="single" -->entry<!-- TMPL_ELSE -->entries<!-- /TMPL_IF -->.
                         <br />Use the "Confirm" button below to confirm deletion.
                      </div>
                     <!-- /TMPL_IF -->
@@ -176,7 +183,6 @@ $(function() {
             <!-- /TMPL_IF --> <!-- /paramsloop -->
 
             <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" ESCAPE="html" --></em></h3>
@@ -223,16 +229,8 @@ $(function() {
                     <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
                     <input type="hidden" name="modifyshelfcontents" value="1" />
                 <!-- /TMPL_IF -->
-                <!-- TMPL_VAR name='pagination_bar'-->
+                <div class="searchresults">
                 <table id="listcontents">
-                  <thead><tr>
-                    <th>&nbsp;</th>
-                    <!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th><!-- /TMPL_UNLESS -->
-                    <th>Title</th>
-                    <th>Author</th>
-                    <th>Year</th>
-                    <th>Location</th>
-                  </tr></thead>
                   <tbody>
                   <!-- TMPL_LOOP NAME="itemsloop" -->
                     <!-- TMPL_UNLESS NAME="__odd__" -->
@@ -250,35 +248,105 @@ $(function() {
                           <!-- TMPL_VAR NAME="description" -->
                         </td>
                     <!-- /TMPL_UNLESS -->
-                        <td><!-- TMPL_IF NAME="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
-                        <!-- TMPL_IF NAME="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                        <td>
+                                <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
+                                <!-- TMPL_ELSE -->
+                                <!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
+                                <!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
+                                <!-- /TMPL_IF -->
+                                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --> <!-- TMPL_LOOP NAME="subtitle"  --><!--TMPL_VAR Name="subfield"--><!--/TMPL_LOOP--></a>
+                                <!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->" title="Search for works by this author" class="author"><!-- TMPL_VAR NAME="author" --></a>
+                                <!-- TMPL_ELSE -->&nbsp;
+                                <!-- /TMPL_IF -->
+        <span class="results_summary"><span class="label">Publication:</span>
+                        <!-- TMPL_IF name="place" --><!-- TMPL_VAR name="place" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> <!-- TMPL_VAR name="publicationyear" -->
+                    <!-- TMPL_ELSE --><!-- TMPL_IF name="copyrightdate" --> <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="pages" -->. <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="notes" -->, <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+                </span>
+                <span class="results_summary"><span class="label">Holdings:</span><!-- TMPL_IF NAME="ITEM_RESULTS" --><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+          <!-- TMPL_VAR NAME="branchname" --><!-- TMPL_IF NAME="location" -->, <!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF -->
+          <!-- TMPL_IF name="itemcallnumber" -->
+        (<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- TMPL_IF NAME="__LAST__" -->.<!-- TMPL_ELSE -->,<!-- /TMPL_IF -->
+          <!-- /TMPL_IF -->
+          <!-- /TMPL_LOOP --><!-- TMPL_ELSE -->This record has no items.<!-- /TMPL_IF --></span>
+
+        <!-- TMPL_IF NAME="TagsEnabled" -->
+                <!-- TMPL_IF NAME="TagsShowOnList" -->
+                <!-- TMPL_IF NAME="TagLoop" -->
+          <div class="results_summary">
+                        <span class="label">Tags:</span>
+                        <ul style="display: inline; list-style: none;"><!-- TMPL_LOOP NAME="TagLoop" --><li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="term" --></a> <span class="weight">(<!-- TMPL_VAR NAME="weight_total" -->)</span></li>
+                            <!-- /TMPL_LOOP -->
+                        </ul>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="TagsInputOnList" -->
+          <!-- TMPL_IF NAME="loggedinusername" -->
+                    <form name="tagform<!-- TMPL_VAR NAME="biblionumber" -->" method="post" action="/cgi-bin/koha/opac-tags.pl">
+                        <label for="newtag<!-- TMPL_VAR NAME="biblionumber" -->">New tag:</label>
+                        <input name="newtag<!-- TMPL_VAR NAME="biblionumber" -->" id="newtag<!-- TMPL_VAR NAME="biblionumber" -->" maxlength="100" />
+                        <input name="tagbutton" class="tagbutton" title="<!-- TMPL_VAR NAME="biblionumber" -->" type="submit" value="Add" />
+                    </form>
+                    <span id="newtag<!-- TMPL_VAR NAME="biblionumber" -->_status" class="tagstatus" style="display:none;">
+                        Tag status here.
+                    </span>
+                    <!-- TMPL_ELSIF NAME="__first__" --><span class="tagstatus" id="login4tags">Log in to add tags.</span>
+                  <!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
+                  <!-- TMPL_IF NAME="TagLoop" -->
+          </div><!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
+
+<span class="results_summary actions"><span class="label">Actions:</span>
+      <!-- TMPL_IF name="RequestOnOpac" -->
+          <!-- TMPL_UNLESS NAME="norequests" -->
+            <!-- TMPL_IF NAME="opacuserlogin" -->
+              <!-- TMPL_IF NAME="AllowOnShelfHolds" -->
+                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- add back when available 0 holds in queue-->
+              <!-- TMPL_ELSE -->
+                <!-- TMPL_IF NAME="itemsissued" -->
+                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- add back when available 0 holds in queue-->
+                <!-- /TMPL_IF -->
+              <!-- /TMPL_IF -->
+            <!-- /TMPL_IF -->
+          <!-- /TMPL_UNLESS -->
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="virtualshelves" --><a class="addtolist" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Save to another list</a>
+          <!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+            <!-- TMPL_IF NAME="opacbookbag" --><a class="addtocart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to Cart</a><!-- tmpl_else -->nocart<!-- /TMPL_IF -->
+        </span>
+
+
+
                     <!-- COinS / OpenURL -->
                           <!-- COinS / OpenURL --><span class="Z3988" title="<!-- TMPL_VAR NAME="coins" -->"></span>
                           <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" --><br/>
                           <div id="newtag<!-- TMPL_VAR NAME="biblionumber">_status" class="tagstatus results_summary" style="display:none">Tag status here.</div><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
                         </td>
-                        <td><!-- TMPL_VAR NAME="author" --></td>
-                        <td>
-                                       <!-- TMPL_IF NAME="publicationyear" -->
-                                               <!-- TMPL_VAR NAME="publicationyear" -->
-                                       <!-- TMPL_ELSE -->
-                                               <!-- TMPL_VAR NAME="copyrightdate" -->
-                                       <!-- /TMPL_IF -->
-                        </td>
-                       <td>
-                           <!-- TMPL_IF NAME="ITEM_RESULTS" --><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-                           <p>
-                           <!-- TMPL_VAR NAME="branchname" --><!-- TMPL_IF NAME="location" -->, <!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF -->
-                           <!-- TMPL_IF name="itemcallnumber" -->
-                               (<!-- TMPL_VAR NAME="itemcallnumber" -->)
-                           <!-- /TMPL_IF -->
-                           </p>
-                           <!-- /TMPL_LOOP --><!-- TMPL_ELSE -->This record has no items.<!-- /TMPL_IF -->
-                       </td>
+          <td>
+          <a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                    <!-- TMPL_IF NAME="OPACAmazonEnabled" --><!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.TZZZZZZZ.jpg" alt="" class="thumbnail" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+          <!-- TMPL_IF NAME="SyndeticsEnabled" --><!-- TMPL_IF NAME="SyndeticsCoverImages" --><!-- TMPL_IF NAME="using_https" -->
+                <img src="https://secure.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;type=xw10&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" class="thumbnail" />
+                <!--TMPL_ELSE -->
+                <img src="http://www.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;type=xw10&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" class="thumbnail" /><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+                <!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                </a>
+                <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR name="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR name="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR name="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR name="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
+        </td>
                       </tr>
                   <!-- /TMPL_LOOP --><!-- /itemsloop -->
                     </tbody>
                   </table>
+                  </div>
+                  <!-- TMPL_IF NAME="pagination_bar" --><div class="pages"><!-- TMPL_VAR name="pagination_bar"--></div><!-- /TMPL_IF -->
                 <!-- 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 -->
@@ -338,14 +406,14 @@ $(function() {
                   <h2>Lists</h2>
                   <ul class="link-tabs">
                   <!-- TMPL_IF NAME="showprivateshelves" -->
-                    <li id="privateshelves_tab" class="on"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Your Lists</a></li>
+                    <li id="privateshelves_tab" class="on"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Your private lists</a></li>
                   <!-- TMPL_ELSE -->
-                    <li id="privateshelves_tab" class="off"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Your Lists</a></li>
+                    <li id="privateshelves_tab" class="off"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Your private lists</a></li>
                   <!-- /TMPL_IF -->
                   <!-- TMPL_IF NAME="showpublicshelves" -->
-                    <li id="publicshelves_tab" class="on"><a href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">Public Lists</a></li>
+                    <li id="publicshelves_tab" class="on"><a href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">Public lists</a></li>
                   <!-- TMPL_ELSE -->
-                    <li id="publicshelves_tab" class="off"><a href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">Public Lists</a></li>
+                    <li id="publicshelves_tab" class="off"><a href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">Public lists</a></li>
                   <!-- /TMPL_IF -->
                   </ul>
                   
@@ -359,12 +427,10 @@ $(function() {
                     <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'-->
                       <table>
                         <tr>
                           <th>List Name</th>
                           <th>Contents</th>
-                          <th>Sort by</th>
                           <th>Type</th>
                           <th>&nbsp;</th>
                         </tr>
@@ -375,9 +441,7 @@ $(function() {
                             <tr>
                           <!-- /TMPL_UNLESS -->
                               <td><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves&amp;viewshelf=<!-- TMPL_VAR NAME="shelf" -->&amp;sortfield=<!-- TMPL_VAR NAME="sortfield" -->"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"  --></a></td>
-                              <td><!-- TMPL_VAR NAME="count" --> item(s)</td>
-                              <td><!-- TMPL_IF NAME="authorsort" -->Author<!-- TMPL_ELSIF NAME="yearsort" -->Year<!-- TMPL_ELSE -->Title<!-- /TMPL_IF -->
-                          </td>
+                              <td><!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --> <!-- TMPL_IF NAME="single" -->item<!-- TMPL_ELSE -->items<!-- /TMPL_IF --><!-- TMPL_ELSE -->Empty<!-- /TMPL_IF --></td>
                               <td>
                                 <!-- TMPL_IF NAME="viewcategory1" -->Private<!-- /TMPL_IF -->
                                 <!-- TMPL_IF NAME="viewcategory2" -->Public<!-- /TMPL_IF -->
@@ -407,6 +471,7 @@ $(function() {
                           </tr>
                         <!-- /TMPL_LOOP -->
                       </table>
+                      <div class="pages"><!-- TMPL_VAR name="pagination_bar"--></div>
                     <!-- TMPL_ELSE -->
                          No Private Lists.
                     <!-- /TMPL_IF --><!-- /shelveslooppriv -->
@@ -429,12 +494,10 @@ $(function() {
                   <div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>
                   <!-- /TMPL_IF -->
                   <!-- TMPL_IF NAME="shelvesloop" -->
-                    <!-- TMPL_VAR name='pagination_bar'-->
                       <table>
                         <tr>
                           <th>List Name</th>
                           <th>Contents</th>
-                          <th>Sort by</th>
                           <th>Type</th><th>&nbsp;</th>
                         </tr>
                     <!-- TMPL_LOOP NAME="shelvesloop" -->
@@ -444,9 +507,7 @@ $(function() {
                         <tr>
                       <!-- /TMPL_UNLESS -->
                           <td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->&amp;sortfield=<!-- TMPL_VAR NAME="sortfield" -->"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"  --></a></td>
-                          <td><!-- TMPL_VAR NAME="count" --> item(s)</td>
-                          <td><!-- TMPL_IF NAME="authorsort" -->Author<!-- TMPL_ELSIF NAME="yearsort" -->Year<!-- TMPL_ELSE -->Title<!-- /TMPL_IF -->
-                          </td>
+                          <td><!-- TMPL_VAR NAME="count" --> <!-- TMPL_IF NAME="single" -->item<!-- TMPL_ELSE -->item(s)<!-- /TMPL_IF --></td>
                           <td>
                             <!-- TMPL_IF NAME="viewcategory1" -->Private<!-- /TMPL_IF -->
                             <!-- TMPL_IF NAME="viewcategory2" -->Public<!-- /TMPL_IF -->
@@ -474,6 +535,7 @@ $(function() {
                         </tr>
                     <!-- /TMPL_LOOP --><!-- /shelvesloop -->
                       </table>
+                  <!-- TMPL_IF NAME="pagination_bar" --><div class="pages"><!-- TMPL_VAR name="pagination_bar"--></div><!-- /TMPL_IF -->
                   <!-- TMPL_ELSE --><!-- /shelvesloop -->
                     <!-- TMPL_IF NAME="showpublicshelves" -->No Public Lists.<!-- /TMPL_IF -->
                   <!-- /TMPL_IF --><!-- /shelvesloop -->