[koha-commits] main Koha release repository branch master updated. v3.14.00-599-g8a9cdcd

[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  8a9cdcd3bcce07ace793b9b2a6ad31f4604961a2 (commit)
       via  20d0aff0e88544cdddfb4a6b90fc73ed652c84bd (commit)
      from  4edcec3d5812b159b7012c43a04577bfd7e462bc (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 8a9cdcd3bcce07ace793b9b2a6ad31f4604961a2
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Mar 11 10:58:44 2014 -0400

    Bug 10415 - Add course reserves to staff client home page
    
    A link to course reserves is in the global header menu but not on the
    home page. All links from the global header should be present on the
    home page as well. This patch adds it.
    
    To test, apply the patch and if necessary clear your browser cache. View
    the staff client home page. If you have "UseCourseReserves" enabled you
    should see a link for the course reserves page which is visually
    consistent with the other module links. If you do not have course
    reserves enabled you should not see the link.
    
    Unrelated: I positioned the admin link after the tools link because it
    bugged me.
    
    Signed-off-by: Broust <jean-manuel.broust at univ-lyon2.fr>
    Signed-off-by: marjorie barry-vila <marjorie.barry-vila at ccsr.qc.ca>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script, works as described.
    Course reserves is still accessible without permissions, but
    you can't make any changes to the reserves then.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 20d0aff0e88544cdddfb4a6b90fc73ed652c84bd
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Feb 26 11:03:18 2014 +0100

    Bug 11845 - set overlay and import status translatable in addorderiso2709.tt
    
    In addorderiso2709.tt, the text for overlay and import status come from
    database and was not translatable.  Ths patch fixes that.
    
    Same as Bug 10170.
    
    Test plan :
    - Go to acquisition module
    - Display an open basket
    - Click on "From a staged file"
    - Look at table
    => Without patch, you see codes in "Status" column : staged, imported, ...
    => With patch, you see descriptions in "Status" column : Staged, Imported, ...
    - Click on a "Add orders"
    - Look at table
    => Without patch, you see codes in "Match?" column : no_match, auto_match, ...
    => With patch, you see descriptions in "Match?" column : No match, Match found, ...
    
    Signed-off-by: Nathalie CHATILLON <nathalie.chatillon at uhb.fr>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    This is an improvement. Only the translation of auto_match as Match found
    could perhaps be further improved.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css   |    2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    1 +
 .../prog/en/modules/acqui/addorderiso2709.tt       |   30 ++++++++++++++++++--
 .../intranet-tmpl/prog/en/modules/intranet-main.tt |   17 +++++++----
 .../prog/img/staff-home-icons-sprite.png           |  Bin 11151 -> 5262 bytes
 .../staff-home-icons-sprite.psd                    |  Bin 117814 -> 126748 bytes
 6 files changed, 42 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository