Bugzilla – Attachment 2960 Details for
Bug 3347
Inconsistencies with tables in opac-shelves.tmpl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix for 3.2.x
0001-3.2.x-Fix-for-Bug-3347-Inconsistencies-with-tables-i.patch (text/plain), 32.96 KB, created by
Owen Leonard
on 2011-01-06 18:56:36 UTC
(
hide
)
Description:
Proposed fix for 3.2.x
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2011-01-06 18:56:36 UTC
Size:
32.96 KB
patch
obsolete
>From 1f8e93c03734961617f5bea5f4b3179ea769d92b Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 22 Sep 2010 15:33:20 -0400 >Subject: [PATCH] [3.2.x] Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl >Content-Type: text/plain; charset="utf-8" > >Changes to list contents view to make it consistent with search results > >My intention is to make the OPAC more consistent in the way it displays >lists of items, whether it be in search results, lists, etc. This patch >adds data to the list contents output and reformats it to that end. > >The other significant change is the removal of jQuery table sorting. >Since list contents are both sorted and paginated on the server >side. Adding a client-side sort to one page of many doesn't make sense. > >Other changes include: > >- Change "Your lists" to "Your private lists" >- Remove "sort by" column because it seems unnecessary >- Adding logic to control display of count (item or items > rather than item(s) >- Styling pagination bar and placing at the bottom of the page, > consistent with other instances of pagination navigation >--- > C4/VirtualShelves.pm | 3 +- > C4/VirtualShelves/Page.pm | 34 +++- > koha-tmpl/opac-tmpl/prog/en/css/opac.css | 53 ++---- > .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 190 +++++++++++++------- > koha-tmpl/opac-tmpl/prog/images/download.png | Bin 369 -> 425 bytes > 5 files changed, 170 insertions(+), 110 deletions(-) > >diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm >index 61dbacc..77ae394 100644 >--- a/C4/VirtualShelves.pm >+++ b/C4/VirtualShelves.pm >@@ -125,6 +125,7 @@ sub GetShelves ($$$$) { > $firstname, $category, $sortfield, $count ) = $sth2->fetchrow ) { > $shelflist{$shelfnumber}->{'shelfname'} = $shelfname; > $shelflist{$shelfnumber}->{'count'} = $count; >+ if($count eq 1){ $shelflist{$shelfnumber}->{'single'} = 1; } > $shelflist{$shelfnumber}->{'sortfield'} = $sortfield; > $shelflist{$shelfnumber}->{'category'} = $category; > $shelflist{$shelfnumber}->{'owner'} = $owner; >@@ -265,7 +266,7 @@ sub GetShelfContents ($;$$$) { > } > my $query = > " SELECT vc.biblionumber, vc.shelfnumber, vc.dateadded, itemtypes.*, >- biblio.*, biblioitems.itemtype, biblioitems.publicationyear >+ biblio.*, biblioitems.itemtype, biblioitems.publicationyear, biblioitems.publishercode, biblioitems.place, biblioitems.size, biblioitems.pages > FROM virtualshelfcontents vc > LEFT JOIN biblio ON vc.biblionumber = biblio.biblionumber > LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber >diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm >index 80d8f3c..d6d0f7f 100644 >--- a/C4/VirtualShelves/Page.pm >+++ b/C4/VirtualShelves/Page.pm >@@ -31,6 +31,7 @@ use C4::Auth qw/get_session/; > use C4::Members; > use C4::Output; > use C4::Dates qw/format_date/; >+use C4::Tags qw(get_tags); > use Exporter; > use Data::Dumper; > use C4::Csv; >@@ -61,6 +62,7 @@ sub shelfpage ($$$$$) { > my $itemoff = ( $query->param('itemoff') ? $query->param('itemoff') : 1 ); > my $displaymode = ( $query->param('display') ? $query->param('display') : 'publicshelves' ); > my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset ); >+ my $marcflavour = C4::Context->preference("marcflavour"); > > # FIXME: These limits should not be hardcoded... > $shelflimit = 20; # Limits number of items returned for a given query >@@ -177,19 +179,20 @@ sub shelfpage ($$$$$) { > # explicitly fetch this shelf > my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber); > >+ $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') ); >+ if (C4::Context->preference('TagsEnabled')) { >+ $template->param(TagsEnabled => 1); >+ foreach (qw(TagsShowOnList TagsInputOnList)) { >+ C4::Context->preference($_) and $template->param($_ => 1); >+ } >+ } > #check that the user can view the shelf > if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) { > my $items; > my $authorsort; > my $yearsort; >- my $sortfield; >- if ( $query->param('sortfield')) { >- $sortfield = $query->param('sortfield'); >- } elsif ($sorton) { >- $sortfield = $sorton; >- } else { >- $sortfield = 'title'; >- } >+ my $tag_quantity; >+ my $sortfield = ( $query->param('sortfield') ? $query->param('sortfield') : 'title' ); > if ( $sortfield eq 'author' ) { > $authorsort = 'author'; > } >@@ -208,11 +211,22 @@ sub shelfpage ($$$$$) { > $this_item->{'imageurl'} = getitemtypeinfo( $this_item->{'itemtype'} )->{'imageurl'}; > $this_item->{'coins'} = GetCOinSBiblio( $this_item->{'biblionumber'} ); > $this_item->{'subtitle'} = GetRecordValue('subtitle', $record, GetFrameworkCode($this_item->{'biblionumber'})); >- >+ $this_item->{'normalized_upc'} = GetNormalizedUPC( $record,$marcflavour); >+ $this_item->{'normalized_ean'} = GetNormalizedEAN( $record,$marcflavour); >+ $this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber($record,$marcflavour); >+ $this_item->{'normalized_isbn'} = GetNormalizedISBN(undef,$record,$marcflavour); > # Getting items infos for location display > my @items_infos = &GetItemsInfo( $this_item->{'biblionumber'}, $type ); >+ $this_item->{'itemsissued'} = CountItemsIssued( $this_item->{'biblionumber'} ); > $this_item->{'ITEM_RESULTS'} = \@items_infos; > >+ if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnList')) { >+ $this_item->{'TagLoop'} = get_tags({ >+ biblionumber=>$this_item->{'biblionumber'}, approved=>1, 'sort'=>'-weight', >+ limit=>$tag_quantity >+ }); >+ } >+ > } > push @paramsloop, { display => 'privateshelves' } if $category == 1; > $showadd = 1; >@@ -265,7 +279,7 @@ sub shelfpage ($$$$$) { > if ( my $count = scalar @$contents ) { > unless ( scalar grep { /^CONFIRM-$number$/ } $query->param() ) { > if ( defined $shelflist->{$number} ) { >- push( @paramsloop, { need_confirm => $shelflist->{$number}->{shelfname}, count => $count } ); >+ push( @paramsloop, { need_confirm => $shelflist->{$number}->{shelfname}, count => $count, single => ($count eq 1 ? 1:0) } ); > $shelflist->{$number}->{confirm} = $number; > } else { > push( @paramsloop, { need_confirm => $privshelflist->{$number}->{shelfname}, count => $count } ); >diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css >index 2c456cd..430ec18 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css >+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css >@@ -443,6 +443,14 @@ a .term { > > /* toolbar buttons */ > >+#toolbar { >+background-color:#EEEEEE; >+border:1px solid #E8E8E8; >+margin : .5em 0; >+padding:3px 3px 5px 5px; >+vertical-align:middle; >+} >+ > #toolbar a, > #toolbar input { > white-space : nowrap; >@@ -1092,38 +1100,9 @@ td.resultscontrol img { > line-height : 1.8em; > text-align: center; > } >-a:link.current { >- background-color: transparent; >- color: #3366CC; >- font-weight: bold; >- padding: 1px 5px 1px 5px; >- text-decoration: none; >-} >-a:visited.current { >- background-color: transparent; >- color: #3366CC; >- font-weight: bold; >- padding: 1px 5px 1px 5px; >- text-decoration: none; >-} >- >-a:hover.current { >- background-color: #CCFF00; >- color: #CC3333; >- font-weight: bold; >- padding: 1px 5px 1px 5px; >- text-decoration: none; >-} >- >-a:active.current { >- background-color: #99CC00; >- color: #FFFF99; >- font-weight: bold; >- padding: 1px 5px 1px 5px; >- text-decoration: none; >-} > >-.current { >+.current, >+.currentPage { > background-color: #FFFFFF; > color: #3366CC; > font-weight: bold; >@@ -1131,7 +1110,8 @@ a:active.current { > text-decoration: none; > } > >-a:link.nav { >+a:link.nav, >+div.pages a:link { > background-color: #EEE; > border: 1px solid #CCCC99; > color: #3366CC; >@@ -1140,7 +1120,8 @@ a:link.nav { > text-decoration: none; > } > >-a:visited.nav { >+a:visited.nav, >+div.pages a:visited { > background-color: #EEE; > border: 1px solid #CCCC99; > color: #3366CC; >@@ -1149,7 +1130,8 @@ a:visited.nav { > text-decoration: none; > } > >-a:hover.nav { >+a:hover.nav, >+div.pages a:hover { > background-color: #FFFFCC; > border: 1px solid #CCCC99; > color: #CC3333; >@@ -1158,7 +1140,8 @@ a:hover.nav { > text-decoration: none; > } > >-a:active.nav { >+a:active.nav, >+div.pages a:active { > background-color: #FFFFCC; > border: 1px solid #CCCC99; > color: #D25500; >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 7013a1c..3c04429 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl >@@ -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=">" 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> </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 --> >+ <!-- /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" -->&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&client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&type=xw10&upc=<!-- TMPL_VAR NAME="normalized_upc" -->&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&client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&type=xw10&upc=<!-- TMPL_VAR NAME="normalized_upc" -->&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 & 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> </th> > </tr> >@@ -375,9 +441,7 @@ $(function() { > <tr> > <!-- /TMPL_UNLESS --> > <td><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves&viewshelf=<!-- TMPL_VAR NAME="shelf" -->&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> </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" -->&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 --> >diff --git a/koha-tmpl/opac-tmpl/prog/images/download.png b/koha-tmpl/opac-tmpl/prog/images/download.png >index bf1394d0c3a442ff33170c608aabe262ce0851c5..0d5bcb89a59037437ffceaa95099057b805c46b3 100644 >GIT binary patch >delta 345 >zcmey!w32y3WPL?|Pl&6cfBn~A{}lb}mL9yT6xgJjFtKj-_OIVAzWDT4Ewr_6*7o0j >z|7*weKKk(I{kMO52@^xAm+UzI%pq^i|NsA=fBLH((-%^+<i)2y`bkrj0~_u0=Dz#( >zS2eU%Bckiww|}akZSuY~JxljpeE21^dtGMFx_hs_+k^FX8r91jWME*>C<*cl2AV|- >zVA!`xPXef?+0(@_q~camKzMj~Kmfxe2F4={M|=(`2q`o;L`<5^>cPY!(7dZ>kImve >zJj<;d7z|gOKK1dWr}ybq%q#){)7)E}V?ttOgA^Jhu84|8R{j(fy~@bc(dZi*8p_nM >zlYyzj(bZLwBXr7Cps1rmXRN2E=Y&Wekn$^6mb5HsP;qErWT<uE&h^bI1o?r%)78&q >Iol`;+0JCJV9{>OV > >delta 289 >zcmV++0p9+p1MvcoS$}m<OjJex|Nmiysy%F*(Bbouslg>xhTQ4)A5DBHSc*MtoF!F- >z-0Ao3_WgL4v`%-S?)LuO>Gq<(+xz|h=<@t8VwFB@o9OcWBT<3%`u^|s{vuI=VTGwC >zRfXd4{Pp(GD_o5sPk$?1j<wC^=kon7V393gks(ihtsVXs0Dk}gf=NU{RCwBAU|?Wi >zXJ-eJ009I-Y77cM5+Hy;NL)w?NCE^90|OT;s{|{T3<E#_F)(oOOY-yZa4-M_5KvfN >zSxi`wfdL?Z7#LVsRAp6ISQr2Th=G?)fK7y(n~fJBfEXCTK$?*eAb=S7nB|z6nUw_j >n00M}CiHV6*lo}IA0t6TUwx<J(T=?PG00000NkvXXu0mjf0Q`c& > >-- >1.7.0.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 3347
:
1228
|
2944
|
2945
| 2960