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

Sun Jun 30 17:24:48 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  33c12cf39588aa022eacaa0bca403c373a6bf8d5 (commit)
       via  905292b6328bbc847b1b932fc15dfef9e9845295 (commit)
      from  93e87ca0b61611fc35238bf13eb226f477cf9c4e (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 33c12cf39588aa022eacaa0bca403c373a6bf8d5
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Jun 14 15:55:02 2013 -0700

    Bug 8884: (follow-up) rearrange placement of the top-bar div in CCSR

    This patch makes it easier to avoid having the top bar
    overlap other OPAC page content (particularly custom
    header content set via the opacheader system preference).

    This is done by moving the top-nav div outside of the
    main doc3 div and adjusting the CSS accordingly.  Yes,
    this does end up having top-nav.inc be included from
    opac-bottom.inc, but it would require touching rather
    more templates to have it be included immediately after
    the <body> tag.

    This patch also removes a duplicate instance of the
    cmspan span.

    To test:

    [1] Change to the CCSR OPAC theme.
    [2] Before applying the patch, open a set of OPAC
        pages (e.g., main page, user page, search results, bib
        details) in your web browser.
    [3] Apply the patch, and open the same OPAC pages in separate
        tabs.  Comparing the pre- and post- version of each page
        to verify that the placement
    [4] Add an OpAC header using the opacheader system preference.
    [5] Verify that the header is displayed without overlapping
        the top bar.

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

commit 905292b6328bbc847b1b932fc15dfef9e9845295
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Mon May 20 12:55:17 2013 -0400

    Bug 8884: opacheader is not in the header on CCSR

    In CCSR the opacheader preference isn't really in the header it's to the
    right of the search box (see attached). I'm okay with a customizable
    region over there, but we should have a new preference for that and
    header should be above the search box as it implies.

    To test:
    1) Put something in the OpacHeader syspref. Preferably something large
       and header-like for maximum effect.
    2) Select CCSR theme.
    3) View OPAC. Notice placement of "header" content.
    4) Apply patch.
    5) View OPAC. Notice placement of "header" content.
    6) Sign off.

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes koha-qa.pl, works as advertised with one caveat; the content of
    opacheader is by default underneath the div "top-bar". A couple breaks
    in my OpacHeader test made it visible, so I'm going to assume this is a
    styling issue and not a bug as such.

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

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

Summary of changes:
 koha-tmpl/opac-tmpl/ccsr/en/css/colors.css         |    1 -
 koha-tmpl/opac-tmpl/ccsr/en/css/opac.css           |    4 +
 koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc  |   82 +-------------------
 .../opac-tmpl/ccsr/en/includes/opac-bottom.inc     |    7 ++
 koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc   |   73 +++++++++++++++++
 5 files changed, 88 insertions(+), 79 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc

hooks/post-receive
-- 
main Koha release repository