[koha-commits] main Koha release repository branch master updated. v3.22.00-395-g961cdd9

Git repo owner gitmaster at git.koha-community.org
Wed Jan 27 06:54:00 CET 2016


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  961cdd90cd89cdf2c379e833be185e0d5aede622 (commit)
       via  95f86e18f2b3501df2bd89251ac3295e51d32e3d (commit)
       via  f25f0aa254a11b12493466e6c733d90df0df11a5 (commit)
      from  132ef99cf0a69668b318b38d4090152ff2880ca2 (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 961cdd90cd89cdf2c379e833be185e0d5aede622
Author: Marc Véron <veron at veron.ch>
Date:   Wed Jan 6 06:35:35 2016 +0100

     Bug 15288: (followup) Better wording for OPAC error page
    
    This patch changes the wording of the OPAC error page (See Bug 14573).
    
    Additionally, it displays the link to the login page only if the system
    preference 'opacuserlogin' is set.
    
    To test:
    - Apply patch
    - Review koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    No errors
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended: Replaced following reasons by 'the following reasons'. Reads better.
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit 95f86e18f2b3501df2bd89251ac3295e51d32e3d
Author: Marc Véron <veron at veron.ch>
Date:   Thu Dec 3 05:16:55 2015 +0100

     Bug 15288: (followup) Remove obsolete *.tt files
    
    Follwoing files were not yet deleted:
    
    koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/400.tt
    koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/401.tt
    koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/402.tt
    koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/403.tt
    koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/500.tt
    
    Note: the 404.tt file was renamed to errorpage.tt
    
    To test: Verify that files are deleted.
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Files removed, new errorpage.tt added
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit f25f0aa254a11b12493466e6c733d90df0df11a5
Author: Marc Véron <veron at veron.ch>
Date:   Wed Dec 2 09:49:02 2015 +0100

     Bug 15288: Error pages: Code duplication removal and better translatability
    
    This patch changes the 400, 401, 402, 403, 404, 500 error pages to be handled
    by only one template for staff and only one template for OPAC.
    
    Additionally it removes a translatability issues due to sentence splitings by html tags.
    
    To test:
    - Apply patch
    - Trigger 404 error for staff and for OPAC by calling a page that does not exist
    - Try to trigger other error pages and/or carefully review code changes
      in the *.pl files
    - Review koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt and
      koha-tmpl/intranet-tmpl/prog/en/modules/errorpage.tt
    
    (Amended to fix a typo)
    (Amended for comment #6)
    (Amended to cover OPAC error pages as well)
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Works as advertised
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

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

Summary of changes:
 errors/400.pl                                      |    7 +-
 errors/401.pl                                      |    7 +-
 errors/402.pl                                      |    7 +-
 errors/403.pl                                      |    7 +-
 errors/404.pl                                      |    7 +-
 errors/500.pl                                      |    7 +-
 .../intranet-tmpl/prog/en/modules/errors/400.tt    |   29 -------
 .../intranet-tmpl/prog/en/modules/errors/401.tt    |   30 --------
 .../intranet-tmpl/prog/en/modules/errors/402.tt    |   29 -------
 .../intranet-tmpl/prog/en/modules/errors/403.tt    |   29 -------
 .../intranet-tmpl/prog/en/modules/errors/405.tt    |   29 -------
 .../intranet-tmpl/prog/en/modules/errors/500.tt    |   29 -------
 .../en/modules/errors/{404.tt => errorpage.tt}     |   16 ++--
 .../opac-tmpl/bootstrap/en/modules/errors/400.tt   |   44 -----------
 .../opac-tmpl/bootstrap/en/modules/errors/401.tt   |   45 -----------
 .../opac-tmpl/bootstrap/en/modules/errors/402.tt   |   44 -----------
 .../opac-tmpl/bootstrap/en/modules/errors/403.tt   |   44 -----------
 .../opac-tmpl/bootstrap/en/modules/errors/404.tt   |   54 -------------
 .../opac-tmpl/bootstrap/en/modules/errors/500.tt   |   44 -----------
 .../bootstrap/en/modules/errors/errorpage.tt       |   80 ++++++++++++++++++++
 opac/errors/400.pl                                 |    7 +-
 opac/errors/401.pl                                 |    7 +-
 opac/errors/402.pl                                 |    7 +-
 opac/errors/403.pl                                 |    7 +-
 opac/errors/404.pl                                 |    7 +-
 opac/errors/500.pl                                 |    7 +-
 26 files changed, 148 insertions(+), 482 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt
 rename koha-tmpl/intranet-tmpl/prog/en/modules/errors/{404.tt => errorpage.tt} (77%)
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/400.tt
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/401.tt
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/402.tt
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/403.tt
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/404.tt
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/500.tt
 create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list