From e3b9756d3fa06a6b6636333bc6cae8605ae95ae1 Mon Sep 17 00:00:00 2001
From: Jared Camins-Esakov
Date: Sat, 8 Jun 2013 16:16:07 -0400
Subject: [PATCH] [PASSED QA] Bug 10405: add IDs for custom 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('');
$('#region-opacuserjs', $('#opac-preview').contents()).replaceWith('');
$('#preview-loading').hide();
});
}
$(document).ready(function () {
if ($('#pref_OpacNav').size() > 0) {
$('#doc3').after('
Preview changes
');
$('#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
Signed-off-by: Katrin Fischer
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.
---
.../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(-)
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
index fcbab2a..cec9434 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
@@ -27,8 +27,8 @@
[% IF ( bidi ) %]
[% END %]
-[% IF ( OPACMobileUserCSS ) %][% END %]
-[% IF ( OPACUserCSS ) %][% END %]
+
+
[% IF persona %]
[% END %]
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
index ec699f4..bb62261 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
@@ -313,11 +313,9 @@
You did not specify any search criteria.
[% END %]
-[% IF ( OPACNoResultsFound ) %]
[% OPACNoResultsFound %]
-[% END %]
[% END %][% END %]
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc
index fe56488..c3c25e6 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc
@@ -1,5 +1,9 @@
+
+[% OpacNav %]
+
[% IF IsPatronPage %]
[% INCLUDE usermenu.inc %]
[% END %]
-[% OpacNav %]
+