From 083d3b1a929707a84fe4c97d4c815198bef9e1dc Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 12 Nov 2010 22:00:26 -0500 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. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack --- .../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 0000000000..5d05b94c88 --- /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 46e2dc8bfc..80def787d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -167,7 +167,7 @@ function refocus(calendar) {
  • - + Cancel - " /> + " /> " /> @@ -633,36 +633,7 @@ No patron matched Check in

    select all | none

    - - - Totals: - - - -

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

    -

    - -

    - - - + @@ -725,6 +696,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 5f3bbbae75..d34fc6254f 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" /> - - -

    -

    - -

    - - - + -- 2.39.5