forked from extern/egroupware
Mobile theme W.I.P.:
- Fix mail preview does not show calendar meeting mails
This commit is contained in:
parent
20a191464b
commit
209b6de3a2
@ -5282,9 +5282,24 @@ app.classes.mail = AppJS.extend(
|
||||
// Request email body from server
|
||||
iframe.set_src(egw.link('/index.php',{menuaction:'mail.mail_ui.loadEmailBody',_messageID:id}));
|
||||
jQuery(iframe.getDOMNode()).on('load',function(){
|
||||
// Use prepare print function to copy iframe content into div
|
||||
// as we don't want to show content in iframe.
|
||||
self.mail_prepare_print(jQuery(this));
|
||||
|
||||
if (jQuery(this.contentWindow.document.body).find('#calendar-meeting').length > 0)
|
||||
{
|
||||
var frame = this;
|
||||
jQuery(this).show();
|
||||
// calendar meeting mails still need to be in iframe, therefore, we calculate the height
|
||||
// and set the iframe with a fixed height to be able to see all content without getting
|
||||
// scrollbar becuase of scrolling issue in iframe
|
||||
window.setTimeout(function(){jQuery(frame).height(frame.contentWindow.document.body.scrollHeight);}, 500);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Use prepare print function to copy iframe content into div
|
||||
// as we don't want to show content in iframe (scrolling problem).
|
||||
self.mail_prepare_print(jQuery(this));
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
});
|
||||
}
|
||||
|
@ -674,6 +674,9 @@ div.mailPreviewHeaders div.mail_extraEmails {
|
||||
#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject > span {
|
||||
white-space: nowrap;
|
||||
}
|
||||
#mail-index_mail-index-header_right {
|
||||
display: inline-flex;
|
||||
}
|
||||
div.mailPreviewHeaders div.mail_extraEmails.visible,
|
||||
div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
|
||||
position: absolute;
|
||||
@ -1141,7 +1144,7 @@ body {
|
||||
-moz-transition-timing-function: linear;
|
||||
-o-transition-timing-function: linear;
|
||||
transition-timing-function: linear;
|
||||
background-color: #b4b4b4;
|
||||
background-color: #e6e6e6;
|
||||
float: left;
|
||||
width: 55px;
|
||||
margin: 3px;
|
||||
@ -1992,6 +1995,9 @@ input[type=button] {
|
||||
background-color: transparent;
|
||||
width: 100%;
|
||||
}
|
||||
#mail-index_mail-index-header_right {
|
||||
display: inline-flex;
|
||||
}
|
||||
#mail-index_mailPreview {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
@ -2589,6 +2595,12 @@ div.mailComposeHeaderSection > table {
|
||||
body #popupMainDiv #mail-view_iframe {
|
||||
display: none;
|
||||
}
|
||||
body #popupMainDiv div#mail-view > div {
|
||||
height: 100%;
|
||||
}
|
||||
body #popupMainDiv div#mail-view {
|
||||
height: 100%;
|
||||
}
|
||||
body #popupMainDiv #tempPrintDiv {
|
||||
display: block;
|
||||
}
|
||||
|
@ -134,6 +134,12 @@
|
||||
#mail-view_iframe {
|
||||
display: none;
|
||||
}
|
||||
div#mail-view> div {
|
||||
height: 100%;
|
||||
}
|
||||
div#mail-view {
|
||||
height: 100%;
|
||||
}
|
||||
#tempPrintDiv {
|
||||
display:block;
|
||||
div:first-child {
|
||||
|
@ -2,8 +2,8 @@
|
||||
<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
|
||||
<!-- $Id$ -->
|
||||
<overlay>
|
||||
<template id="mail.view" template="" lang="" group="0" version="1.9.001">
|
||||
<vbox width="100%">
|
||||
<template id="mail.view" template="" lang="" group="0" version="1.9.001" height="100%">
|
||||
<vbox width="100%" height="100%">
|
||||
<hbox class="dialogHeadbar">
|
||||
<hbox>
|
||||
<toolbar id="toolbar" class="et2_head_toolbar" width="100%" view_range="1" flat_list="true"/>
|
||||
@ -70,7 +70,7 @@
|
||||
</grid>
|
||||
</details>
|
||||
</hbox>
|
||||
<box>
|
||||
<box height="100%">
|
||||
<iframe id="iframe" width="100%" height="100%" scrolling="auto"/>
|
||||
</box>
|
||||
</vbox>
|
||||
|
@ -1132,7 +1132,7 @@ body {
|
||||
-moz-transition-timing-function: linear;
|
||||
-o-transition-timing-function: linear;
|
||||
transition-timing-function: linear;
|
||||
background-color: #b4b4b4;
|
||||
background-color: #e6e6e6;
|
||||
float: left;
|
||||
width: 55px;
|
||||
margin: 3px;
|
||||
@ -1983,6 +1983,9 @@ input[type=button] {
|
||||
background-color: transparent;
|
||||
width: 100%;
|
||||
}
|
||||
#mail-index_mail-index-header_right {
|
||||
display: inline-flex;
|
||||
}
|
||||
#mail-index_mailPreview {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
|
Loading…
Reference in New Issue
Block a user