[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en includes/m...
|
From: |
Joshua Ferraro |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en includes/m... |
|
Date: |
Mon, 12 Mar 2007 01:42:00 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: Joshua Ferraro <kados> 07/03/12 01:42:00
Modified files:
koha-tmpl/intranet-tmpl/prog/en/includes: members.js
menu-members.inc
koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl
Log message:
improving validation
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/members.js?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.18&r2=1.19
Patches:
Index: includes/members.js
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/members.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- includes/members.js 12 Mar 2007 01:23:04 -0000 1.1
+++ includes/members.js 12 Mar 2007 01:42:00 -0000 1.2
@@ -1,41 +1,34 @@
function _(s) { return s; }
+// this function checks id date is like DD/MM/YYYY
function CheckDate(field) {
var d = field.value;
if (d!="") {
- // this function checks id date is like JJ/MM/AAAA
var amin = 1900;
var amax = 2100;
-
var date = d.split("/");
-
var ok=1;
var msg;
-
if ( (date.length < 2) && (ok==1) ) {
msg = _("Separator must be /");
alert(msg); ok=0; field.focus();
return;
}
-
var dd = date[0];
var mm = date[1];
var yyyy = date[2];
-
// checking days
if ( ((isNaN(dd))||(dd<1)||(dd>31)) && (ok==1) ) {
msg = _("day not correct.");
alert(msg); ok=0; field.focus();
return;
}
-
// checking months
if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) {
msg = _("month not correct.");
alert(msg); ok=0; field.focus();
return;
}
-
// checking years
if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) {
msg = _("years not correct.");
Index: includes/menu-members.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- includes/menu-members.inc 12 Mar 2007 01:23:04 -0000 1.5
+++ includes/menu-members.inc 12 Mar 2007 01:42:00 -0000 1.6
@@ -1,9 +1,9 @@
<div id="submenu">
<a href="/cgi-bin/koha/members/members-home.pl">Search</a>
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add
adult</a>
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add
child</a>
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P"/>Add prof</a>
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I"/>Add org</a>
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A">Add
adult</a>
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C">Add
child</a>
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P">Add
prof</a>
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I">Add
org</a>
</div>
<div id="main">
Index: members/moremember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- members/moremember.tmpl 12 Mar 2007 01:23:04 -0000 1.18
+++ members/moremember.tmpl 12 Mar 2007 01:42:00 -0000 1.19
@@ -1,40 +1,40 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Borrower's Details</title>
+<title>Koha › Borrower's Details</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
<!-- TMPL_IF NAME="unknowuser" -->
- <p>This borrower doesn't exist anymore.<a href="javascript:back();">Go
Back</a></p>
+ This borrower doesn't exist anymore.<a href="javascript:back();">Go
Back</a>
<!-- TMPL_ELSE -->
<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"-->">
+ <form action="" 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">
<div class="edit">
<!-- TMPL_IF name="adultborrower" -->
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!-- TMPL_VAR
NAME="borrowernumber" -->&category_type=C">
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!-- TMPL_VAR
NAME="borrowernumber" -->&category_type=C">
Add child
</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="category_type" -->
<!--TMPL_IF NAME="guarantor"-->
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="borrowernumber" -->&guarantorid=<!-- TMPL_VAR
NAME="guarantorborrowernumber" -->&category_type=<!-- TMPL_VAR
NAME="category_type"-->">
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="borrowernumber" -->&guarantorid=<!-- TMPL_VAR
NAME="guarantorborrowernumber" -->&category_type=<!-- TMPL_VAR
NAME="category_type"-->">
<!--TMPL_ELSE-->
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="borrowernumber" -->&category_type=<!-- TMPL_VAR
NAME="category_type"-->">
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="borrowernumber" -->&category_type=<!-- TMPL_VAR
NAME="category_type"-->">
<!--/TMPL_IF-->
Edit
</a>
<!-- TMPL_ELSE --> <!-- try with categorycode if no category_type -->
<!-- TMPL_IF NAME="categorycode" -->
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="borrowernumber" -->&categorycode=<!-- TMPL_VAR
NAME="categorycode"-->">
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="borrowernumber" -->&categorycode=<!-- TMPL_VAR
NAME="categorycode"-->">
Edit
</a>
<!-- TMPL_ELSE --> <!-- if no categorycode, set category_type to A
by default -->
- <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="borrowernumber" -->&category_type=A">
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!--
TMPL_VAR NAME="borrowernumber" -->&category_type=A">
Edit
</a>
<!-- /TMPL_IF -->
@@ -66,7 +66,7 @@
</div>
<div class="others">
<!-- TMPL_IF NAME="CAN_user_parameters"-->
- <a
href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&module=MEMBERS&action=MODIFY&object=<!--
TMPL_VAR NAME="borrowernumber"-->">Modification log</a>
+ <a
href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&module=MEMBERS&action=MODIFY&object=<!--
TMPL_VAR NAME="borrowernumber"-->">Modification log</a>
<!-- /TMPL_IF -->
</div>
</div>
@@ -277,7 +277,7 @@
<td colspan="3"> </td>
</tr>
</table>
- <div id="action">
+ <div>
<input type="submit" name="renew_checked" value="Renew Checked
Items" />
<input type="submit" name="renew_all" value="Renew All" />
</div>
@@ -334,11 +334,9 @@
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->
-</div>
-
<script type="text/javascript">
function confirm_deletion() {
- var is_confirmed = window.confirm('Do you confirm deletion ?');
+ var is_confirmed = window.confirm('Click OK to confirm deletion');
var borrowernumbervalue=document.form.borrowernumber.value;
if (is_confirmed) {
@@ -347,10 +345,10 @@
}
function confirm_reregistration() {
- var is_confirmed = window.confirm('Do you confirm re_registration ?');
+ var is_confirmed = window.confirm('Click OK to confirm renewal');
var borrowernumbervalue1=document.form.borrowernumber.value;
if (is_confirmed) {
-
window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
+
window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
}
}
</script>