@@ -, +, @@ $('#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(); }); if ($('#pref_OpacNav').size() > 0) { $('#doc3').after(''); $('#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(); }); } --- koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc | 4 ++-- koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 2 -- koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc | 6 +++++- koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc | 12 ++++++------ koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc | 12 ++++++++---- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 8 +++----- koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc | 5 ++++- koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc | 8 +++----- koha-tmpl/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(-) --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc +++ a/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 %] --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc +++ a/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 %] --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc +++ a/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc @@ -1,5 +1,9 @@ +
+[% OpacNav %] +
[% IF IsPatronPage %] [% INCLUDE usermenu.inc %] [% END %] -[% OpacNav %] +
[% OpacNavBottom %] +
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc +++ a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc @@ -1,8 +1,6 @@ -[% IF ( opaccredits ) %] -
- [% opaccredits %] -
-[% END %] +
+ [% opaccredits %] +
@@ -75,8 +73,10 @@ + @@ -94,8 +94,12 @@ [% IF ( SyndeticsCoverImages ) %]$(window).load(function() { verify_images(); });[% END %] - [% IF ( opacuserjs ) %][% opacuserjs %][% END %] - //]]> + //]]> + + + --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -14,9 +14,9 @@ [% END %] - [% IF ( opacheader ) %] - [% opacheader %] - [% END %] +
+ [% opacheader %] +
[% END %]

[% END %] --- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc @@ -1,6 +1,9 @@ +
[% OpacNav %] +
[% IF IsPatronPage %] [% INCLUDE usermenu.inc %] [% END %] +
[% OpacNavBottom %] - +
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc @@ -1,8 +1,6 @@ -[% IF ( opaccredits ) %] -
- [% opaccredits %] -
-[% END %] +
+ [% opaccredits %] +
[% IF ( opaclanguagesdisplay || OpacKohaUrl ) %] --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -27,10 +27,7 @@ [% END %] -[% IF ( OPACResultsSidebar ) %]
-[% OPACResultsSidebar %]
[% END %] [% END %] -[% END %] --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt +++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt @@ -36,8 +36,8 @@

Quote of the Day

[% daily_quote.text %] ~ [% daily_quote.source %]
[% END %] - [% IF ( OpacMainUserBlock ) %]
[% OpacMainUserBlock %]
[% END %] - [% IF ( OpacMainUserBlockMobile ) %]
[% OpacMainUserBlockMobile %]
[% END %] +
[% OpacMainUserBlock %]
+
[% OpacMainUserBlockMobile %]
@@ -68,7 +68,7 @@ [% END %] [% END %] [% END %] - [% IF ( OpacNavRight ) %]
[% OpacNavRight %]
[% END %] +
[% OpacNavRight %]
[% END %] --