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

[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  6405f26524de79f98139b6c076543781925caaca (commit)
       via  9eb13aa3cdd47738d42615d6d5dc03b84bf9194c (commit)
      from  b38187d8b004316b17d1e67753d638e96bb62bb8 (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 6405f26524de79f98139b6c076543781925caaca
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Jul 15 15:44:12 2013 +0000

    Bug 10592: fix display of favicon
    
    Move the favicon files for OPAC and staff so that they are not
    blocked by the Apache configuration change introduced by the
    patch for bug 9812.
    
    Note that this patch makes the favicon customizable by theme,
    not both theme and language.
    
    To test, after applying the patch.
    
    [1] Open pages in the OPAC and staff client.  Verify that the favicon
        is displayed in the usual place in your web browser.  Specific pages
        to test include
    
        - circulation receipts and slips
        - help
        - lists view
        - web-based self-checkout
    
    [2] Verify that the Apache logs do not contain entries like this:
    
    client denied by server configuration: {...}/prog/en/includes/favicon.ico
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Verified that the favicon displays correctly. Also
    tried changing favicons for staff and OPAC using the
    system preferences for those. This still works, where
    the system preferences are correctly supported in the
    templates.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 9eb13aa3cdd47738d42615d6d5dc03b84bf9194c
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Jul 15 15:00:57 2013 +0000

    Bug 10592: fix MARC21 006/008 cataloging plugins
    
    Move the XML and XSD data files so that access to them
    (particularly the XML files) is not blocked by the Apache
    configuration change introduced by the patch for bug 9812.
    
    To test, after applying the patch.
    
    [1] Open a MARC21 bibliographic record in the cataloging editor.
    [2] Click on the plugin link for the 008 field.  Verify that
        that the form for all of the fixed field positions is displayed,
        and verify that you can change the type of material.
    [3] Repeat step 2 for the 006 field.
    [4] Verify that there are no entries in the Apache error log that contain
    
    client denied by server configuration: {...}/cataloguing/value_builder/marc21_field_008.xml
    
    or
    
    client denied by server configuration: {...}/cataloguing/value_builder/marc21_field_006.xml
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Also verified translation of those plugins still works correctly.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 cataloguing/value_builder/marc21_field_006.pl      |    2 +-
 cataloguing/value_builder/marc21_field_008.pl      |    2 +-
 .../value_builder => data}/marc21_field_006.xml    |    0
 .../value_builder => data}/marc21_field_008.xml    |    0
 .../value_builder => data}/marc21_field_CF.xsd     |    0
 .../prog/en/includes/doc-head-close-receipt.inc    |    2 +-
 .../prog/en/includes/doc-head-close.inc            |    2 +-
 .../intranet-tmpl/prog/en/includes/help-top.inc    |    2 +-
 .../intranet-tmpl/prog/en/js/xmlControlfield.js    |    2 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |    2 +-
 .../prog/en/modules/circ/printslip.tt              |    2 +-
 .../prog/en/modules/members/moremember-print.tt    |    2 +-
 .../prog/en/modules/members/moremember-receipt.tt  |    2 +-
 .../prog/en/modules/members/printfeercpt.tt        |    2 +-
 .../prog/en/modules/members/printinvoice.tt        |    2 +-
 .../prog/{en/includes => img}/favicon.ico          |  Bin 1406 -> 1406 bytes
 .../opac-tmpl/ccsr/en/includes/doc-head-close.inc  |    2 +-
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt    |    2 +-
 .../opac-tmpl/prog/en/modules/sco/printslip.tt     |    2 +-
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    2 +-
 .../prog/{en/includes => images}/favicon.ico       |  Bin 1406 -> 1406 bytes
 23 files changed, 18 insertions(+), 18 deletions(-)
 rename koha-tmpl/intranet-tmpl/prog/en/{modules/cataloguing/value_builder => data}/marc21_field_006.xml (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/{modules/cataloguing/value_builder => data}/marc21_field_008.xml (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/{modules/cataloguing/value_builder => data}/marc21_field_CF.xsd (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en/includes => img}/favicon.ico (100%)
 rename koha-tmpl/opac-tmpl/prog/{en/includes => images}/favicon.ico (100%)


hooks/post-receive
-- 
main Koha release repository