[Koha-cvs] koha C4/Review.pm koha-tmpl/opac-tmpl/prog/en/o... [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Thu Dec 7 19:09:01 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/07 18:09:01
Modified files:
C4 : Review.pm
koha-tmpl/opac-tmpl/prog/en: opac-main.tmpl
opac : opac-reserve.pl opac-review.pl
opac-sendbasket.pl opac-showreviews.pl
Added files:
koha-tmpl/opac-tmpl/prog/en: opac-review.tmpl
opac-showreviews.tmpl
Log message:
review is now available on opac on rel_3_0.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Review.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.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/koha-tmpl/opac-tmpl/prog/en/opac-review.tmpl?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-showreviews.tmpl?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.29.2.6&r2=1.29.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-review.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-sendbasket.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.10.2.5&r2=1.10.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-showreviews.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.4&r2=1.2.2.5
Patches:
Index: C4/Review.pm
===================================================================
RCS file: /sources/koha/koha/C4/Review.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- C4/Review.pm 17 Jun 2006 22:28:24 -0000 1.3
+++ C4/Review.pm 7 Dec 2006 18:09:01 -0000 1.3.2.1
@@ -23,7 +23,8 @@
use vars qw($VERSION @ISA @EXPORT);
-$VERSION = 0.01;
+# set the version for version checking
+$VERSION = do { my @v = '$Revision: 1.3.2.1 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -47,8 +48,6 @@
=head1 FUNCTIONS
-=over 2
-
=cut
@ISA = qw(Exporter);
@@ -99,7 +98,6 @@
my $sth = $dbh->prepare($query);
$sth->execute( $review, 0, $borrowernumber, $biblionumber );
$sth->finish();
-
}
sub numberofreviews {
@@ -151,7 +149,6 @@
Takes a reviewid and marks that review approved
-
=cut
sub approvereview {
@@ -171,7 +168,6 @@
Takes a reviewid and deletes it
-
=cut
sub deletereview {
@@ -187,8 +183,6 @@
1;
__END__
-=back
-
=head1 AUTHOR
Koha Team
Index: koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.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-main.tmpl 7 Dec 2006 16:34:50 -0000 1.1.2.6
+++ koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl 7 Dec 2006 18:09:01 -0000 1.1.2.7
@@ -25,25 +25,6 @@
</form>
</div>
-<div id="opac-main-recent">
- <h3>Recent acquisitions</h3>
- <form action="/cgi-bin/koha/opac-search.pl">
- <p>
- <!-- TMPL_VAR name="CGIitemtype" --><input type="hidden" name="marclist" value="biblioitems.itemtype" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="=" />
- <input type="hidden" name="op" value="do_search" />
- <input type="hidden" name="type" value="opac" />
- <input type="hidden" name="orderby" value="biblio.timestamp" />
- <input type="hidden" name="desc_or_asc" value="desc" />
- acquired in the last
- <input type="text" name="desc_or_asc" size="3" value="30" />
- days
- <input type="submit" value="Search" class="submit" />
- </p>
- </form>
-</div>
<!-- TMPL_IF NAME="opaclanguagesdisplay" -->
<div class="content-block">
<h4 class="inline">Change Language:</h3>
Index: opac/opac-reserve.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -b -r1.29.2.6 -r1.29.2.7
--- opac/opac-reserve.pl 7 Dec 2006 15:42:15 -0000 1.29.2.6
+++ opac/opac-reserve.pl 7 Dec 2006 18:09:01 -0000 1.29.2.7
@@ -24,7 +24,6 @@
use C4::Circulation::Circ2;
use C4::Reserves2;
use C4::Interface::CGI::Output;
-use HTML::Template;
use C4::Date;
use C4::Context;
Index: opac/opac-review.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-review.pl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- opac/opac-review.pl 5 Dec 2006 11:35:31 -0000 1.2.2.2
+++ opac/opac-review.pl 7 Dec 2006 18:09:01 -0000 1.2.2.3
@@ -23,7 +23,6 @@
use C4::Auth;
use C4::Koha;
-use HTML::Template;
use C4::Interface::CGI::Output;
use C4::Circulation::Circ2;
use C4::Review;
@@ -38,16 +37,10 @@
template_name => "opac-review.tmpl",
query => $query,
type => "opac",
- authnotrequired => 0,
- flagsrequired => { borrow => 1 },
- debug => 1,
+ authnotrequired => 1,
}
);
-# get borrower information ....
-# my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-# $template->param($borr);
-
my $biblio = GetBiblioData( $biblionumber, 'opac' );
my $savedreview = getreview( $biblionumber, $borrowernumber );
@@ -87,3 +80,4 @@
}
output_html_with_http_headers $query, $cookie, $template->output;
+
Index: opac/opac-sendbasket.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -b -r1.10.2.5 -r1.10.2.6
--- opac/opac-sendbasket.pl 7 Dec 2006 15:42:15 -0000 1.10.2.5
+++ opac/opac-sendbasket.pl 7 Dec 2006 18:09:01 -0000 1.10.2.6
@@ -74,7 +74,7 @@
GetMarcAuthors( $record, C4::Context->preference("marcflavour") );
my $authorcount = scalar @$addauthor;
- my @items = &ItemInfo( undef, $biblionumber, 'opac' );
+ my @items = &GetItemsInfo( $biblionumber, 'opac' );
$dat->{'additional'} = "";
foreach (@$addauthor) {
Index: opac/opac-showreviews.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-showreviews.pl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -b -r1.2.2.4 -r1.2.2.5
--- opac/opac-showreviews.pl 7 Dec 2006 15:42:15 -0000 1.2.2.4
+++ opac/opac-showreviews.pl 7 Dec 2006 18:09:01 -0000 1.2.2.5
@@ -21,7 +21,6 @@
use C4::Auth;
use C4::Koha;
-use HTML::Template;
use C4::Interface::CGI::Output;
use C4::Circulation::Circ2;
use C4::Review;
@@ -30,23 +29,21 @@
my $query = new CGI;
my $biblionumber = $query->param('biblionumber');
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+my ( $template, $borrowernumber, $cookie ) = &get_template_and_user(
{
template_name => "opac-showreviews.tmpl",
query => $query,
type => "opac",
- authnotrequired => 0,
- flagsrequired => { borrow => 1 },
- debug => 1,
+ authnotrequired => 1,
}
);
-my $biblio = GetBiblioData( $biblionumber, 'opac' );
+my $biblio = GetBiblioData( $biblionumber,'opac' );
my $reviews = getreviews( $biblionumber, 1 );
$template->param(
- 'reviews' => $reviews,
- 'title' => $biblio->{'title'}
+ reviews => $reviews,
+ title => $biblio->{'title'}
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: koha-tmpl/opac-tmpl/prog/en/opac-review.tmpl
===================================================================
RCS file: koha-tmpl/opac-tmpl/prog/en/opac-review.tmpl
diff -N koha-tmpl/opac-tmpl/prog/en/opac-review.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/opac-tmpl/prog/en/opac-review.tmpl 7 Dec 2006 18:09:01 -0000 1.1.2.1
@@ -0,0 +1,30 @@
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+
+
+<h3> Review of: <!--TMPL_VAR NAME="title" --></h3>
+
+<form action="/cgi-bin/koha/opac-review.pl" method="post">
+<input type="hidden" name="biblionumber" value="<!--TMPL_VAR NAME="biblionumber"-->">
+<input type="hidden" name="type" value="<TMPL_VAR NAME="type">">
+
+<table>
+ <tr>
+ <th>
+ Review
+ </th>
+ </tr>
+ <tr><td>
+ <textarea name="review" cols=60 rows=8><!--TMPL_VAR NAME="review"--></textarea>
+ </td></tr>
+ <tr><td>
+ <input type="submit" value="Submit">
+ </td></tr>
+ </table>
+</form>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->
+
Index: koha-tmpl/opac-tmpl/prog/en/opac-showreviews.tmpl
===================================================================
RCS file: koha-tmpl/opac-tmpl/prog/en/opac-showreviews.tmpl
diff -N koha-tmpl/opac-tmpl/prog/en/opac-showreviews.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/opac-tmpl/prog/en/opac-showreviews.tmpl 7 Dec 2006 18:09:01 -0000 1.1.2.1
@@ -0,0 +1,25 @@
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+
+<table>
+ <!--TMPL_LOOP NAME="reviews"-->
+ <tr>
+ <th>
+ <b><!--TMPL_VAR NAME="title"--></b>
+ </th>
+ </tr>
+ <tr>
+ <td>
+ <!--TMPL_VAR NAME="review"-->
+ <p><!--TMPL_VAR NAME="datereviewed"--></p>
+ </td>
+ </tr>
+ <!--/TMPL_LOOP-->
+</table>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->
+
+
More information about the Koha-cvs
mailing list