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

[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  6b5960cc2a5b69c27a097693f44fcb511f3b53bc (commit)
      from  98bd9de54aa7cab6fe3dec8e7cd88378a06e8684 (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 6b5960cc2a5b69c27a097693f44fcb511f3b53bc
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sat Jun 8 16:16:07 2013 -0400

    Bug 10405: add IDs for customizable OPAC regions
    
    This patch adds unique IDs for:
    opaccredits
    opacheader
    OPACMobileUserCSS
    OpacNavBottom
    OpacUserCSS
    opacuserjs
    
    This is an amended patch which includes the changes to CCSR which I
    forgot to commit before. The patch does not add a unique ID for
    opacheader to CCSR, since opacheader is positioned wrong.
    
    This is most useful for previewing changes you make in the OPAC
    preferences using the following javascript in your IntranetUserJS:
    
    function showPreview(url) {
        $('#preview-loading').show();
        document.getElementById('opac-preview').src = url;
        $('#opac-preview').load(function () {
            $('#opac-preview').show();
            $('#region-opaccredits', $('#opac-preview').contents()).html($('#pref_opaccredits').val());
            $('#region-opacheader', $('#opac-preview').contents()).html($('#pref_opacheader').val());
            $('#opacmainuserblock', $('#opac-preview').contents()).html($('#pref_OpacMainUserBlock').val());
            $('#opacmainuserblockmobile', $('#opac-preview').contents()).html($('#pref_OpacMainUserBlockMobile').val());
            $('#region-opacnav', $('#opac-preview').contents()).html($('#pref_OpacNav').val());
            $('#region-opacnavbottom', $('#opac-preview').contents()).html($('#pref_OpacNavBottom').val());
            $('#opacrightsidebar', $('#opac-preview').contents()).html($('#pref_OpacNavRight').val());
            $('#noresultsfound', $('#opac-preview').contents()).html($('#pref_OPACNoResultsFound').val());
            $('#opacresultssidebar', $('#opac-preview').contents()).html($('#pref_OPACResultsSidebar').val());
            $('#region-opacusercss', $('#opac-preview').contents()).replaceWith('<style id="region-opacusercss" type="text/css">' + $('#pref_OPACUserCSS').val() + '</style>');
    
            $('#region-opacuserjs', $('#opac-preview').contents()).replaceWith('<script id="region-opacuserjs" type="text/javascript">' + $('#pref_opacuserjs').val() + '</script>');
            $('#preview-loading').hide();
        });
    }
    
    $(document).ready(function () {
        if ($('#pref_OpacNav').size() > 0) {
            $('#doc3').after('<div class="navbar navbar-fixed-bottom" style="z-index: 10000;"><div id="preview-pane" class="navbar-inner"><h4 style="float: left; margin-right: 2em;">Preview changes</h4><div class="btn-group" data-toggle="buttons-radio"><button type="button" class="btn" id="preview-main">Main page</button><button type="button" class="btn" id="preview-results">Results</button><button type="button" class="btn" id="preview-details">Details</button><button type="button" class="btn active" id="preview-hide">Hide</button></div><img id="preview-loading" style="display: none;" src="/intranet-tmpl/prog/img/loading-small.gif"><iframe id="opac-preview" style="height: 20em; width: 100%; display: none;"></iframe></div></div>');
    
            $('#preview-main').click(function () {
                showPreview('/cgi-bin/koha/opac/opac-main.pl');
            });
            $('#preview-results').click(function () {
                showPreview('/cgi-bin/koha/opac/opac-search.pl?idx=&q=pqf%3D%40attr+1%3D_ALLRECORDS+%40attr+2%3D103+%22%22&branch_group_limit=');
            });
            $('#preview-details').click(function () {
                showPreview('/cgi-bin/koha/opac/opac-detail.pl?biblionumber=1');
            });
            $('#preview-hide').click(function () {
                $('#opac-preview').hide();
                $('#preview-loading').hide();
            });
        }
    });
    
    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Note: The provided JavaScript didn't work for me and resulted in an
    error in Firebug. Ater talking to Jared it seems like there is more needed
    than the bit of Javascript so make this work, but it might be a good
    starting point, so I am leaving it in the commit message.
    
    Passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 .../opac-tmpl/ccsr/en/includes/doc-head-close.inc  |    4 ++--
 koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc  |    2 --
 .../opac-tmpl/ccsr/en/includes/navigation.inc      |    6 +++++-
 .../opac-tmpl/ccsr/en/includes/opac-bottom.inc     |   12 ++++++------
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |   12 ++++++++----
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    8 +++-----
 .../opac-tmpl/prog/en/includes/navigation.inc      |    5 ++++-
 .../opac-tmpl/prog/en/includes/opac-bottom.inc     |    8 +++-----
 .../opac-tmpl/prog/en/includes/opac-facets.inc     |    3 ---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt   |    6 +++---
 10 files changed, 34 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
main Koha release repository