[Koha-cvs] koha koha-tmpl/opac-tmpl/prog/en/opac-shelves.t... [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Thu Dec 14 18:59:17 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/14 17:59:17
Modified files:
koha-tmpl/opac-tmpl/prog/en: opac-shelves.tmpl
opac : opac-shelves.pl
Log message:
add the link to "BiblioDefaultView systempref" and not to opac-detail.pl
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-shelves.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.7&r2=1.8.2.8
Patches:
Index: koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl 14 Dec 2006 17:22:55 -0000 1.1.2.5
+++ koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl 14 Dec 2006 17:59:17 -0000 1.1.2.6
@@ -27,7 +27,24 @@
<input type="hidden" name="modifyshelfcontents" value="1" />
<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /></td>
<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
- <td><a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
+ <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" --> <!-- TMPL_VAR NAME="subtitle" -->
+ </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" --> <!-- TMPL_VAR NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+ </a>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ </a>
+ </td>
<td><!-- TMPL_VAR Name="author" --></td>
<td><!-- TMPL_VAR NAME="classification" --></td>
</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
Index: opac/opac-shelves.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.8.2.7
retrieving revision 1.8.2.8
diff -u -b -r1.8.2.7 -r1.8.2.8
--- opac/opac-shelves.pl 14 Dec 2006 17:22:55 -0000 1.8.2.7
+++ opac/opac-shelves.pl 14 Dec 2006 17:59:17 -0000 1.8.2.8
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-shelves.pl,v 1.8.2.7 2006/12/14 17:22:55 toins Exp $
+# $Id: opac-shelves.pl,v 1.8.2.8 2006/12/14 17:59:17 toins Exp $
=head1 NAME
@@ -211,65 +211,18 @@
C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
+ "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
);
output_html_with_http_headers $query, $cookie, $template->output;
-sub shelves {
- my $innertemplate = shift;
- if ( my $newshelf = $query->param('addshelf') ) {
- my $shelfnumber = AddShelf(
- $newshelf,
- $query->param('owner'),
- $query->param('category')
- );
-
- if ( $shelfnumber == -1 ) { #shelf already exists.
- $template->param(
- {
- shelfnumber => $shelfnumber,
- already => 1
- }
- );
- }
- }
- my @paramsloop;
- foreach ( $query->param() ) {
- my %line;
- if (/DEL-(\d+)/) {
- my $delshelf = $1;
- my ( $status, $count ) = DelShelf($delshelf);
- if ($status) {
- $line{'status'} = $status;
- $line{'count'} = $count;
- }
- }
-
- #if the shelf is not deleted, %line points on null
- push( @paramsloop, \%line );
- }
- $innertemplate->param( paramsloop => \@paramsloop );
- my ($shelflist) = GetShelves( $loggedinuser, 2 );
- my $color = '';
- my @shelvesloop;
- foreach my $element ( sort keys %$shelflist ) {
- my %line;
- ( $color eq 1 ) ? ( $color = 0 ) : ( $color = 1 );
- $line{'toggle'} = $color;
- $line{'shelf'} = $element;
- $line{'shelfname'} = $shelflist->{$element}->{'shelfname'};
- $line{'shelfbookcount'} = $shelflist->{$element}->{'count'};
- push( @shelvesloop, \%line );
- }
- $innertemplate->param(
- shelvesloop => \@shelvesloop,
- shelves => 1,
- );
-}
#
# $Log: opac-shelves.pl,v $
+# Revision 1.8.2.8 2006/12/14 17:59:17 toins
+# add the link to "BiblioDefaultView systempref" and not to opac-detail.pl
+#
# Revision 1.8.2.7 2006/12/14 17:22:55 toins
# bookshelves work perfectly with mod_perl and are cleaned.
#
More information about the Koha-cvs
mailing list