extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

S/MIME:

Browse Source 
- Fix password request form in mobile view
- Fix smime indicators not being displayed in mobile view
This commit is contained in:
Hadi Nategh 2017-09-14 11:28:27 +02:00
parent e0eb181373
commit 1b252ea821
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mail/js/app.js
View File

@ -5708,10 +5708,12 @@ app.classes.mail = AppJS.extend(
self.resolveExternalImages(this.contentWindow.document); self.resolveExternalImages(this.contentWindow.document);
// Use prepare print function to copy iframe content into div // Use prepare print function to copy iframe content into div
// as we don't want to show content in iframe (scrolling problem). // as we don't want to show content in iframe (scrolling problem).
self.mail_prepare_print(jQuery(this)); if (jQuery(this.contentWindow.document.body).find('#smimePasswordRequest').length == 0)
{
iframe.set_disabled(true);
self.mail_prepare_print(jQuery(this));
}
} }
}); });
}); });
}, },
@ -5858,15 +5860,15 @@ app.classes.mail = AppJS.extend(
{ {
if (!_data) return; if (!_data) return;
var self = this; var self = this;
var et2_object = egwIsMobile()? this.et2_view.widgetContainer: this.et2;
var data = _data; var data = _data;
var attachmentArea = this.et2.getWidgetById('previewAttachmentArea'); var attachmentArea = et2_object.getWidgetById('previewAttachmentArea');
if (attachmentArea) attachmentArea.getDOMNode().classList.remove('loading'); if (attachmentArea) attachmentArea.getDOMNode().classList.remove('loading');
var smime_signature = this.et2.getWidgetById('smime_signature'); var smime_signature = et2_object.getWidgetById('smime_signature');
var smime_encryption = this.et2.getWidgetById('smime_encryption'); var smime_encryption = et2_object.getWidgetById('smime_encryption');
var $mail_container = egw(window).is_popup() ? var $mail_container = egwIsMobile()? jQuery('.mail-d-h1').next() :
jQuery('.mailDisplayContainer'): egw(window).is_popup() ? jQuery('.mailDisplayContainer'):
jQuery(this.et2.getWidgetById('mailPreviewContainer').getDOMNode()); jQuery(et2_object.getWidgetById('mailPreviewContainer').getDOMNode());
smime_signature.set_disabled(!data.signed); smime_signature.set_disabled(!data.signed);
smime_encryption.set_disabled(!data.encrypted); smime_encryption.set_disabled(!data.encrypted);
if (!data.signed) if (!data.signed)

5
mail/templates/mobile/app.css
View File

@ -2520,6 +2520,7 @@ div.mailComposeHeaderSection > table {
background-color: none; background-color: none;
} }
body #popupMainDiv .mail-d-h1 { body #popupMainDiv .mail-d-h1 {
position: relative;
padding-bottom: 15px; padding-bottom: 15px;
border-bottom: 1px solid silver; border-bottom: 1px solid silver;
font-size: 12pt; font-size: 12pt;
@ -2573,9 +2574,6 @@ div.mailComposeHeaderSection > table {
position: initial; position: initial;
margin-top: 20px; margin-top: 20px;
} }
body #popupMainDiv #mail-view_iframe {
display: none;
}
body #popupMainDiv div#mail-view > div { body #popupMainDiv div#mail-view > div {
height: 100%; height: 100%;
} }
@ -2584,6 +2582,7 @@ div.mailComposeHeaderSection > table {
} }
body #popupMainDiv #mail-view_toaddressdetails { body #popupMainDiv #mail-view_toaddressdetails {
color: #26537c; color: #26537c;
float: right;
} }
body #popupMainDiv #tempPrintDiv { body #popupMainDiv #tempPrintDiv {
display: block; display: block;

5
mail/templates/mobile/app.less
View File

@ -78,6 +78,7 @@
.mail-d-h1{ .mail-d-h1{
position: relative;
padding-bottom: 15px; padding-bottom: 15px;
border-bottom: 1px solid silver; border-bottom: 1px solid silver;
span { span {
@ -131,9 +132,6 @@
position: initial; position: initial;
margin-top: 20px; margin-top: 20px;
} }
#mail-view_iframe {
display: none;
}
div#mail-view> div { div#mail-view> div {
height: 100%; height: 100%;
} }
@ -142,6 +140,7 @@
} }
#mail-view_toaddressdetails { #mail-view_toaddressdetails {
color: #26537c; color: #26537c;
float: right;
} }
#tempPrintDiv { #tempPrintDiv {
display:block; display:block;

4
mail/templates/mobile/view.xet
View File

@ -12,6 +12,10 @@
</hbox> </hbox>
<hbox class="mail-d-h1" width="100%"> <hbox class="mail-d-h1" width="100%">
<description align="left" id="subject" no_lang="1" readonly="true"/> <description align="left" id="subject" no_lang="1" readonly="true"/>
<hbox class="smimeIcons">
<image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="true" align="right" width="24"/>
<image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="true" align="right" width="24"/>
</hbox>
</hbox> </hbox>
<hbox class="mail-d-h2" disabled="!@fromaddress" width="100%"> <hbox class="mail-d-h2" disabled="!@fromaddress" width="100%">
<url-email id="fromaddress" readonly="true"/> <url-email id="fromaddress" readonly="true"/>