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

Thu May 23 17:57:55 CEST 2013

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  27a1017e44eb0ef67d8fe028a8e74b1a4c1e48eb (commit)
       via  de3280088b9184e55ca06ae51a25ecffc0bc92f2 (commit)
       via  70855acfea86c663f1258488294bb6542a9d5567 (commit)
       via  f1bc4eff4ce5060b7c2b01c5b39e2da005c83e41 (commit)
       via  81937d1d790ed09bf8f28b25774e7416fc7c9f8c (commit)
      from  3a29a06955ab247a306d356ab107e10738fcace8 (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 27a1017e44eb0ef67d8fe028a8e74b1a4c1e48eb
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu May 23 09:04:44 2013 -0700

    bug 10052: DBrev 3.13.00.005

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit de3280088b9184e55ca06ae51a25ecffc0bc92f2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon May 13 09:05:55 2013 +0200

    Bug 10052: QA Followup

    As Katrin pointed out, the intranetstylesheet setting was not respected in the
    help pages. The script help.pl does not use get_template_and_user which sets
    these variables via Auth.pm but calls gettemplate.
    This makes it necessary to 'manually' set them. This patch does that.
    Evidently, this could be the case for some other templates vars too..

    Test plan:
    Apply all patches for 10052.
    Change intranetstylesheet. Check a help page.
    Change intranetcolorstylesheet. Check a help page.

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Looks all good to me now.
    Passes tests and still no string changes.
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 70855acfea86c663f1258488294bb6542a9d5567
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Apr 15 13:01:45 2013 +0200

    Bug 10052 Followup for edithelp.tt and help-top.inc

    A grep on the stylesheet names revealed that similar code was used in those
    template files.
    This patch moves the code from doc-head-close.inc to a new include file.
    Now, doc-head-close and the help templates refer to that one file.

    Test plan:
    If you tested the preceding two patches, now you only need to:
    1) Check included css via page source in browser from staff main page.
    2) Check it also from some other location.
    3) Check again from Help: e.g. /cgi-bin/koha/help.pl
    4) Check again from Edit Help: /cgi-bin/koha/edithelp.pl

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Template only, no string changes.
    Tested according to test plan.
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit f1bc4eff4ce5060b7c2b01c5b39e2da005c83e41
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Apr 15 11:11:20 2013 +0200

    Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts

    Allow a relative path (within theme/css) in intranetstylesheet too.
    Allow a full path, local or remote with http(s), in intranetcolorstylesheet.
    This restores consistency between opac and staff.

    Test plan:
    First: the patch with the db revision should have been applied. And also the
    updatestructure step from the web installer should have been run.

    Clear intranetstylesheet. Check included stylesheet with page source in browser.
    Enter a full path with http or / in intranetstylesheet. Check again.
    Enter a relative path (such as staff-global.css). Check again.

    Clear intranetcolorstylesheet. Check if there is no reference with page source.
    Enter a full path with http or / in intranetcolorstylesheet. Check reference.
    Enter a relative path (such as blue.css). Check again.

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 81937d1d790ed09bf8f28b25774e7416fc7c9f8c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Apr 15 12:06:31 2013 +0200

    Bug 10052: Db revision for intranetstylesheet

    Report 10052 makes the intranetstylesheet prefs behave like the opac ones.
    This patch contains an optional db revision: If the pref intranetstylesheet is
    not blank, and does not start with http, https or /, then prefix it with a
    slash to make it an absolute path.

    Test plan:
    Before applying this patch:
    1) Put intranet-tmpl/prog/en/css/staff-global.css into intranetstylesheet.
    This works in the current staff client, but will be interpreted as relative as
    soon as both patches for this report have been applied.
    Apply the patch. And run: /cgi-bin/koha/installer/install.pl?step=3&op=updatestructure
    Check the webinstaller warning and the pref value. There should be a slash
    in front now. The css should still work.

    Continue after applying this patch with:
    2) Clear the intranetstylesheet pref. Run updatestructure again. No message: OK
    3) Put /intranet-tmpl/prog/en/css/staff-global.css in intranetstylesheet.
    Run updatestructure again. No message: OK
    4) Prefix intranetstylesheet with http://[your-server-here]. Test again.

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Comments on last patch.
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 help.pl                                            |    6 +++++-
 installer/data/mysql/updatedatabase.pl             |   14 ++++++++++++++
 .../prog/en/includes/doc-head-close.inc            |   11 +----------
 .../intranet-tmpl/prog/en/includes/help-top.inc    |   10 +---------
 .../prog/en/includes/intranetstylesheet.inc        |   15 +++++++++++++++
 .../en/modules/admin/preferences/staff_client.pref |    8 ++++----
 .../intranet-tmpl/prog/en/modules/help/edithelp.tt |    9 +--------
 kohaversion.pl                                     |    2 +-
 8 files changed, 42 insertions(+), 33 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc

hooks/post-receive
-- 
main Koha release repository