From 1c51a2e8cf31f54cf5a0b28fde6c35568a6c13c6 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Tue, 17 Feb 2009 15:12:26 +0100 Subject: [PATCH] Updated circulation page in order to make things appear the right way --- circ/circulation.pl | 4 + .../prog/en/modules/circ/circulation.tmpl | 202 ++++-------------- 2 files changed, 45 insertions(+), 161 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 0edf97dccd..694b16091e 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -256,10 +256,14 @@ if ($barcode) { delete $question->{'DEBT'} if ($debt_confirmed); foreach my $impossible ( keys %$error ) { + if ($impossible eq "NOT_FOR_LOAN_CAN_FORCE"){ + $$question{$impossible}=$$error{$impossible}, + } else { $template->param( $impossible => $$error{$impossible}, IMPOSSIBLE => 1 ); + } $noerror = 0; } 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 41100bc8c7..79fb642af5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -70,74 +70,45 @@ $.tablesorter.addParser({
-
- -
- +
-
Patron's account has been renewed until
+
-

Please Confirm Checkout

-
    - -
  • The patron has a debt of $
    • - - - -
  • Item is currently checked out to this patron. Renew?
    • - - - -
  • Item is consigned for
    • - - - -
  • Item is on reserve for
    • - - - -
  • Item ( ) checked out to . Check in and check out?
    • - - - -
  • Too many checked out (already checked out / max : )
    • - - -
  • Overdues
    • - +
  • The patron has a debt of $
    • +
  • Item is currently checked out to this patron. Renew?
    • +
  • Item is consigned for
    • +
  • Item is on reserve for
    • +
  • Item ( ) checked out to . Check in and check out?
    • +
  • Too many checked out (already checked out / max : )
    • +
  • Overdues
    • +
  • Item not for loan, are you sure you want to check it out ?

- - -

+

-

- - - -

+

+

- + " /> " /> - " /> " /> " /> @@ -150,73 +121,23 @@ $.tablesorter.addParser({
- - -
+ +
- -
-

Not for loan

-

Item not for loan, are you sure you want to loan it?

- " /> - " /> - - -
-
- " /> - -
- -
    - -
  • Local Use Recorded
    • - - - -
  • The due date "" is invalid
    • - - -
  • The barcode was not found
    • - - - -
  • Item not for loan
    • - - - -
  • Item has been withdrawn
    • - - - -
  • Item is restricted
    • - - - -
  • Patron's address is in doubt
    • - - - -
  • Patron's card is lost
    • - - - -
  • Patron is restricted
    • - - - -
  • No more renewals possible
    • - - - -
  • Patron's card is expired
    • - - - -
  • This item belongs to and cannot be issued from this location.
    • - +
  • Local Use Recorded
    • +
  • The due date "" is invalid
    • +
  • The barcode was not found
    • +
  • Item not for loan
    • +
  • Item has been withdrawn
    • +
  • Item is restricted
    • +
  • Patron's address is in doubt
    • +
  • Patron's card is lost
    • +
  • Patron is restricted
    • +
  • No more renewals possible
    • +
  • Patron's card is expired
    • +
  • This item belongs to and cannot be issued from this location.
@@ -312,89 +233,58 @@ No patron matched -
" /> " /> " /> " /> - - - " /> - + + " /> +
-
- +

Checking out to ()

-

Cannot Check Out!Attention:

-

Holds waiting:

@@ -415,25 +305,15 @@ No patron matched

+
- -