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

Get mail app working (we use old-box widgets until replacing splitter with a web-component)

Browse Source
This commit is contained in:
Hadi Nategh 2021-09-27 16:14:42 +02:00
parent e460ed52d4
commit 6f8fccb1ad
6 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/et2_widget_box.ts
View File

@ -66,7 +66,7 @@ export class et2_box extends et2_baseWidget implements et2_IDetachedDOM
* @param {object} _node
*/
loadFromXML(_node) {
if(this.getType() != "box")
if(this.getType() != "old-box")
{
return super.loadFromXML(_node);
}
@ -162,7 +162,7 @@ export class et2_box extends et2_baseWidget implements et2_IDetachedDOM
}
}
et2_register_widget(et2_box, ["vbox", "box"]);
et2_register_widget(et2_box, ["old-vbox", "old-box"]);
/**
* Details widget implementation

2
api/js/etemplate/et2_widget_hbox.ts
View File

@ -199,6 +199,6 @@ export class et2_hbox extends et2_baseWidget
}
}
}
et2_register_widget(et2_hbox, ["hbox"]);
et2_register_widget(et2_hbox, ["old-hbox"]);

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

@ -637,7 +637,7 @@ div.mailDisplayHeaders div.mail_extraEmails.visible
box-shadow: 5px 5px 5px #aaa;
border: 1px solid gray;
}
div.mailComposeBody {
.mailComposeBody {
white-space: normal !important;
}
#mail-compose_mail_plaintext {
@ -884,11 +884,11 @@ span#mail-compose_replyto_expander {
padding: 0;
}
/*Make file uploads in compose dialog invisible*/
div.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_selectFromVFSForCompose, div.mail-compose_toolbar_assist {
.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_selectFromVFSForCompose, .mail-compose_toolbar_assist {
display:none;
}
/*Make file uploads in compose dialog invisible*/
div.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_selectFromVFSForCompose, div.mail-compose_toolbar_assist {
.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_selectFromVFSForCompose, .mail-compose_toolbar_assist {
display:none;
}

8
mail/templates/default/compose.xet
View File

@ -86,12 +86,12 @@
</grid>
</vbox>
<vbox class="mailComposeBodySection" width="100%">
<hbox disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
<old-hbox disabled="@is_plain" class="mailComposeBody mailComposeHtmlContainer">
<htmlarea name="mail_htmltext" id="mail_htmltext" statusbar="false" menubar="false" toolbar="@html_toolbar" imageUpload="link_to" expand_toolbar="true" height="478px" width="100%" resize_ratio="0"/>
</hbox>
<hbox disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
</old-hbox>
<old-hbox disabled="@is_html" class="mailComposeBody mailComposeTextContainer">
<textbox multiline="true" rows="40" cols="120" width="100%" span="all" no_lang="1" name="mail_plaintext" id="mail_plaintext" resize_ratio="0"/>
</hbox>
</old-hbox>
<vbox class="et2_file mailUploadSection" disabled="@no_griddata">
<hbox>
<select id="filemode" label="Send files as" onchange="app.mail.check_sharing_filemode"/>

52
mail/templates/default/index.xet
View File

@ -5,43 +5,43 @@
<template id="mail.index.splitter" height="100%" template="" lang="" group="0" version="1.9.001">
<split dock_side="bottomDock" id="mailSplitter">
<nextmatch id="nm" onselect="app.mail.mail_preview" class="" template="mail.index.rows" header_left="mail.index.add" header_right="mail.index.header_right" disable_selection_advance="true"/>
<vbox id="mailPreview" width="100%">
<old-vbox id="mailPreview" width="100%">
<toolbar id="toolbar"/>
<box id="blank" disabled="false">
<old-box id="blank" disabled="false">
<image src="mail"/>
<description value="Select an item to read"/>
</box>
<hbox width="100%" id="mailPreviewHeadersFrom" class="mailPreviewHeaders">
</old-box>
<old-hbox width="100%" id="mailPreviewHeadersFrom" class="mailPreviewHeaders">
<description value="From"/>
<hbox id="additionalFromAddress" class="mail_extraEmails">
</hbox>
<old-hbox id="additionalFromAddress" class="mail_extraEmails">
</old-hbox>
<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
</hbox>
<hbox id="mailPreviewHeadersSubject" class="mailPreviewHeaders">
</old-hbox>
<old-hbox id="mailPreviewHeadersSubject" class="mailPreviewHeaders">
<description value="Subject"/>
<description align="left" id="previewSubject" readonly="true" hover_action="app.mail.modifyMessageSubjectDialog" hover_action_title="Modify subject of this message"/>
</hbox>
<hbox id="mailPreviewHeadersDate" class="mailPreviewHeaders">
</old-hbox>
<old-hbox id="mailPreviewHeadersDate" class="mailPreviewHeaders">
<description value="Date"/>
<date-time align="left" id="previewDate" readonly="true"/>
</hbox>
<hbox width="100%" id="mailPreviewHeadersTo" class="mailPreviewHeaders">
</old-hbox>
<old-hbox width="100%" id="mailPreviewHeadersTo" class="mailPreviewHeaders">
<description value="To"/>
<hbox id="additionalToAddress" class="mail_extraEmails">
</hbox>
<old-hbox id="additionalToAddress" class="mail_extraEmails">
</old-hbox>
<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
</hbox>
<hbox id="mailPreviewHeadersCC" class="mailPreviewHeaders">
</old-hbox>
<old-hbox id="mailPreviewHeadersCC" class="mailPreviewHeaders">
<description value="CC"/>
<hbox id="additionalCCAddress" class="mail_extraEmails">
</hbox>
<old-hbox id="additionalCCAddress" class="mail_extraEmails">
</old-hbox>
<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
</hbox>
<hbox class="mailPreviewHeaders smimeIcons">
</old-hbox>
<old-hbox class="mailPreviewHeaders 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 id="mailPreviewHeadersAttachments" class="mailPreviewHeaders">
</old-hbox>
<old-hbox id="mailPreviewHeadersAttachments" class="mailPreviewHeaders">
<description value="Attachments"/>
<grid disabled="@no_griddata" id="previewAttachmentArea" class="previewAttachmentArea egwGridView_grid">
<columns>
@ -72,11 +72,11 @@
</rows>
</grid>
<buttononly class="et2_button ui-button" label="Show all attachments" image="foldertree_nolines_plus" width="16px" height="16px" onclick="app.mail.showAllHeader"/>
</hbox>
<box id="mailPreviewContainer">
</old-hbox>
<old-box id="mailPreviewContainer">
<iframe frameborder="1" id="messageIFRAME" scrolling="auto"/>
</box>
</vbox>
</old-box>
</old-vbox>
</split>
</template>
<template id="mail.index.nosplitter" template="" lang="" group="0" version="1.9.001">

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

@ -850,15 +850,15 @@ span#mail-compose_replyto_expander {
padding: 0;
}
/*Make file uploads in compose dialog invisible*/
div.mail-compose_toolbar_assist div.mail-compose_fileselector,
.mail-compose_toolbar_assist div.mail-compose_fileselector,
#mail-compose_selectFromVFSForCompose,
div.mail-compose_toolbar_assist {
.mail-compose_toolbar_assist {
display: none;
}
/*Make file uploads in compose dialog invisible*/
div.mail-compose_toolbar_assist div.mail-compose_fileselector,
.mail-compose_toolbar_assist div.mail-compose_fileselector,
#mail-compose_selectFromVFSForCompose,
div.mail-compose_toolbar_assist {
.mail-compose_toolbar_assist {
display: none;
}
div.mailComposeHeaderSection > table {
@ -2072,6 +2072,7 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
border-left: 12px solid #B4B4B4;
}
#mail-index_nm.et2_nextmatch.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div {
#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr.row_category td:first-child > div {
margin-left: 0px;
padding-left: 0px;
}