From c5e80b7b8692b32576596f304dfa1fd7795c807b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 27 Nov 2007 14:53:06 -0600 Subject: [PATCH] Attempting to pretty up confirmations and messages in returns; Adding some variables to the template output; Fixing layout in circulation.tmpl for patrons without messages; Minor correction to OPAC css. Signed-off-by: Joshua Ferraro --- circ/returns.pl | 16 +- .../prog/en/css/staff-global.css | 10 +- .../prog/en/modules/circ/circulation.tmpl | 27 ++- .../prog/en/modules/circ/returns.tmpl | 216 ++++++++---------- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 3 +- 5 files changed, 126 insertions(+), 146 deletions(-) diff --git a/circ/returns.pl b/circ/returns.pl index e06a8cece7..3a60c3472e 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -135,6 +135,7 @@ if ( $query->param('resbarcode') ) { if ( $messages->{'transfert'} ) { $template->param( itemtitle => $iteminfo->{'title'}, + itembiblionumber => $iteminfo->{'biblionumber'}, iteminfo => $iteminfo->{'author'}, tobranchname => $branchname, name => $name, @@ -249,8 +250,9 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { wborsurname => $borr->{'surname'}, wbortitle => $borr->{'title'}, wborphone => $borr->{'phone'}, - wboremail => $borr->{'emailaddress'}, - wborstraddress => $borr->{'streetaddress'}, + wboremail => $borr->{'email'}, + wboraddress => $borr->{'address'}, + wboraddress2 => $borr->{'address2'}, wborcity => $borr->{'city'}, wborzip => $borr->{'zipcode'}, wborrowernumber => $reserve->{'borrowernumber'}, @@ -282,8 +284,9 @@ if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) { borsurname => $borr->{'surname'}, bortitle => $borr->{'title'}, borphone => $borr->{'phone'}, - boremail => $borr->{'emailaddress'}, - borstraddress => $borr->{'streetaddress'}, + boremail => $borr->{'email'}, + boraddress => $borr->{'address'}, + boraddress2 => $borr->{'address2'}, borcity => $borr->{'city'}, borzip => $borr->{'zipcode'}, borrowernumber => $reserve->{'borrowernumber'}, @@ -327,11 +330,12 @@ if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) { borrowernumber => $reserve->{'borrowernumber'}, borcnum => $borr->{'cardnumber'}, borphone => $borr->{'phone'}, - borstraddress => $borr->{'streetaddress'}, + boraddress => $borr->{'address'}, + boraddress2 => $borr->{'address2'}, borsub => $borr->{'suburb'}, borcity => $borr->{'city'}, borzip => $borr->{'zipcode'}, - boremail => $borr->{'emailaddress'}, + boremail => $borr->{'email'}, debarred => $borr->{'debarred'}, gonenoaddress => $borr->{'gonenoaddress'}, barcode => $barcode diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 63047d04f2..16d438fdf3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -943,14 +943,18 @@ div.first fieldset { } .dialog div.confirm { - background-color: #fff; - background : url(../../img/dialog-bg.gif) repeat-x left 0 !important; + background-color: #ffc; + // background : url(../../img/dialog-bg.gif) repeat-x left 0 !important; font: 1em sans-serif; border: 1px solid #bcbcbc; padding: 4px !important; margin: -6px 6px 6px -6px !important; margin: 0; - text-align : center; + } + + .dialog div.confirm h2, .dialog div.confirm h3, .dialog div.confirm h4 { + margin : auto; + text-align : center; } div.confirm input { 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 842aa51f7a..b2ac8bae12 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -67,7 +67,7 @@ function verify_patron_images() { -
  • Item is currently issued to this patron. Renew?
    • +
  • Item is currently checked out to this patron. Renew?
    • @@ -79,7 +79,7 @@ function verify_patron_images() { -
  • Item ( ) issued to . Return and issue?
    • +
  • Item ( ) checked out to . Check in and check out?
    • @@ -159,7 +159,10 @@ No patron matched
    -
    + +
    + +
    Enter item barcode:
    @@ -256,7 +259,7 @@ No patron matched
    - +

    @@ -314,15 +317,15 @@ No patron matched
    - - - +

    Notes:

    - + + +
    @@ -401,8 +404,8 @@ No patron matched Renewal Failed - - + + @@ -442,8 +445,8 @@ No patron matched - - + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl index 73c06fe297..e39597026c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl @@ -5,72 +5,60 @@ - + -
    +
    -
    -

    Check In

    - - -

    This item should not be in this library !

    - - - - - - - - - - - -
    Title : - "> -
    Hold for: - -
      -
    • ">
      • +
      + +

      This item should not be in this library !

      +">
      +Hold for: +
      • ">
      • ,
        • -

      • +

      • +
        • +
      No reservation linked - -
    Action - This item must be transfered to : -
    - +
    + This item must be transfered to :
    + + " /> " /> " /> - - + +
    +
    -

    Waiting Hold Found in your library for

    -

    Patron: - "> - , () - - , - - +

    Reserve Found (item is already waiting)

    +

    ">

    +
    Patron:
    +

    -
    - + + " value="" /> " value="" /> @@ -84,27 +72,23 @@ -

    Hold needing transfer found

    - - - - - - - +

    Transfer to:

    -
    ">
    Patron: +

    Hold needing transfer found

    +

    ">

    +

    Patron:

    -
    Transfer to:
    - - + + + " value="" /> " value="" /> @@ -112,13 +96,13 @@ " /> -
    + - + -

    Send item to '':

    -

    Please return ' ()' to ()

    +

    Send item to

    +

    Please return to

    " value="" /> @@ -126,20 +110,20 @@ " value="" /> - -
    + +

    Item Consigned:

    - +
    ">">
    Patron:
    -
    + " value="" /> @@ -155,42 +139,47 @@ -

    Hold placed for another library, please transfer

    +

    Hold placed for another library, please transfer

    -

    Waiting Hold Found in your library

    +

    Reserve Found:

    -

    Title:

    -

    Patron: - "> - , () - - , - - -

    +

    ">

    +
    Patron:
    + -

    Transfer to:

    +

    Transfer to:

    + +

    Hold at

    - + - + - + - " value="" /> - " value="" /> - " value="" /> - + " value="" /> + " value="" /> + " value="" /> " /> " /> " /> " />
    + - +
    -
    +

    @@ -213,7 +202,7 @@

    Please return to

    -

    Not On Issue.

    +

    Not checked out.

    Item was lost, now found.

    @@ -225,15 +214,16 @@
    + - +
    Item InformationPatron Information
    - "> - , + + ">, () ( , @@ -245,48 +235,26 @@

    Checked-In items

    - - - - - - - + + - + + + + - - - + Not checked out + -
    TitleItemtypeDue DateBarcodePatron
    Due Date Title Author Barcode Type Patron
    - "> - -
    -     		Not checked out"> + - - // - - Not on issue - - - - - + "> , - - Not on issue - -
    +
    - - -
    -
    diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index fb86a71eb0..50e32796ad 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -137,10 +137,11 @@ h1#libraryname { h1#libraryname a { text-decoration : none; + color : #000066; } h1#libraryname a:hover { - color : #384B73; + color : #000066; } h1,h2,h3,h4,h5,h6 { -- 2.39.5