[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-738-g1646de2

[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, master has been updated
       via  1646de2cdfcd9891b075cb72454c7be0c80895ca (commit)
       via  640124829a01bb005acea5566fd44be1caabcc32 (commit)
      from  114ad0015b209404b30289397646cb2f21d4aa54 (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 1646de2cdfcd9891b075cb72454c7be0c80895ca
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Jun 19 11:50:00 2013 +0200

    Bug 9757: Remove duplicated action buttons.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 640124829a01bb005acea5566fd44be1caabcc32
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Mar 5 20:23:56 2013 -0500

    Bug 9757: Make staff client list contents view more like search results
    
    This patch revises the staff client list contents view to better match
    staff client search results, showing more information and offering more
    ways to interact with the contents than before.
    
    - List contents output has been modified so that the staff client can
      use XSLT-formatted data just as the OPAC can. As in the OPAC it
      depends on XSLTResultsDisplay being enabled.
    - A "toolbar" has been added which is similar to that in search results,
      offering the option to add items to a Cart, add them to a different
      list, place multiple holds, remove items from the list, or merge
      records.
    - This toolbar has been made to float on scroll like the one on the
      MARC edit page.
    - Library and shelving location have been added to the display of call
      numbers. Call numbers are linked to a search as they are in search
      results.
    - Edit links are included just as they are in search results.
    - Automatic focus on the add by barcode form has been removed so that
      the page doesn't jump to the bottom unnecessarily.
    - basket.js's "addMultiple" function has been modified so that it
      receives an array of checkboxes rather than looking for checkboxes in
      a specific form. This helps abstract its functionality for use on both
      search results and lists. results.tt is modified accordingly.
    - The page layout has been widened to make room for the increased amount
      of information on the page.
    - A new "merge" icon has been added to the default Bootstrap sprite.
    
    To test:
    
    - View both public and private lists in the staff client.
    - View lists with and without contents.
    - Test the functionality of options in the toolbar: Add to cart, add to
      lists, place multiple holds, remove items, merge items.
    - Test with users with and without cataloging privileges to confirm that
      catalog-related controls are correctly shown or hidden.
    - Test with XSLTResultsDisplay set both to "default" and empty.
    - Since the staff client and OPAC use some of the same code, test that
      lists in the OPAC have not broken.
    - Since JavaScript was modified which affects both lists and search
      results, confirm that adding items to the Cart and Lists from search
      results hasn't been broken by this patch.
    
    Revision corrects conditional display of hold link, hiding it in cases
    where there are no items or the record's itemtype is not for loan.
    
    Also corrected is the behavior of the Cart/List "save" button in order
    to prevent it from submitting the "remove items" action which is the
    default for the form.
    
    Signed-off-by: jmbroust <jean-manuel.broust at univ-lyon2.fr>
    
    Edit: Patch rebased against current master and hard-coded paths to
    /prog/ corrected.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/VirtualShelves/Page.pm                          |   24 ++-
 koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css  |    6 -
 .../intranet-tmpl/prog/en/css/staff-global.css     |   13 +-
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |   30 ++--
 .../prog/en/modules/catalogue/results.tt           |   16 +-
 .../prog/en/modules/virtualshelves/shelves.tt      |  222 +++++++++++++++-----
 .../prog/img/glyphicons-halflings-koha.png         |  Bin 26855 -> 27260 bytes
 7 files changed, 227 insertions(+), 84 deletions(-)


hooks/post-receive
-- 
main Koha release repository