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

use grids set_value method for attachmentArea display in Preview

Browse Source
This commit is contained in:
Klaus Leithoff 2013-10-21 09:25:34 +00:00
parent 77e2849895
commit 022ae3a310
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_ui.inc.php
View File

@ -1739,7 +1739,7 @@ unset($query['actions']);
if (function_exists('mb_convert_variables')) mb_convert_variables("UTF-8","ISO-8559-1",$value['name']); # iso 2 UTF8
//if (mb_convert_variables("ISO-8859-1","UTF-8",$value['name'])){echo "Juhu utf8 2 ISO\n";};
//echo $value['name']."\n";
$filename=htmlentities($value['name'], ENT_QUOTES, $detectedCharSet);
//$filename=htmlentities($value['name'], ENT_QUOTES, $detectedCharSet);
$attachmentHTML[$key]['filename']= ($value['name'] ? ( $filename ? $filename : $value['name'] ) : lang('(no subject)'));
$attachmentHTML[$key]['type']=$value['mimeType'];
$attachmentHTML[$key]['mimetype']=mime_magic::mime2label($value['mimeType']);

6
mail/js/app.js
View File

@ -492,7 +492,7 @@ app.mail = AppJS.extend(
this.et2.getWidgetById('previewToAddress').set_value("");
this.et2.getWidgetById('previewDate').set_value("");
this.et2.getWidgetById('previewSubject').set_value("");
//this.et2.getWidgetById('previewAttachmentArea').set_value("");
this.et2.getWidgetById('previewAttachmentArea').set_value({content:[]});
this.et2.getWidgetById('previewAttachmentArea').set_class('previewAttachmentArea noContent mail_DisplayNone');
var IframeHandle = this.et2.getWidgetById('messageIFRAME');
IframeHandle.set_src(egw.link('/index.php',{menuaction:'mail.mail_ui.loadEmailBody',_messageID:""}));
@ -513,9 +513,7 @@ app.mail = AppJS.extend(
}
else
{
var pAttArea = this.et2.getWidgetById('previewAttachmentArea');
console.log(dataElem.data.attachmentsBlock,pAttArea);
//pAttArea.createTableFromCells(pAttArea.cells,pAttArea.colData,dataElem.data.attachmentsBlock);
this.et2.getWidgetById('previewAttachmentArea').set_value({content:dataElem.data.attachmentsBlock});
}
this.et2.getWidgetById('toolbar').set_actions(JSON.parse(dataElem.data.toolbaractions));
var IframeHandle = this.et2.getWidgetById('messageIFRAME');

7
mail/templates/default/app.css
View File

@ -282,6 +282,11 @@ pre {
width: 250px;
white-space: nowrap;
overflow: hidden;
word-wrap: break-word;
float: left;
&:after{
content: " ...";
}
}
#mail-index {
position: relative
@ -439,9 +444,11 @@ input[type=button] {
opacity: 1;
-moz-opacity:1:
filter: Alpha(opacity=100);
display: inline-block !important;
}
#mail-index_previewAttachmentArea.noContent {
border:0px !important;
display: none !important;
}
.mailDisplayContainer, .mailDisplayAttachments {