[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.04-13-gfcff4ee

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.22.x has been updated
       via  fcff4ee1a696fae4daf0a4638f5111cefc663061 (commit)
      from  90ec4bcbf2a2cdc2fe0b58b017e7ee7532e5ac18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fcff4ee1a696fae4daf0a4638f5111cefc663061
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Feb 11 08:56:42 2016 -0500

    Bug 15670 - Rename "Cancel" to "Cancel hold" when checking in a waiting item
    
    When checking in an on-hold item which is waiting, the "Cancel" button
    cancels the hold, so it should say so. This patch changes the text.
    
    This patch also moves the 'cancel hold' button to the middle, on the
    theory that buttons on the left should default to 'confirm' and buttons
    on the right should generally imply 'cancel'--as in 'do nothing.' Moving
    it to the middle seems like a good place to put it where users will have
    to think about clicking it.
    
    To test:
    
    1. Find an hold which has been made 'waiting,' or check in an confirm a
       pending hold at your library.
    2. Check in that item again and verify that the 'Hold found' dialog
       contains a 'Cancel hold' button which works to cancel the waiting
       hold.
    3. Repeat the process and confirm that the functionality of the other
       buttons is unchanged.
    
    Followed test plan, works as expected.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
    (cherry picked from commit d9dc8be41780c3a4332f2fd50f80961d1653c49e)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository