holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mail import message dialog

Browse Source
This commit is contained in:
Hadi Nategh 2014-08-22 13:40:25 +00:00
parent 6cc7ff661d
commit 1889f9f1aa
4 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -570,7 +570,7 @@ class mail_hooks
); );
$file += array( $file += array(
'import message' => "javascript:egw_openWindowCentered2('".egw::link('/index.php', $linkData,false)."','importMessageDialog',870,125,'no','$appname');", 'import message' => "javascript:egw_openWindowCentered2('".egw::link('/index.php', $linkData,false)."','importMessageDialog',600,100,'no','$appname');",
); );
} }

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

@ -682,7 +682,13 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
height: 500px; height: 500px;
overflow: auto; overflow: auto;
} }
.mail_importMessageFile{
width: 40%;
}
#mail-importMessage .dialogHeader {
font-weight: bold;
font-size:150%;
}
/* MAIL PRINT */ /* MAIL PRINT */
@media print { @media print {
.mailDisplayHeaders { .mailDisplayHeaders {

37
mail/templates/default/importMessage.xet
View File

@ -2,17 +2,30 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="mail.importMessage" template="" lang="" group="0" version="1.9.001"> <template id="mail.importMessage" template="" lang="" group="0" version="1.9.001">
<html id="msg"/> <grid width="100%">
<hbox class="dialogHeader" width="100%" > <columns>
<description value="Import message" align="center" class="dialogHeader"/> <column width="100"/>
</hbox> <column/>
<vbox id="divImportArea"> </columns>
<hbox span="all"> <rows>
<description value="Store to Folder"/> <row class="dialogHeader">
<taglist id="FOLDER" width="50%" autocomplete_url='mail.mail_compose.ajax_searchFolder' autocomplete_params='' maxSelection="1" allowFreeEntries="false" onclick="app.mail.address_click"/> <description value="Import message" align="center" span="all" class="et2_fullWidth"/>
<vfs-select id="vfsfile" mode="open" mime="message/rfc822" onchange="app.mail.vfsUploadForImport"/> </row>
<file statustext="Select file to import into Folder" onFinish="app.mail.uploadForImport" mime="/^message\//i" id="uploadForImport" drop_target ="mail-importMessage_divImportArea"/> <row>
</hbox> <description value="Store to Folder"/>
</vbox>> <taglist id="FOLDER" autocomplete_url='mail.mail_compose.ajax_searchFolder' autocomplete_params='' maxSelection="1" allowFreeEntries="false" onclick="app.mail.address_click"/>
</row>
<row>
<description value="Choose file"/>
<hbox>
<vfs-select id="vfsfile" button_caption = "" mode="open" mime="message/rfc822" onchange="app.mail.vfsUploadForImport"/>
<file statustext="Select file to import into Folder" onFinish="app.mail.uploadForImport" mime="/^message\//i" id="uploadForImport" drop_target ="mail-importMessage" class="mail_importMessageFile"/>
</hbox>
</row>
<row class="dialogFooterToolbar">
<buttononly statustext="Closes this window" label="Close" onclick="window.close();" image="close" background_image="1"/>
</row>
</rows>
</grid>
</template> </template>
</overlay> </overlay>

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

@ -676,6 +676,13 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
height: 500px; height: 500px;
overflow: auto; overflow: auto;
} }
.mail_importMessageFile {
width: 40%;
}
#mail-importMessage .dialogHeader {
font-weight: bold;
font-size: 150%;
}
/* MAIL PRINT */ /* MAIL PRINT */
@media print { @media print {
.mailDisplayHeaders { .mailDisplayHeaders {