[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha koha-tmpl/opac-tmpl/prog/en/opac-shelves.t... [rel_3_0]
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha koha-tmpl/opac-tmpl/prog/en/opac-shelves.t... [rel_3_0] |
|
Date: |
Fri, 15 Dec 2006 17:43:24 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/15 17:43:24
Modified files:
koha-tmpl/opac-tmpl/prog/en: opac-shelves.tmpl
opac : opac-detailprint.pl opac-shelves.pl
Log message:
sync with intranet.
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.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detailprint.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.5&r2=1.3.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.8&r2=1.8.2.9
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.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl 14 Dec 2006 17:59:17
-0000 1.1.2.6
+++ koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl 15 Dec 2006 17:43:24
-0000 1.1.2.7
@@ -8,25 +8,36 @@
<h3>Contents of <!-- TMPL_VAR Name="shelfname" --></h3>
+<a class="button" href="/cgi-bin/koha/opac-shelves.pl">Back to Virtual
Shelves</a>
+
+<!-- TMPL_IF name="manageshelf" -->
+ | <a class="button" href="/cgi-bin/koha/opac-shelves.pl?op=modif&shelf=<!--
TMPL_VAR Name="shelfnumber" -->">
+ Modify this Shelf</a>
+<!-- /TMPL_IF -->
+
<form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post"
name="mainform">
+ <!-- TMPL_IF NAME="itemsloop" -->
<table>
+ <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR
Name="shelfnumber" -->" />
+ <input type="hidden" name="modifyshelfcontents" value="1" />
<tr>
<th>
- <a href="/cgi-bin/koha/opac-shelves.pl"
onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang"
-->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check
All" border="0" /></a></th><th> </th><th>Title</th><th>Author</th><th>Call
No.
- </th>
- <!-- TMPL_UNLESS NAME="itemsloop" -->
- <th>
-
+ <a href="/cgi-bin/koha/opac-shelves.pl"
onclick="CheckAll(); return false;">Check All</a>
</th>
- <!-- /TMPL_UNLESS -->
+ <th> </th>
+ <th>Title</th>
+ <th>Author</th>
+ <th>Call No.</th>
+ <th> </th>
</tr>
- <!-- TMPL_IF NAME="itemsloop" -->
<!-- TMPL_LOOP Name="itemsloop" -->
<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF
-->>
- <td><input type="checkbox" name="REM-<!-- TMPL_VAR
Name="itemnumber" -->" /><input type="hidden" name="shelfnumber" value="<!--
TMPL_VAR Name="shelfnumber" -->" />
- <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>
+ <input type="checkbox" name="REM-<!-- TMPL_VAR
Name="itemnumber" -->" />
+ </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>
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a class="title"
href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
@@ -47,12 +58,40 @@
</td>
<td><!-- TMPL_VAR Name="author" --></td>
<td><!-- TMPL_VAR NAME="classification" --></td>
- </tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
- <tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS
NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR
NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1"
/><input type="submit" class="icon delete" value="Delete this Shelf"
onclick="return confirmDelete('Are you sure you want to delete this shelf?')"
/></td><!-- /TMPL_UNLESS --></tr>
- <!-- /TMPL_IF -->
+ <td>
+ <a href="javascript:addRecord('<!-- TMPL_VAR
NAME="biblionumber" -->');">
+ Add to my basket
+ </a>
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
</table>
- <!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input
type="submit" value="Remove Selected Items" class="icon delete" onclick="return
confirmDelete('Are you sure you want to remove these items from the shelf?')"
/><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" -->
<form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input
type="hidden" name="op" value="modif" /><input type="hidden" value="<!--
TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit"
value="Modify this Shelf" class="icon edit" /></form>
-<br /><br />
+ <!-- TMPL_ELSE -->
+ <br />
+ <b>This shelf is empty.</b>
+ <!-- TMPL_UNLESS NAME="itemsloop" -->
+ <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" />
+ <input type="hidden" name="shelves" value="1" />
+ <input type="submit" class="icon delete"
+ value="Delete this Shelf"
+ onclick="return confirmDelete('Are you sure you want to delete
this shelf?')" />
+ <!-- /TMPL_UNLESS -->
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="manageshelf" -->
+ <!-- TMPL_IF NAME="itemsloop" -->
+ <b>With selected items :</b>
+ <input type="submit"
+ value="Remove"
+ class="icon delete"
+ onclick="return confirmDelete('Are you sure you want to
remove these items from the shelf?')"
+ style="display:inline;"
+ />
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+</form>
+ <!-- TMPL_IF name="manageshelf" -->
+
+<br />
<form action="/cgi-bin/koha/opac-shelves.pl" method="post">
<table>
<tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
@@ -62,7 +101,6 @@
</td>
<td>
<input name="addbarcode" type="text" id="addbarcode" size="14"
maxlength="14" />
- <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR
Name="shelfnumber" -->" />
<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR
Name="shelfnumber" -->" />
<input type="hidden" name="modifyshelfcontents" value="1" />
<input type="submit" value="Save" />
@@ -71,7 +109,6 @@
</table>
</form>
<!-- /TMPL_IF -->
-<form class="inline" method="get" action="opac-shelves.pl"><input
type="submit" value="Back to Virtual Shelves" /></form>
<!-- TMPL_ELSE -->
<!-- TMPL_IF Name="shelves" -->
<!-- TMPL_IF Name="status1" -->
Index: opac/opac-detailprint.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detailprint.pl,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -b -r1.3.2.5 -r1.3.2.6
--- opac/opac-detailprint.pl 8 Dec 2006 17:55:45 -0000 1.3.2.5
+++ opac/opac-detailprint.pl 15 Dec 2006 17:43:24 -0000 1.3.2.6
@@ -18,7 +18,6 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-use HTML::Template;
use strict;
require Exporter;
use C4::Context;
Index: opac/opac-shelves.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.8.2.8
retrieving revision 1.8.2.9
diff -u -b -r1.8.2.8 -r1.8.2.9
--- opac/opac-shelves.pl 14 Dec 2006 17:59:17 -0000 1.8.2.8
+++ opac/opac-shelves.pl 15 Dec 2006 17:43:24 -0000 1.8.2.9
@@ -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.8 2006/12/14 17:59:17 toins Exp $
+# $Id: opac-shelves.pl,v 1.8.2.9 2006/12/15 17:43:24 toins Exp $
=head1 NAME
@@ -84,7 +84,7 @@
);
if ( $query->param('modifyshelfcontents') ) {
- my $shelfnumber = $query->param('shelfnumber');
+ my $shelfnumber = $query->param('viewshelf');
my $barcode = $query->param('addbarcode');
my ($item) = getiteminformation( 0, $barcode );
if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ) ) {
@@ -125,7 +125,18 @@
last SWITCH;
}
if ( $query->param('viewshelf') ) {
- DisplayShelf(
$query->param('viewshelf'),$shelflist,$query,$template,$loggedinuser );
+ #check that the user can view the shelf
+ my $shelfnumber = $query->param('viewshelf');
+ if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) {
+ my $items = GetShelfContents($shelfnumber);
+ $template->param(
+ shelfname => $shelflist->{$shelfnumber}->{'shelfname'},
+ shelfnumber => $shelfnumber,
+ viewshelf => $query->param('viewshelf'),
+ manageshelf => &ShelfPossibleAction( $loggedinuser,
$shelfnumber, 'manage' ),
+ itemsloop => $items,
+ );
+ }
last SWITCH;
}
if ( $query->param('shelves') ) {
@@ -220,6 +231,9 @@
#
# $Log: opac-shelves.pl,v $
+# Revision 1.8.2.9 2006/12/15 17:43:24 toins
+# sync with intranet.
+#
# Revision 1.8.2.8 2006/12/14 17:59:17 toins
# add the link to "BiblioDefaultView systempref" and not to opac-detail.pl
#