[Koha-cvs] koha members/moremember.pl koha-tmpl/intranet-t...
Pierrick LE GALL
pierrick at koha-fr.org
Fri Apr 7 13:10:26 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch:
Changes by: Pierrick LE GALL <plg at savannah.gnu.org> 06/04/07 11:10:25
Modified files:
members : moremember.pl
koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl
koha-tmpl/intranet-tmpl/prog/en/admin: itemtypes.tmpl
admin : itemtypes.pl
C4 : Koha.pm
Log message:
modification: on itemtypes management screen, useless form are replaced by
simple links.
improvement: support of itemtype icons on prog template. The icons are
displayed on itemtypes management screen and on moremember screen.
improvement: use of pagination_bar on itemtypes management screen.
new: function were added in C4::Koha to manage itemtype image location
(local/remote). Warning: you must copy or symlink the itemtypeimg directory
from the opac template into the intranet template.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/members/moremember.pl.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/admin/itemtypes.pl.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Koha.pm.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
Patches:
Index: koha/C4/Koha.pm
diff -u koha/C4/Koha.pm:1.29 koha/C4/Koha.pm:1.30
--- koha/C4/Koha.pm:1.29 Fri Apr 7 08:24:36 2006
+++ koha/C4/Koha.pm Fri Apr 7 11:10:25 2006
@@ -63,6 +63,9 @@
&getallthemes &getalllanguages
&getallbranches &getletters
getnbpages
+ getitemtypeimagedir
+ getitemtypeimagesrc
+ getitemtypeimagesrcfromurl
$DEBUG);
use vars qw();
@@ -543,9 +546,41 @@
my $sth=$dbh->prepare("select * from itemtypes where itemtype=?");
$sth->execute($itemtype);
my $res = $sth->fetchrow_hashref;
+
+ $res->{imageurl} = getitemtypeimagesrcfromurl($res->{imageurl});
+
return $res;
}
+sub getitemtypeimagesrcfromurl {
+ my ($imageurl) = @_;
+
+ if (defined $imageurl and $imageurl !~ m/^http/) {
+ $imageurl =
+ getitemtypeimagesrc()
+ .'/'.$imageurl
+ ;
+ }
+
+ return $imageurl;
+}
+
+sub getitemtypeimagedir {
+ return
+ C4::Context->intrahtdocs
+ .'/'.C4::Context->preference('template')
+ .'/itemtypeimg'
+ ;
+}
+
+sub getitemtypeimagesrc {
+ return
+ '/intranet-tmpl'
+ .'/'.C4::Context->preference('template')
+ .'/itemtypeimg'
+ ;
+}
+
=head2 getprinters
$printers = &getprinters($env);
Index: koha/admin/itemtypes.pl
diff -u koha/admin/itemtypes.pl:1.21 koha/admin/itemtypes.pl:1.22
--- koha/admin/itemtypes.pl:1.21 Fri Feb 24 11:15:01 2006
+++ koha/admin/itemtypes.pl Fri Apr 7 11:10:25 2006
@@ -40,12 +40,15 @@
use strict;
use CGI;
+use HTML::Template;
+use List::Util qw/min/;
+
+use C4::Koha;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
-use HTML::Template;
sub StringSearch {
my ($env,$searchstring,$type)=@_;
@@ -66,10 +69,9 @@
my $input = new CGI;
my $searchfield=$input->param('description');
-my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/itemtypes.pl";
my $itemtype=$input->param('itemtype');
-my $pagesize=20;
+my $pagesize=5;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
@@ -102,49 +104,70 @@
$sth->finish;
}
# build list of images
- my $imagedir = C4::Context->opachtdocs."/".C4::Context->preference('opacthemes');
- warn "img : $imagedir";
- unless (opendir(DIR, "$imagedir/itemtypeimg/")) {
-# my $cgidir = C4::Context->intranetdir;
- opendir(DIR, "$imagedir/value_builder") || die "can't opendir $imagedir/value_builder: $!";
- }
+ my $imagedir_filesystem = getitemtypeimagedir();
+ my $imagedir_web = getitemtypeimagesrc();
+ opendir(DIR, $imagedir_filesystem)
+ or die "can't opendir ".$imagedir_filesystem.": ".$!;
my @imagelist;
while (my $line = readdir(DIR)) {
- if ($line =~ /\.gif$/) {
- my %x;
- $x{KohaImage} = "$line";
- push @imagelist, \%x;
+ if ($line =~ /\.(gif|png)$/i) {
+ push(
+ @imagelist,
+ {
+ KohaImage => $line,
+ KohaImageSrc => $imagedir_web.'/'.$line,
+ checked => $line eq $data->{imageurl} ? 1 : 0,
+ }
+ );
}
}
closedir DIR;
-# my $CGIitemtypes = CGI::scrolling_list(-name=>'itemtypes',
-# -id=>"itemtypes",
-# -values=> \@imagelist,
-# -size=>1,
-# -multiple=>0,
-# );
-#
- $template->param(itemtype => $itemtype,
- description => $data->{'description'},
- renewalsallowed => $data->{'renewalsallowed'},
- rentalcharge => sprintf("%.2f",$data->{'rentalcharge'}),
- notforloan => $data->{'notforloan'},
- imageurl => $data->{'imageurl'},
- opacthemes => C4::Context->preference('opacthemes'),
- IMAGESLOOP => \@imagelist,
- );
-;
+
+ my $remote_image = undef;
+ if (defined $data->{imageurl} and $data->{imageurl} =~ m/^http/) {
+ $remote_image = $data->{imageurl};
+ }
+
+ $template->param(
+ itemtype => $itemtype,
+ description => $data->{'description'},
+ renewalsallowed => $data->{'renewalsallowed'},
+ rentalcharge => sprintf("%.2f",$data->{'rentalcharge'}),
+ notforloan => $data->{'notforloan'},
+ imageurl => $data->{'imageurl'},
+ template => C4::Context->preference('template'),
+ IMAGESLOOP => \@imagelist,
+ remote_image => $remote_image,
+ );
# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("replace itemtypes (itemtype,description,renewalsallowed,rentalcharge,notforloan,imageurl) values (?,?,?,?,?,?)");
+
+ my $query = '
+UPDATE itemtypes
+ SET description = ?
+ , renewalsallowed = ?
+ , rentalcharge = ?
+ , notforloan = ?
+ , imageurl = ?
+ WHERE itemtype = ?
+';
+ my $sth=$dbh->prepare($query);
$sth->execute(
- $input->param('itemtype'),$input->param('description'),
- $input->param('renewalsallowed'),$input->param('rentalcharge'),
- $input->param('notforloan')?1:0,
- $input->param('imageurl'));
+ $input->param('description'),
+ $input->param('renewalsallowed'),
+ $input->param('rentalcharge'),
+ $input->param('notforloan') ? 1 : 0,
+ $input->param('image') eq 'removeImage'
+ ? undef
+ : $input->param('image') eq 'remoteImage'
+ ? $input->param('remoteImage')
+ : $input->param('image'),
+ $input->param('itemtype'),
+ );
+
$sth->finish;
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypes.pl\"></html>";
exit;
@@ -192,40 +215,40 @@
# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
- my $env;
- my ($count,$results)=StringSearch($env,$searchfield,'web');
- my $toggle=0;
- my @loop_data;
- for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
- my %row_data;
- if ($toggle eq 0){
- $toggle=1;
- } else {
- $toggle=0;
- }
- $row_data{toggle} = $toggle;
- $row_data{itemtype} = $results->[$i]{itemtype};
- $row_data{description} = $results->[$i]{description};
- $row_data{renewalsallowed} = $results->[$i]{renewalsallowed};
- $row_data{notforloan} = $results->[$i]{notforloan};
- if ($results->[$i]{imageurl} =~ /^http/) {
- $row_data{absoluteurl} = 1;
- }
- $row_data{imageurl} = $results->[$i]{imageurl};
- $row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{rentalcharge});
- push(@loop_data, \%row_data);
- }
- $template->param(loop => \@loop_data,
- opacthemes => C4::Context->preference('opacthemes')
- );
- if ($offset>0) {
- my $prevpage = $offset-$pagesize;
- $template->param(previous => "$script_name?offset=".$prevpage);
- }
- if ($offset+$pagesize<$count) {
- my $nextpage =$offset+$pagesize;
- $template->param(next => "$script_name?offset=".$nextpage);
- }
+ my $env;
+ my ($count,$results)=StringSearch($env,$searchfield,'web');
+
+ my $page = $input->param('page') || 1;
+ my $first = ($page - 1) * $pagesize;
+
+ # if we are on the last page, the number of the last word to display
+ # must not exceed the length of the results array
+ my $last = min(
+ $first + $pagesize - 1,
+ scalar @{$results} - 1,
+ );
+
+ my $toggle = 0;
+ my @loop;
+ foreach my $result (@{$results}[$first .. $last]) {
+ my $itemtype = $result;
+ $itemtype->{toggle} = ($toggle eq 0 ? 1 : 0);
+ $itemtype->{imageurl} =
+ getitemtypeimagesrcfromurl($itemtype->{imageurl});
+ $itemtype->{rentalcharge} = sprintf('%.2f', $itemtype->{rentalcharge});
+
+ push(@loop, $itemtype);
+ }
+
+ $template->param(
+ loop => \@loop,
+ pagination_bar => pagination_bar(
+ $script_name,
+ getnbpages(scalar @{$results}, $pagesize),
+ $page,
+ 'page'
+ )
+ );
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;
Index: koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:1.1 Fri Feb 24 11:18:17 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl Fri Apr 7 11:10:25 2006
@@ -1,8 +1,30 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration:
-<!-- TMPL_IF name="add_form" --><!-- TMPL_IF name="itemtype" -->Modify item type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Add item type<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" --><!-- TMPL_IF name="total" -->Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Item Types Administration<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Koha -- System Administration:
+
+<!-- TMPL_IF name="add_form" -->
+ <!-- TMPL_IF name="itemtype" -->
+Modify item type '<!-- TMPL_VAR name="itemtype" -->'
+ <!-- TMPL_ELSE -->
+Add item type
+ <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirm" -->
+ <!-- TMPL_IF name="total" -->
+Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'
+ <!-- TMPL_ELSE -->
+Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?
+ <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirmed" -->
+Data Deleted
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="else" -->
+Item Types Administration
+<!-- /TMPL_IF -->
+
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
@@ -10,40 +32,133 @@
<!-- TMPL_IF name="add_form" -->
- <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
- <input type="hidden" name="op" value="add_validate" />
- <input type="hidden" name="checked" value="0" />
+<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+ <feldset>
+ <legend>
+ <!-- TMPL_IF name="itemtype" -->
+ Modify item type
+ <!-- TMPL_ELSE -->
+ Add item type
+ <!-- /TMPL_IF -->
+ </legend>
+
+ <input type="hidden" name="op" value="add_validate" />
+ <input type="hidden" name="checked" value="0" />
- <table>
- <caption><!-- TMPL_IF name="itemtype" -->
- Modify item type
- <!-- TMPL_ELSE -->
- Add item type
- <!-- /TMPL_IF --></caption>
- <!-- TMPL_IF name="itemtype" -->
- <tr><th><label for="">Item type</label></th><td><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" /><!-- TMPL_VAR name="itemtype" --></td></tr>
- <!-- TMPL_ELSE -->
- <tr><th><label for="">Item type</label></th><td><input type="text" name="itemtype" size="6" maxlength="4" onblur="toUC(this)" /></td></tr>
- <!-- /TMPL_IF -->
- <tr>
- <th><label for="description">Description</label></th>
- <td><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" /> </td>
- </tr>
- <tr>
- <th><label for="notforloan">Not for loan</label></th>
- <td><input type="checkbox" id="notforloan" name="notforloan"<!-- TMPL_IF name="notforloan" --> checked="checked"<!-- /TMPL_IF --> value="1"> (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)</td>
- </tr>
- <tr>
- <tr>
- <th><label for="renewalsallowed">Renewals</label></th>
- <td><input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_IF name="renewalsallowed" --><!-- TMPL_VAR NAME="renewalsallowed" --><!-- /TMPL_IF -->" value="1" /><!-- Display for NPL //<input type="hidden" name="rentalcharge" value="0" /> //Display for NPL --></td>
- </tr>
-<!-- Hide from NPL--> <tr>
- <th><label for="rentalcharge">Rental charge</label></th>
- <td><input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" /></td>
- </tr><!-- /Hide from NPL -->
- </table><input type="button" value="Save Changes" onclick="Check(this.form)" /> <input type="button" value="Cancel" onclick="history.back();" />
- </form>
+ <table>
+ <!-- TMPL_IF name="itemtype" -->
+ <tr>
+ <th>
+ <label for="">Item type</label>
+ </th>
+ <td>
+ <input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" />
+ <!-- TMPL_VAR name="itemtype" -->
+ </td>
+ </tr>
+ <!-- TMPL_ELSE -->
+ <tr>
+ <th>
+ <label for="">Item type</label>
+ </th>
+ <td>
+ <input type="text" name="itemtype" size="6" maxlength="4" onblur="toUC(this)" />
+ </td>
+ </tr>
+ <!-- /TMPL_IF -->
+ <tr>
+ <th>
+ <label for="description">Description</label>
+ </th>
+ <td>
+ <input type="text" id="description" name="description" size="48" maxlength="80"
+ value="<!-- TMPL_VAR name="description" escape="HTML" -->" />
+ </td>
+ </tr>
+ <tr>
+ <th>Image</th>
+ <td>
+ <p>
+ <!-- TMPL_LOOP NAME="IMAGESLOOP" -->
+ <label>
+ <!-- TMPL_IF name="checked" -->
+ <input type="radio" name="image" value="<!-- TMPL_VAR name="KohaImage" -->" checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="radio" name="image" value="<!-- TMPL_VAR name="KohaImage" -->" />
+ <!-- /TMPL_IF -->
+ <img src="<!-- TMPL_VAR name="KohaImageSrc" -->">
+ </label>
+ <!-- /TMPL_LOOP -->
+ </p>
+ <hr />
+ <p>
+ <label>
+ <!-- TMPL_IF name="remote_image" -->
+ <input type="radio" id="remote_image_check" name="image" value="remoteImage" checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="radio" id="remote_image_check" name="image" value="remoteImage" />
+ <!-- /TMPL_IF -->
+ remote image
+ </label>
+ <input type="text"
+ name="remoteImage"
+ size="48"
+ maxlength="200"
+ value="<!-- TMPL_VAR name="remote_image" -->"
+ onmousedown="document.getElementById('remote_image_check').checked = true;"
+ />
+ </label>
+ <!-- TMPL_IF name="remote_image" -->
+ <img src="<!-- TMPL_VAR name="remote_image" -->" />
+ <!-- /TMPL_IF -->
+ </p>
+ <hr />
+ <p>
+ <label><input type="radio" name="image" value="removeImage" /> remove image</label>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <label for="notforloan">Not for loan</label>
+ </th>
+ <td>
+ <input type="checkbox" id="notforloan" name="notforloan"
+ <!-- TMPL_IF name="notforloan" -->
+ checked="checked"
+ <!-- /TMPL_IF -->
+ value="1">
+ (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <label for="renewalsallowed">Renewals</label>
+ </th>
+ <td>
+ <input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="
+ <!-- TMPL_IF name="renewalsallowed" -->
+ <!-- TMPL_VAR NAME="renewalsallowed" -->
+ <!-- /TMPL_IF -->" value="1" /><!-- Display for NPL //<input type="hidden" name="rentalcharge" value="0" /> //Display for NPL -->
+ </td>
+ </tr>
+<!-- Hide from NPL-->
+ <tr>
+ <th>
+ <label for="rentalcharge">Rental charge</label>
+ </th>
+ <td>
+ <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" />
+ </td>
+ </tr><!-- /Hide from NPL -->
+ </table>
+
+ <p id="action">
+ <input type="button" value="Save Changes" onclick="Check(this.form)" />
+ <input type="button" value="Cancel" onclick="history.back();" />
+ </p>
+ </fieldset>
+</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_confirm" -->
@@ -70,44 +185,54 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF name="else" -->
+<h2>Item Types Administration</h2>
<table>
-<caption>Item Types Administration</caption>
- <tr>
- <th>Code</th>
- <th>Description</th>
- <th>Not for Loan</th>
- <th>Renewable</th>
- <th>Charge</th>
- <th>Edit</th>
- <th>Delete</th>
- </tr>
- <!-- TMPL_LOOP name="loop" -->
- <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
- <td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->"><!-- TMPL_VAR name="itemtype" --></a></td>
- <td><!-- TMPL_VAR name="description" --></td>
- <td><!-- TMPL_IF NAME="notforloan" -->Yes<!-- TMPL_ELSE --> <!-- /TMPL_IF --></td>
- <td><!-- TMPL_IF NAME="renewalsallowed" -->
- <!-- TMPL_VAR name="renewalsallowed" --> time(s)
- <!-- TMPL_ELSE -->
- No
- <!-- /TMPL_IF -->
- </td>
- <td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- /TMPL_UNLESS --></td>
- <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" escape="HTML" -->" /><input type="submit" value="Edit" /></form></td>
- <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" escape="HTML" -->" /><input type="submit" value="Delete" /></form></td>
- </tr>
- <!-- /TMPL_LOOP -->
+ <tr>
+ <th>image</th>
+ <th>Code</th>
+ <th>Description</th>
+ <th>Not for Loan</th>
+ <th>Renewable</th>
+ <th>Charge</th>
+ <th>Actions</th>
+ </tr>
+ <!-- TMPL_LOOP name="loop" -->
+ <!-- TMPL_IF NAME="toggle" -->
+ <tr>
+ <!-- TMPL_ELSE -->
+ <tr class="highlight">
+ <!-- /TMPL_IF -->
+ <td><img src="<!-- TMPL_VAR name="imageurl" -->" /></td>
+ <td>
+ <a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->">
+ <!-- TMPL_VAR name="itemtype" -->
+ </a>
+ </td>
+ <td><!-- TMPL_VAR name="description" --></td>
+ <td><!-- TMPL_IF NAME="notforloan" -->Yes<!-- TMPL_ELSE --> <!-- /TMPL_IF --></td>
+ <td>
+ <!-- TMPL_IF NAME="renewalsallowed" -->
+ <!-- TMPL_VAR name="renewalsallowed" --> time(s)
+ <!-- TMPL_ELSE -->
+ No
+ <!-- /TMPL_IF -->
+ </td>
+ <td>
+ <!-- TMPL_UNLESS name="notforloan" -->
+ <!-- TMPL_VAR NAME="rentalcharge" -->
+ <!-- /TMPL_UNLESS -->
+ </td>
+ <td>
+ <a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->">Edit</a>
+ <a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->">Delete</a>
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
</table>
-<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-<p><input type="hidden" name="op" value="add_form" />
-
-<!-- TMPL_IF name="previous" --><input type="button" onclick="location.href='<!-- TMPL_VAR name="previous" -->'; return false;" value="<< Previous Page" /><!-- /TMPL_IF -->
-
-<input type="submit" value="Add Item Type" />
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
-<!-- TMPL_IF name="next" --><input type="button" onclick="location.href='<!-- TMPL_VAR name="next" -->'; return false;" value="Next Page >>" /><!-- /TMPL_IF -->
-</p></form>
+<p><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form">Add Item type</a></p>
<!-- /TMPL_IF -->
Index: koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl:1.3 koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl:1.4
--- koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl:1.3 Mon Apr 3 09:38:00 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl Fri Apr 7 11:10:25 2006
@@ -177,7 +177,12 @@
</a>
</td>
<td><!-- TMPL_VAR NAME="date_due" --></td>
- <td><!-- TMPL_VAR NAME="itemtype" --></td>
+ <td>
+ <!-- TMPL_VAR NAME="itemtype_description" -->
+ <!-- TMPL_IF NAME="itemtype_image" -->
+ <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
+ <!-- /TMPL_IF -->
+ </td>
<td><!-- TMPL_VAR NAME="charge" --></td>
<td><!-- TMPL_VAR NAME="replacementprice" --></td>
<td>
Index: koha/members/moremember.pl
diff -u koha/members/moremember.pl:1.20 koha/members/moremember.pl:1.21
--- koha/members/moremember.pl:1.20 Fri Mar 31 15:56:27 2006
+++ koha/members/moremember.pl Fri Apr 7 11:10:25 2006
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.20 2006/03/31 15:56:27 plg Exp $
+# $Id: moremember.pl,v 1.21 2006/04/07 11:10:25 plg Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -177,7 +177,11 @@
# return the correct item type either (or a properly-formatted
# charge, for that matter).
my ($charge,$itemtype)=calc_charges($dbh,$issue->[$i]{'itemnumber'},$bornum);
- $row{'itemtype'} = getitemtypeinfo($itemtype)->{description};
+
+ my $itemtypeinfo = getitemtypeinfo($itemtype);
+ $row{'itemtype_description'} = $itemtypeinfo->{description};
+ $row{'itemtype_image'} = $itemtypeinfo->{imageurl};
+
$row{'charge'}= sprintf("%.2f",$charge);
#check item is not reserved
More information about the Koha-cvs
mailing list