From 0a8fa52649ca25b7e6f6425ded46018329232c62 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 15 Apr 2015 12:39:05 +0200 Subject: [PATCH] Bug 10172: Hide some uneeded stuffs on printing a record When printing a record from the OPAC or the staff interface, some uneeded blocks are displayed. OPAC: 1/ Browse results 2/ The view tags (Normal, MARC, ISBD) Intranet: 1/ Marc view link 2/ The Please upload one image link Test plan: On a record detail page (staff and OPAC), print the page and confirm these blocks no longer appear. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 68f0fe7b6f152a6db100525724c1ece507258652) Signed-off-by: Chris Cormack Conflicts: koha-tmpl/intranet-tmpl/prog/en/css/print.css Signed-off-by: Liz Rea --- koha-tmpl/intranet-tmpl/prog/en/css/print.css | 8 +++++++- .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/print.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/less/print.less | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/print.css b/koha-tmpl/intranet-tmpl/prog/en/css/print.css index 239059c75b..c71c62ba71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/print.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/print.css @@ -322,4 +322,10 @@ fieldset { } #cataloguing_additem_itemlist { overflow : visible !important; -} \ No newline at end of file +} + +#catalogue_detail_marc_preview, +p#upload_image +{ + display: none; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index a392e1afde..7fa0dcc535 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -86,7 +86,7 @@ function verify_images() { var please_upload = _("Please %supload%s one.").format( "", ""); - no_images_msg += "

" + please_upload + '

'; + no_images_msg += "

" + please_upload + '

'; [% END %] $('#images').html(no_images_msg); diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/print.css b/koha-tmpl/opac-tmpl/bootstrap/css/print.css index 5d9b74445a..95913f6f43 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/print.css +++ b/koha-tmpl/opac-tmpl/bootstrap/css/print.css @@ -1 +1 @@ -.noprint{display:none}a:link{color:#006;text-decoration:none}a:visited{color:#006;text-decoration:none}a:hover{color:#930;text-decoration:none}a[href]:after{display:none}body{background-color:#fff;color:#333;font-family:arial,geneva,sans-serif;font-size:14px;margin:0 0 0 0;word-wrap:break-word}caption{color:#006;font-size:18px;font-weight:bold;margin-top:5px;text-align:left}div.table{width:100%}form{margin:0;padding:0}h1{color:#006;font-size:22px;font-weight:bold;margin-bottom:3px;margin-top:3px}h2{color:#006;font-size:20px;font-weight:bold;margin-bottom:3px;margin-top:3px}h3{color:#006;font-size:18px;font-weight:bold;margin-bottom:3px;margin-top:3px}h4{color:#006;font-size:16px;font-weight:bold;margin-bottom:3px;margin-top:3px}h5{color:#006;font-size:15px;font-weight:bold;margin-bottom:1px;margin-top:1px}h6{color:#006;font-size:14px;font-weight:bold;margin-bottom:1px;margin-top:1px}p{margin-top:0}table{background-color:#fff;border-bottom:0 solid #ccc;border-collapse:collapse;border-left:0 solid #ccc;margin:3px 0 5px 0;padding:0;width:99%}td{background-color:#fff;border-bottom:1px solid #ccc;border-right:1px solid #ccc;padding:5px 5px 5px 5px;vertical-align:top}td:last-child{background-color:#fff;border-bottom:1px solid #ccc;border-right:0 solid #ccc;padding:5px 5px 5px 5px;vertical-align:top}th{background-color:#e9e9e9;border-bottom:1px solid #ccc;border-right:1px solid #ccc;font-weight:bold;padding:5px 5px 5px 5px}th:last-child{background-color:#e9e9e9;border-bottom:1px solid #ccc;border-right:0 solid #ccc;font-weight:bold;padding:5px 5px 5px 5px}tr.highlight{background-color:#e9e9e9}body#basket tr.highlight{background-color:transparent}body#basket a{font-weight:bold}body#basket table{border-top:1px solid #eee;border-left:1px solid #eee}body#basket td,body#basket th{background-color:transparent;padding:2px}body#basket th{background-color:#eee}body#basket th,body#basket th[scope=col]{text-align:center;vertical-align:middle}body#basket th[scope=row]{font-size:89%;text-align:right;vertical-align:top;width:10%}body#basket p{font-size:85%;margin:.2em 0;text-indent:.5em}.error{font-weight:bold}.ex{font-family:"Courier New",Courier,monospace}.inline{display:inline}.screen{display:none}#bookcover{float:left;margin:0;padding:0}#members,#opac-main-search,#opac-user-views .ui-tabs-nav,input,h2 span.hint,td.resultscontrol,.pages,.suggestion,.views,#action,#export,#bibliodescriptions .ui-tabs-nav,#addshelf,fieldset.action,.list-actions,.ft,#facetcontainer,.results_summary.actions,.koha_url,.yui-b{display:none}#userresults{position:absolute;right:0;word-wrap:break-word;display:block}div#userupdate input,div#userupdate textarea{display:inline;border:0}#yui-main,#yui-main .yui-b,.yui-t1 #yui-main .yui-b{display:block !important;margin:0 !important;padding:0 !important;width:auto !important;float:none !important}.navbar,#navigation,.pages,.actions,#toolbar,#selections-toolbar,#remove-selected,.breadcrumb,#members,#opac-main-search,#opac-user-views .ui-tabs-nav,input,h2 span.hint,td.resultscontrol,.pages,.suggestion,.views,#action,#export,#bibliodescriptions .ui-tabs-nav,#addshelf,fieldset.action,.list-actions,.ft,#facetcontainer,.results_summary.actions,.koha_url,.yui-b{display:none}.row-fluid{margin-top:30px} \ No newline at end of file +.noprint{display:none}a:link{color:#006;text-decoration:none}a:visited{color:#006;text-decoration:none}a:hover{color:#930;text-decoration:none}a[href]:after{display:none}body{background-color:#fff;color:#333;font-family:arial,geneva,sans-serif;font-size:14px;margin:0 0 0 0;word-wrap:break-word}caption{color:#006;font-size:18px;font-weight:bold;margin-top:5px;text-align:left}div.table{width:100%}form{margin:0;padding:0}h1{color:#006;font-size:22px;font-weight:bold;margin-bottom:3px;margin-top:3px}h2{color:#006;font-size:20px;font-weight:bold;margin-bottom:3px;margin-top:3px}h3{color:#006;font-size:18px;font-weight:bold;margin-bottom:3px;margin-top:3px}h4{color:#006;font-size:16px;font-weight:bold;margin-bottom:3px;margin-top:3px}h5{color:#006;font-size:15px;font-weight:bold;margin-bottom:1px;margin-top:1px}h6{color:#006;font-size:14px;font-weight:bold;margin-bottom:1px;margin-top:1px}p{margin-top:0}table{background-color:#fff;border-bottom:0 solid #ccc;border-collapse:collapse;border-left:0 solid #ccc;margin:3px 0 5px 0;padding:0;width:99%}td{background-color:#fff;border-bottom:1px solid #ccc;border-right:1px solid #ccc;padding:5px 5px 5px 5px;vertical-align:top}td:last-child{background-color:#fff;border-bottom:1px solid #ccc;border-right:0 solid #ccc;padding:5px 5px 5px 5px;vertical-align:top}th{background-color:#e9e9e9;border-bottom:1px solid #ccc;border-right:1px solid #ccc;font-weight:bold;padding:5px 5px 5px 5px}th:last-child{background-color:#e9e9e9;border-bottom:1px solid #ccc;border-right:0 solid #ccc;font-weight:bold;padding:5px 5px 5px 5px}tr.highlight{background-color:#e9e9e9}body#basket tr.highlight{background-color:transparent}body#basket a{font-weight:bold}body#basket table{border-top:1px solid #eee;border-left:1px solid #eee}body#basket td,body#basket th{background-color:transparent;padding:2px}body#basket th{background-color:#eee}body#basket th,body#basket th[scope=col]{text-align:center;vertical-align:middle}body#basket th[scope=row]{font-size:89%;text-align:right;vertical-align:top;width:10%}body#basket p{font-size:85%;margin:.2em 0;text-indent:.5em}.error{font-weight:bold}.ex{font-family:"Courier New",Courier,monospace}.inline{display:inline}.screen{display:none}#bookcover{float:left;margin:0;padding:0}#members,#opac-main-search,#opac-user-views .ui-tabs-nav,input,h2 span.hint,td.resultscontrol,.pages,.suggestion,.views,#action,#export,#bibliodescriptions .ui-tabs-nav,#addshelf,fieldset.action,.list-actions,.ft,#facetcontainer,.results_summary.actions,.koha_url,.yui-b{display:none}#userresults{position:absolute;right:0;word-wrap:break-word;display:block}div#userupdate input,div#userupdate textarea{display:inline;border:0}#yui-main,#yui-main .yui-b,.yui-t1 #yui-main .yui-b{display:block !important;margin:0 !important;padding:0 !important;width:auto !important;float:none !important}.navbar,#navigation,.pages,.actions,#toolbar,#selections-toolbar,#remove-selected,.breadcrumb,#members,#opac-main-search,#opac-user-views .ui-tabs-nav,input,h2 span.hint,td.resultscontrol,.pages,.suggestion,.views,#action,#export,#bibliodescriptions .ui-tabs-nav,#addshelf,fieldset.action,.list-actions,.ft,#facetcontainer,.results_summary.actions,.koha_url,.yui-b{display:none}.row-fluid{margin-top:30px}#views,#ulactioncontainer{display:none} \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/bootstrap/less/print.less b/koha-tmpl/opac-tmpl/bootstrap/less/print.less index d6ff8946bf..92153cc04c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/less/print.less +++ b/koha-tmpl/opac-tmpl/bootstrap/less/print.less @@ -238,3 +238,8 @@ div#userupdate input,div#userupdate textarea { .row-fluid { margin-top: 30px; } + +#views, +#ulactioncontainer { + display: none; +} -- 2.39.5