Bugzilla – Attachment 3117 Details for
Bug 5729
Add coins information to the intranet
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed Patch
0001-Bug-5729-Add-Coins-support-to-intranet.patch (text/plain), 8.37 KB, created by
Chris Cormack
on 2011-02-10 01:23:03 UTC
(
hide
)
Description:
Proposed Patch
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-02-10 01:23:03 UTC
Size:
8.37 KB
patch
obsolete
>From 08824411d82fd0aee8d7ee4189787c7d4162fafc Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Thu, 10 Feb 2011 14:22:11 +1300 >Subject: [PATCH] Bug 5729 : Add Coins support to intranet > >Squashed commit of the following: > >commit dafc48a6e59156b82c2b5bda53bf27c909637916 >Author: Chris Cormack <chrisc@catalyst.net.nz> >Date: Thu Feb 10 14:21:17 2011 +1300 > > Bug 5729 : Fixing copyright and FSF address > >commit eac555b0e4e5de39fb2ee7460e4bda59eb818ee0 >Author: Paul Poulain <paul.poulain@biblibre.com> >Date: Tue Dec 14 21:01:55 2010 +0100 > > Bug 5729 : MT4588: Adds coins informations to intranet > > (written by Matthias Meusburger) >--- > catalogue/ISBDdetail.pl | 1 + > catalogue/MARCdetail.pl | 8 ++- > catalogue/detail.pl | 2 + > .../prog/en/modules/catalogue/ISBDdetail.tmpl | 6 +++ > .../prog/en/modules/catalogue/MARCdetail.tmpl | 44 ++++++++++++++++++- > .../prog/en/modules/catalogue/detail.tmpl | 6 +++ > 6 files changed, 61 insertions(+), 6 deletions(-) > >diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl >index 7ebe8e0..3a4fdc8 100755 >--- a/catalogue/ISBDdetail.pl >+++ b/catalogue/ISBDdetail.pl >@@ -90,6 +90,7 @@ $template->param ( > isbdview => 1, > z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)), > C4::Search::enabled_staff_search_views, >+ ocoins => GetCOinSBiblio($biblionumber), > ); > > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl >index 2dc7b1d..d26ca53 100755 >--- a/catalogue/MARCdetail.pl >+++ b/catalogue/MARCdetail.pl >@@ -1,6 +1,7 @@ > #!/usr/bin/perl > > # Copyright 2000-2002 Katipo Communications >+# Parts Copyright Biblibre 2010 > # > # This file is part of Koha. > # >@@ -14,7 +15,7 @@ > # A PARTICULAR PURPOSE. See the GNU General Public License for more details. > # > # You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >+# with this program; if not, write to the Free Software Foundation, Inc., > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > =head1 NAME >@@ -43,7 +44,6 @@ the items attached to the biblio > =cut > > use strict; >-#use warnings; FIXME - Bug 2505 > > use C4::Auth; > use C4::Context; >@@ -84,6 +84,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > } > ); > >+$template->param( ocoins => GetCOinSBiblio($biblionumber) ); >+ > #count of item linked > my $itemcount = GetItemsCount($biblionumber); > $template->param( count => $itemcount, >@@ -118,7 +120,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) { > > # deal with leader > unless ( $tagslib->{'000'}->{'@'}->{tab} ne $tabloop ) >- { # or ($tagslib->{'000'}->{'@'}->{hidden} =~ /-7|-4|-3|-2|2|3|5|8/ )) { >+ { # > my %subfield_data; > $subfield_data{marc_lib} = $tagslib->{'000'}->{'@'}->{lib}; > $subfield_data{marc_value} = $record->leader(); >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index 6ee79e6..63b3975 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -65,6 +65,8 @@ if (C4::Context->preference("XSLTDetailsDisplay") ) { > } > > $template->param( 'SpineLabelShowPrintOnBibDetails' => C4::Context->preference("SpineLabelShowPrintOnBibDetails") ); >+$template->param( ocoins => GetCOinSBiblio($biblionumber) ); >+ > > # some useful variables for enhanced content; > # in each case, we're grabbing the first value we find in >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl >index 1516268..af16cea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl >@@ -16,6 +16,12 @@ > <div class="yui-b"> > <!-- TMPL_INCLUDE NAME="cat-toolbar.inc" --> > >+ <!-- TMPL_IF NAME="ocoins" --> >+ <!-- COinS / OpenURL --> >+ <span class="Z3988" title="<!-- TMPL_VAR NAME="ocoins" -->"></span> >+ <!-- /TMPL_IF --> >+ >+ > <div id="catalogue_ISBDdetail"> > <!-- TMPL_VAR NAME="ISBD" --> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >index 1e9c1a6..5f1b550 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl >@@ -1,6 +1,21 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> > <title>Koha › Catalog › MARC Details for <!-- TMPL_VAR NAME="bibliotitle" --></title> > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> >+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >+<script type="text/javascript" id="js">$(document).ready(function() { >+ $("#table_MARCdetail").tablesorter({ >+ sortList: [[0,0]] >+ }).tablesorterPager({container: $("#pagertable_MARCdetail"),positionFixed: false,size: 20}); >+}); </script> >+<style type="text/css"> >+@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */ >+ .ui-tabs-hide { >+ display: block; >+ } >+} >+ul.ui-tabs-nav {display:none;} >+</style> > <script type="text/javascript"> > //<![CDATA[ > >@@ -43,6 +58,11 @@ function Changefwk(FwkList) { > <!-- /TMPL_LOOP --> > </select> </b></p> > >+ <!-- TMPL_IF NAME="ocoins" --> >+ <!-- COinS / OpenURL --> >+ <span class="Z3988" title="<!-- TMPL_VAR NAME="ocoins" -->"></span> >+ <!-- /TMPL_IF --> >+ > <div id="bibliotabs" class="toptabs numbered"> > <ul> > <!-- TMPL_IF name="zeroXX" --> >@@ -381,14 +401,32 @@ function Changefwk(FwkList) { > > <!-- TMPL_IF name="tenXX" --> > <div id="tab10XX"> >- <table> >- <tr> >+ <span id="pagertable_MARCdetail" class="pager"> >+ <form class="formpager"> <strong>page(s)</strong> : >+ <img src="<!-- TMPL_VAR name="interface" -->/prog/img/first.png" class="first"/> >+ <img src="<!-- TMPL_VAR name="interface" -->/prog/img/prev.png" class="prev"/> >+ <input type="text" size="5" class="pagedisplay"/> >+ <img src="<!-- TMPL_VAR name="interface" -->/prog/img/next.png" class="next"/> >+ <img src="<!-- TMPL_VAR name="interface" -->/prog/img/last.png" class="last"/> >+ , entries/page : >+ <select class="pagesize"> >+ <option value="10">10</option> >+ <option selected="selected" value="20">20</option> >+ <option value="30">30</option> >+ <option value="40">40</option> >+ <option value="50">50</option> >+ <option value="100">100</option> >+ </select> >+ </form> >+</span> >+ <table id="table_MARCdetail"> >+ <thead> > <!-- TMPL_LOOP NAME="item_header_loop" --> > <th> > <!-- TMPL_VAR NAME="header_value" --> > </th> > <!-- /TMPL_LOOP --> >- </tr> >+ </thead> > <!-- TMPL_LOOP NAME="item_loop" --> > <tr> > <!-- TMPL_VAR NAME="item_value" --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >index 8f53e80..0fcde98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >@@ -146,6 +146,12 @@ function verify_images() { > <!-- TMPL_IF NAME="AmazonEnabled" --><!-- TMPL_IF NAME="AmazonCoverImages" --><div class="yui-u" id="bookcoverimg"> > <a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="" /></a></div><!-- /TMPL_IF --><!-- /TMPL_IF --> > >+ <!-- TMPL_IF NAME="ocoins" --> >+ <!-- COinS / OpenURL --> >+ <span class="Z3988" title="<!-- TMPL_VAR NAME="ocoins" -->"></span> >+ <!-- /TMPL_IF --> >+ >+ > <div class="yui-u" style="margin-top: 1em;"> > <ul> > <!-- TMPL_IF NAME="MARCISBNS" --> >-- >1.7.1 >
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 5729
:
3117
|
5379
|
5610
|
6796
|
6914