[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.05-44-g6bee135

Git repo owner gitmaster at git.koha-community.org
Wed Oct 17 21:35:53 CEST 2012


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.8.x has been updated
       via  6bee13520d96446f26eec858b2670830fd6e6498 (commit)
      from  cd4bdff75ed5ccc1922c92803876c2e9091d1a4c (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 6bee13520d96446f26eec858b2670830fd6e6498
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Sun Sep 23 12:28:49 2012 +0200

    Bug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT
    
    This patch fixes some issues with icons related to materialtypes in NORMARC:
    
    Remove references to opac-tmpl in the *intranet* NORMARC XSLT files.
    
    Add two new icons to koha-tmpl/intranet-tmpl/prog/img/famfamfam/ and
    koha-tmpl/opac-tmpl/lib/famfamfam/
    GR.png - Graphical materials
    TD.png - Three dimentional objects
    
    Copy PR.png from koha-tmpl/intranet-tmpl/prog/img/famfamfam/ to
    koha-tmpl/opac-tmpl/lib/famfamfam/
    
    Rename the XSLT variable materialTypeCode to typeOf008 for increased consistency
    between stylesheets.
    
    Make sure the XSLT uses icons that are actually available.
    
    To test:
    - No use testing all the different permutations of leader pos. 06 and 019b, I think.
    - Set marcflavour = NORMARC and turn on default XSLT for OPAC and Intranet, details
      and results.
    - Make sure you have a record with something relevant in leader position 6, like
      g for movies or c for music
    - Check that the icon turns up in results and details, in the OPAC and Intranet
    - Toggle DisplayOPACiconsXSLT and check that the results in the OPAC are as expected
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    
    Conflicts:
    
    	koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
    	koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../prog/en/xslt/NORMARCslim2intranetDetail.xsl    |   40 ++++++++------------
 .../prog/en/xslt/NORMARCslim2intranetResults.xsl   |   24 +++++------
 .../prog/img/famfamfam/GR.png}                     |  Bin 606 -> 606 bytes
 .../prog/img/famfamfam/TD.png}                     |  Bin 452 -> 452 bytes
 .../silk/picture.png => lib/famfamfam/GR.png}      |  Bin 606 -> 606 bytes
 .../prog/img => opac-tmpl/lib}/famfamfam/PR.png    |  Bin 385 -> 385 bytes
 .../silk/brick.png => lib/famfamfam/TD.png}        |  Bin 452 -> 452 bytes
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl        |   40 ++++++++------------
 .../prog/en/xslt/NORMARCslim2OPACResults.xsl       |   27 ++++++-------
 9 files changed, 56 insertions(+), 75 deletions(-)
 copy koha-tmpl/{opac-tmpl/prog/famfamfam/silk/picture.png => intranet-tmpl/prog/img/famfamfam/GR.png} (100%)
 copy koha-tmpl/{opac-tmpl/prog/famfamfam/silk/brick.png => intranet-tmpl/prog/img/famfamfam/TD.png} (100%)
 copy koha-tmpl/opac-tmpl/{prog/famfamfam/silk/picture.png => lib/famfamfam/GR.png} (100%)
 copy koha-tmpl/{intranet-tmpl/prog/img => opac-tmpl/lib}/famfamfam/PR.png (100%)
 copy koha-tmpl/opac-tmpl/{prog/famfamfam/silk/brick.png => lib/famfamfam/TD.png} (100%)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list