From 826e35ffac56a77c515593f8bbc43955fe9ec67b Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 17 Apr 2014 15:10:16 +0000 Subject: [PATCH] Get mail print working for idot and pixelegg templates --- mail/templates/default/app.css | 9 ++++++--- mail/templates/pixelegg/app.css | 16 ++++++++++------ phpgwapi/templates/idots/print.css | 14 ++++++++++++-- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css index eb653cc7dd..293fe709d7 100644 --- a/mail/templates/default/app.css +++ b/mail/templates/default/app.css @@ -682,15 +682,18 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible { .tmpPrintDiv { margin-top: 10px; margin-bottom: 30px; + display: block; + overflow: visible; + height: auto; } .mailDisplayContainer { border: none; - overflow: visible; - position: static; + overflow: visible !important; + position: static !important; } .mailDisplayAttachments{ border: none; - position: inherit; + position: inherit !important; } .et2_button { display: none; diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index 2ad3ba1988..9d37c3c887 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -675,17 +675,21 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible { .tmpPrintDiv { margin-top: 10px; margin-bottom: 30px; + display: block; + overflow: visible; + height: auto; } .mailDisplayContainer { border: none; - overflow: visible; - position: static; + overflow: visible !important; + position: static !important; } - .mailDisplayAttachments, - #mail-display_mail_displayattachments { - display: none; + .mailDisplayAttachments { border: none; - position: inherit; + position: inherit !important; + } + .et2_button { + display: none; } } #popupMainDiv { diff --git a/phpgwapi/templates/idots/print.css b/phpgwapi/templates/idots/print.css index 82c2c40900..494cf07c89 100644 --- a/phpgwapi/templates/idots/print.css +++ b/phpgwapi/templates/idots/print.css @@ -7,7 +7,7 @@ @media print { -#divLogo,#divAppIconBar,#tdSidebox,#divStatusBar,#sideboxdragarea,.noPrint,#topmenu { +#divLogo,#divAppIconBar,#tdSidebox,#divStatusBar,#sideboxdragarea,.noPrint,#topmenu, #egw_message { display:none; } @@ -24,6 +24,9 @@ #divAppboxHeader { background: none; } +.et2_toolbar div { + display: none; +} /* all tables */ table { @@ -82,4 +85,11 @@ input, select, textarea { color: black; } -} /* @media print */ \ No newline at end of file +} /* @media print */ + +@media screen { + .tmpPrintDiv { + display: none; + height: auto; + } +} \ No newline at end of file