[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/members/de... [rel_3_0]

[Bruno Toumi]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Bruno Toumi <btoumi>	06/12/06 16:55:07

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/members: deletemem.tmpl 
	                                         moremember.tmpl 
	members        : deletemem.pl 

Log message:
	deletemem.pl : bug fix change loop condition
	moremember.tmpl: bug fix in javascript for delete borrower and reregistartion borrower
	deletemember.tmpl: add top and left menu to stay in right koha display

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.16&r2=1.12.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.4&r2=1.9.2.5

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl	19 Jul 2005 20:47:06 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl	6 Dec 2006 16:55:06 -0000	1.1.2.1
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cannot Delete Member<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 	<h3>Cannot Delete Member</h3>
 		<!-- TMPL_IF name="ItemsOnIssues" -->
 			Member has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.

Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.12.2.16
retrieving revision 1.12.2.17
diff -u -b -r1.12.2.16 -r1.12.2.17
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl	1 Dec 2006 16:54:47 -0000	1.12.2.16
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl	6 Dec 2006 16:55:06 -0000	1.12.2.17
@@ -6,6 +6,7 @@
 <h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
 	<form name="form">
 	<input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->"> 
+	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 	</form>
 <div id="action">
     <!-- TMPL_IF name="adultborrower" -->
@@ -296,14 +297,17 @@
 <script language="JavaScript" type="text/javascript">
 function confirm_deletion() {
     var is_confirmed = window.confirm('Do you confirm deletion ?');
+    var borrowernumbervalue=document.form.borrowernumber.value; 
+   
     if (is_confirmed) {
-            window.location='/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->';
+            window.location='/cgi-bin/koha/members/deletemem.pl?member='+borrowernumbervalue+'';
     }
 }
 function confirm_reregistration() {
     var is_confirmed = window.confirm('Do you confirm re_registration ?');
+    var borrowernumbervalue1=document.form.borrowernumber.value;
     if (is_confirmed) {
-    window.location='/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&reregistration=y';
+    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
     }
 }
 </script>

Index: members/deletemem.pl
===================================================================
RCS file: /sources/koha/koha/members/deletemem.pl,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -b -r1.9.2.4 -r1.9.2.5
--- members/deletemem.pl	30 Nov 2006 18:23:51 -0000	1.9.2.4
+++ members/deletemem.pl	6 Dec 2006 16:55:06 -0000	1.9.2.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: deletemem.pl,v 1.9.2.4 2006/11/30 18:23:51 toins Exp $
+# $Id: deletemem.pl,v 1.9.2.5 2006/12/06 16:55:06 btoumi Exp $
 
 #script to delete items
 #written 2/5/00
@@ -70,8 +70,8 @@
 $sth->execute($member);
 my $data=$sth->fetchrow_hashref;
 $sth->finish;
-
-if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){
+if ($i > 0 or $flags->{'CHARGES'}  or $data->{'borrowernumber'}){
+warn"je suis rentre dans la boucle";
 	my ($template, $borrowernumber, $cookie)
 		= get_template_and_user({template_name => "members/deletemem.tmpl",
 					query => $input,