From 9aadee2f92ce10cb90cab95ee7d1259fde6b609b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 2 Jan 2008 15:22:05 -0600 Subject: [PATCH] Some refinements to statuses and messages. Beginning to standardize call number displays. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/includes/biblio-view-menu.inc | 2 +- .../prog/en/modules/catalogue/detail.tmpl | 18 +++-- .../prog/en/modules/circ/circulation.tmpl | 2 +- .../prog/en/modules/reserve/request.tmpl | 68 ++++++++++--------- .../prog/en/modules/opac-reserve.tmpl | 9 +-- .../prog/en/modules/opac-shelves.tmpl | 2 + reserve/request.pl | 18 ++++- 7 files changed, 67 insertions(+), 52 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc index ab428287ac..eeb2a5e846 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc @@ -9,7 +9,7 @@
  • ">Items
  • - ">Holds
    • +
  • ">Holds
  • ">Subscription(s)
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index d7f2943b65..5dc8632511 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -77,10 +77,7 @@ function verify_images() { + /ref=sib_dp_pt/002-7879865-0184864#reader-link">.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="" />
        @@ -159,10 +156,15 @@ function verify_images() { - On loan + Checked out - On loan to "> , due back on + Checked out to "> , due back on + + + In transit from , + to , since + @@ -197,10 +199,6 @@ function verify_images() { Not for loan () - - In transit from , - to , since - 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 5a9a481796..0e8ce4f5b0 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -395,7 +395,7 @@ No patron matched " /> - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl index cfbf61db8b..0d5a79a644 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl @@ -92,9 +92,9 @@ if (alreadyreserved > "0"){

        -
        +

        Hold found for (), please transfer

        -

        Hold placed by : at : , Please transfer this item. +

        Hold placed by : at : , Please transfer this item.

        @@ -105,7 +105,7 @@ if (alreadyreserved > "0"){ -
        No patron with this name, Please, try another
        +

        Patron Not Found

        No patron with this name, Please, try another

        " method="post"> @@ -123,37 +123,37 @@ if (alreadyreserved > "0"){
        - -

        - Too many holds - Currently, this patron has too many holds. -

        + + +
        +

        Cannot Place Hold

        +
          + +
        • Too Many Holds: "> has too many holds.
          • - -
          -

          - Expired account - This patron's account has expired -

          + +
        • "> already has a hold on this item
          • +
        + - -

        - Warning: Pickup Library is different than Patron's Home Library -

        + +
          + +
        • "> 's account has expired
          • - -

          - Warning: - This patron already has a hold on this item -

          +

          Branch Mismatch

          +
        • Pickup library is different than "> 's home library
          • +
        + -

        Patron not found: Name or barcode not found. Please try an other

        +

        Patron not found:

        Name or barcode not found. Please try an other

        +
        Hold details
        @@ -202,9 +202,10 @@ if (alreadyreserved > "0"){
      • Publication year:
        • - + - + + @@ -221,13 +222,13 @@ if (alreadyreserved > "0"){ " /> - " /> + " /> @@ -246,6 +247,11 @@ if (alreadyreserved > "0"){ + @@ -50,6 +51,7 @@ +
        Place a hold on a specific copy
        Hold Item type - " alt="" title=""/> + " alt="" title="" /> Due + + + In transit from , + to , since + @@ -255,10 +261,6 @@ if (alreadyreserved > "0"){ Not for loan () - - In transit from , - to , since - @@ -286,8 +288,8 @@ if (alreadyreserved > "0"){ - +
        " action="modrequest.pl" method="post"> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl index 06f2ff5387..a9b4299d60 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl @@ -138,6 +138,11 @@
        		Due + + + In transit from , + to , since + @@ -147,10 +152,6 @@ Not for loan () - - In transit from , - to , since - WaitingOn hold for patron diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index 66c670e154..32a693cb3e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -22,6 +22,7 @@ Title Author CopyrightCall No.
        diff --git a/reserve/request.pl b/reserve/request.pl index a49b56e96b..d0fea987e9 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -66,6 +66,8 @@ $findborrower =~ s|,| |g; my $cardnumber = $input->param('cardnumber'); my $borrowerslist; my $messageborrower; +my $warnings; +my $messages; my $date = sprintf( '%04d-%02d-%02d', Today() ); @@ -103,6 +105,7 @@ if ($cardnumber) { GetReserveCount( $borrowerinfo->{'borrowernumber'} ); if ( $number_reserves > C4::Context->preference('maxreserves') ) { + $warnings = 1; $maxreserves = 1; } @@ -110,15 +113,18 @@ if ($cardnumber) { if ($borrowerinfo->{'dateexpiry'} ne '0000-00-00') { my $warning = (Date_to_Days(split /-/,$date) > Date_to_Days( split /-/,$borrowerinfo->{'dateexpiry'})); if ( $warning > 0 ) { + $messages = 1; $expiry = 1; } } else { + $messages = 1; $expiry = 1; } # check if the borrower make the reserv in a different branch if ( $borrowerinfo->{'branchcode'} ne C4::Context->userenv->{'branch'} ) { + $messages = 1; $diffbranch = 1; } @@ -138,7 +144,9 @@ if ($cardnumber) { borrowerreservs => $count_reserv, maxreserves => $maxreserves, expiry => $expiry, - diffbranch => $diffbranch + diffbranch => $diffbranch, + messages => $messages, + warnings => $warnings ); } @@ -190,11 +198,14 @@ foreach my $res (@$reserves) { } if ( $borrowerinfo->{borrowernumber} eq $res->{borrowernumber} ) { + $warnings = 1; $alreadyreserved = 1; } } -$template->param( alreadyreserved => $alreadyreserved ); +$template->param( alreadyreserved => $alreadyreserved, + messages => $messages, + warnings => $warnings ); # FIXME think @optionloop, is maybe obsolete, or must be switchable by a systeme preference fixed rank or not # make priorities options @@ -458,7 +469,8 @@ $template->param( cardnumber => $cardnumber, CGIselectborrower => $CGIselectborrower, title => $dat->{title}, - author => $dat->{author} + author => $dat->{author}, + holdsview => 1 ); # printout the page -- 2.20.1