From a45d0706ab03ff3d55e8e9d5e05eb2a047a02aca Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 9 Sep 2010 11:58:37 -0400 Subject: [PATCH] Fix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab Display of the renewal date footer in the template was conditional upon the existence of checkouts from today. In order to fix this bug it was necessary to repeat the markup for the table footer twice in the template, so I created an include file for it. The same include file can now be used in moremember.tmpl. --- .../prog/en/includes/checkouts-table-footer.inc | 25 ++++++++++++++ .../prog/en/modules/circ/circulation.tmpl | 36 ++----------------- .../prog/en/modules/members/moremember.tmpl | 36 +++++--------------- 3 files changed, 38 insertions(+), 59 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc new file mode 100644 index 0000000..5d05b94 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc @@ -0,0 +1,25 @@ + + + Totals: + + + +

Renewal due date: " /> + /lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" /> +

+

+ + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 980d195..321858d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -176,7 +176,7 @@ function refocus(calendar) {
  • - + Cancel - " /> + " /> " /> @@ -642,36 +642,7 @@ No patron matched Check in

    select all | none

    - - - Totals: - - - -

    - Renewal due date: " /> - /lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" /> - -

    -

    - -

    - - - + @@ -734,6 +705,7 @@ No patron matched Previous checkouts Previous checkouts + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index dfad6ee..2c02095 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -89,7 +89,14 @@ if (nodename =="barcodes[]"){ } } } - +function validate1(date) { + var today = new Date(); + if ( date < today ) { + return true; + } else { + return false; + } +}; //]]> @@ -404,32 +411,7 @@ if (nodename =="barcodes[]"){ Renew

    select all | none

    Check in

    select all | none

    - - - Totals: - - - -

    - Renewal due date: " /> - /lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" /> - - -

    -

    - -

    - - - + -- 1.7.0.4