[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.01-92-gd9d9cdb

[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.6.x has been updated
       via  d9d9cdbad0c407c3a2acf2c2ba6a7c015465f88a (commit)
       via  92c5d9ade46f369590d506dd8c1557837351e653 (commit)
       via  8ff49436fa1ae4dba5d4cd09bc96d99e60309950 (commit)
      from  950924bc3e0d09add86a9469caeb70af8f8b288b (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 d9d9cdbad0c407c3a2acf2c2ba6a7c015465f88a
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Oct 26 10:50:11 2011 -0400

    Fix for Bug 6818 - acquisitions basket groups could use some design work
    
    I've made changes to the basket grouping interface to bring it
    in line with other interfaces in Koha. I think it's better to
    keep things following a consistent pattern.
    
    On the page which lists basket groups:
    
    - Basket groups listed in a table instead of as custom-styled lists
    - Buttons use standard style
    - Tabs are generated by jQuery
    
    On the page for managing baskets in a group:
    
    - Markup has been revised to be more consistent with established
      patterns.
    - Corrections have been made for validity
    
    On the basket view page:
    
    - Display of data has been streamlined a little bit
    - An option has been added to the "Basket group" dropdown
      for adding a new group
    - Markup has been corrected for validity and consistency
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    1) Basket group page
    The blue is gone and the new buttons  are much better
    readable than before.
    
    2) Basket grouping page
    Works.
    
    3) Basket view page
    I like the new option to create a new group from here.
    Nice improvement to the workflow!
    I removed a spare 'td' from line 264.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit c1dbd7bbbfe42eef54277a7cc2795877d8b996a3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 92c5d9ade46f369590d506dd8c1557837351e653
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Thu Dec 8 17:13:38 2011 +0100

    Bug 6679: fix missing use strict
    
    The 3 files had use strict missing. The patch add the use strict and modify what's needed to work with it
    4XX.pl also has some perlcritic fixes:
    Variable declared in conditional statement at line XXX, column 9.  Declare variables outside of the condition.  (Severity: 5)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit fe50ffb37f912e32b2f0291a11dd6139120f2ba0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8ff49436fa1ae4dba5d4cd09bc96d99e60309950
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Mon Oct 17 17:51:39 2011 +1300

    Bug 7028 - updated the koha-conf.xml template
    
    Now it more closely matches the one that's distributed in /etc
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (not tested. I confirm the code is clean, and tests are not broken)
    (cherry picked from commit 038a2cf5d6cf8431af67fa3c4b28aaf3d513f6eb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 cataloguing/value_builder/stocknumber.pl           |    8 +-
 cataloguing/value_builder/unimarc_field_210c.pl    |   11 +-
 cataloguing/value_builder/unimarc_field_4XX.pl     |   26 +-
 debian/templates/koha-conf-site.xml.in             |  132 ++++++++-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |  112 ++++---
 .../prog/en/modules/acqui/basketgroup.tt           |  343 +++++++++-----------
 6 files changed, 374 insertions(+), 258 deletions(-)


hooks/post-receive
-- 
main Koha release repository