From 53de55f74bad2eb5d5894461621e2dd5b5a64f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> Date: Sat, 31 Jan 2015 18:41:08 +0200 Subject: [PATCH] Bug 12399 - opaccredits printing at top on printable version This patch introduces a new class "noprint" in koha-tmpl/opac-tmpl/bootstrap/css/print.css With this class, unwanted elements can be hidden when printing. To test: In OPAC, do a search with many results (> 1 Page) Print page or do a print preview See that footer elements are not displayed correctly (as of screenshot in comment #1) and that on top of page 2 the language selector overlays the list Apply patch Repeat steps above. Verify that printed page looks much nicer now by hiding unwanted elements (including e.g. RSS icon, toolbar etc.) This mechanism can be used on other pages as well. Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> --- koha-tmpl/opac-tmpl/bootstrap/css/print.css | 4 ++++ koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 10 +++++----- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/print.css b/koha-tmpl/opac-tmpl/bootstrap/css/print.css index a1034f1..bd2c6fb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/print.css +++ b/koha-tmpl/opac-tmpl/bootstrap/css/print.css @@ -1,3 +1,7 @@ +.noprint { + display : none; +} + a:link { color : #000066; text-decoration: none; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 904c232..f385727 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -1,6 +1,6 @@ [% USE Koha %] <div id="wrap"> - <div id="header-region"> + <div id="header-region" class="noprint"> <div class="navbar navbar-inverse navbar-static-top"> <div class="navbar-inner"> <div class="container-fluid"> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 0220d26..a79e84e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -3,7 +3,7 @@ <div class="container-fluid"> <div class="row-fluid"> <div class="span12"> - <div id="opaccredits"> + <div id="opaccredits" class="noprint"> [% opaccredits %] </div> </div> @@ -15,7 +15,7 @@ <div class="container-fluid"> <div class="row-fluid"> <div class="span12"> - <div id="koha_url" class="clearfix"> + <div id="koha_url" class="clearfix noprint"> <p>Powered by [% IF template.name.match('opac-main.tt') %] <a class="koha_url" href="http://koha-community.org">Koha</a> @@ -33,7 +33,7 @@ [% IF ( opaclanguagesdisplay ) %] [% IF ( languages_loop && opaclanguagesdisplay ) %] [% UNLESS ( one_language_enabled ) %] - <div id="changelanguage" class="navbar navbar-fixed-bottom navbar-static-bottom"> + <div id="changelanguage" class="navbar navbar-fixed-bottom navbar-static-bottom noprint"> <div class="navbar-inner"> <ul id="i18nMenu" class="nav"> <li><p class="lang navbar-text"><strong>Languages: </strong></p></li> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc index 1c113d8..b234928 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc @@ -2,7 +2,7 @@ <div class="pagination pagination-small"> <ul> [% IF ( previous_page_offset.defined ) %] - <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% previous_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]">« Previous</a></li> + <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% previous_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]" class="noprint">« Previous</a></li> [% END %] [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %] [% IF ( PAGE_NUMBER.highlight ) %] @@ -12,7 +12,7 @@ [% END %] [% END %] [% IF ( next_page_offset ) %] - <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% next_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]">Next »</a></li> + <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% next_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]" class="noprint">Next »</a></li> [% END %] </ul> </div> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 9a15d84..2d7ccf6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -41,7 +41,7 @@ <strong>No results found!</strong> <p> [% IF ( searchdesc ) %] - No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi | html | url %]&format=rss2" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> + No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi | html | url %]&format=rss2" class="rsssearchlink noprint"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> [% ELSE %] You did not specify any search criteria. [% END %] @@ -80,7 +80,7 @@ [% END %] ). [% END %] - <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi |html | url %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> + <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi |html | url %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink noprint"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> [% END # / IF total %] </p> [% END # / IF searchdesc %] @@ -126,7 +126,7 @@ <div id="toolbar" class="toolbar clearfix"> [% IF ( OpacHighlightedWords ) %] - <div class="highlight_controls"> + <div class="highlight_controls noprint"> <a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a> <a href="#" class="highlight_toggle" id="highlight_toggle_on">Highlight</a> </div> @@ -137,7 +137,7 @@ </div> </div> <!-- / #toolbar --> - <div id="selections-toolbar" class="toolbar"> + <div id="selections-toolbar" class="toolbar noprint"> <!-- checkall, clearall are now needed for placehold --> <span class="checkall"></span> <span class="clearall"></span> <span class="sep">|</span> @@ -468,7 +468,7 @@ </div> <!-- / .results_summary --> [% END # / IF OpacStarRatings %] - <div class="actions-menu"> + <div class="actions-menu noprint"> [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %] [% UNLESS ( SEARCH_RESULT.norequests ) %] [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && AllowOnShelfHolds ) %] -- 1.7.10.4