forked from extern/egroupware
Fix mail compose issues:
-Set default toolbar actions -Set toolbar actions view range to 6 -Fix compose window not being resized correctly in FF -Fix displaying toolbar's selectbox -Fix styling of toggle button
This commit is contained in:
parent
a20ad52fd0
commit
7009ba1de0
@ -485,6 +485,16 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
|
|||||||
isValid: function(messages)
|
isValid: function(messages)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attach the container node of the widget to DOM-Tree
|
||||||
|
* @returns {Boolean}
|
||||||
|
*/
|
||||||
|
doLoadingFinished: function ()
|
||||||
|
{
|
||||||
|
this._super.apply(this, arguments);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
et2_register_widget(et2_toolbar, ["toolbar"]);
|
et2_register_widget(et2_toolbar, ["toolbar"]);
|
||||||
|
@ -1415,7 +1415,7 @@ div.ms-sel-ctn {
|
|||||||
}
|
}
|
||||||
.et2_toolbar button.toolbar_toggled {
|
.et2_toolbar button.toolbar_toggled {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
box-shadow: inset 1px 1px 1px 1px gray;
|
box-shadow: inset 1px 1px 1px 1px gray !important;
|
||||||
}
|
}
|
||||||
.et2_toolbar-dropdown{
|
.et2_toolbar-dropdown{
|
||||||
margin: 1px;
|
margin: 1px;
|
||||||
|
@ -115,7 +115,8 @@ class mail_compose
|
|||||||
'icon' => 'mail_send',
|
'icon' => 'mail_send',
|
||||||
'group' => ++$group,
|
'group' => ++$group,
|
||||||
'onExecute' => 'javaScript:app.mail.compose_submitAction',
|
'onExecute' => 'javaScript:app.mail.compose_submitAction',
|
||||||
'hint' => 'Send'
|
'hint' => 'Send',
|
||||||
|
'toolbarDefault' => true
|
||||||
),
|
),
|
||||||
'button[saveAsDraft]' => array(
|
'button[saveAsDraft]' => array(
|
||||||
'caption' => 'Save',
|
'caption' => 'Save',
|
||||||
@ -136,14 +137,16 @@ class mail_compose
|
|||||||
'icon' => 'filemanager',
|
'icon' => 'filemanager',
|
||||||
'group' => ++$group,
|
'group' => ++$group,
|
||||||
'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
|
'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
|
||||||
'hint' => 'Select file(s) from VFS'
|
'hint' => 'Select file(s) from VFS',
|
||||||
|
'toolbarDefault' => true
|
||||||
),
|
),
|
||||||
'uploadForCompose' => array(
|
'uploadForCompose' => array(
|
||||||
'caption' => 'Upload files...',
|
'caption' => 'Upload files...',
|
||||||
'icon' => 'attach',
|
'icon' => 'attach',
|
||||||
'group' => ++$group,
|
'group' => ++$group,
|
||||||
'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
|
'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
|
||||||
'hint' => 'Select files to upload'
|
'hint' => 'Select files to upload',
|
||||||
|
'toolbarDefault' => true
|
||||||
),
|
),
|
||||||
'to_infolog' => array(
|
'to_infolog' => array(
|
||||||
'caption' => 'Infolog',
|
'caption' => 'Infolog',
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<overlay>
|
<overlay>
|
||||||
<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
|
<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
|
||||||
<vbox class="mailCompose mailComposeHeaderSection" width="100%">
|
<vbox class="mailCompose mailComposeHeaderSection" width="100%">
|
||||||
<toolbar id="toolbar" width="et2_fullWidth" view_range="8" flat_list="false"/>
|
<toolbar id="toolbar" width="et2_fullWidth" view_range="6" flat_list="false"/>
|
||||||
<hbox class="mail-compose_toolbar_assist" width="100%">
|
<hbox class="mail-compose_toolbar_assist" width="100%">
|
||||||
<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
|
<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
|
||||||
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='attachments' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
|
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='attachments' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
|
||||||
|
@ -1078,7 +1078,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
|
|||||||
#mail-compose {
|
#mail-compose {
|
||||||
width: 870px;
|
width: 870px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
max-height: 700px;
|
max-height: 99%;
|
||||||
/*// ###############################################################################*/
|
/*// ###############################################################################*/
|
||||||
/*// Mail Header*/
|
/*// Mail Header*/
|
||||||
}
|
}
|
||||||
@ -1112,6 +1112,11 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
|
|||||||
#mail-compose #mail-compose_toolbar button#toolbar-send:disabled {
|
#mail-compose #mail-compose_toolbar button#toolbar-send:disabled {
|
||||||
background-color: rgba(12, 93, 165, 0.2) !important;
|
background-color: rgba(12, 93, 165, 0.2) !important;
|
||||||
}
|
}
|
||||||
|
#mail-compose #mail-compose_toolbar button#toolbar-to_infolog:hover,
|
||||||
|
#mail-compose #mail-compose_toolbar button#toolbar-to_tracker:hover,
|
||||||
|
#mail-compose #mail-compose_toolbar button#toolbar-disposition:hover {
|
||||||
|
background: none;
|
||||||
|
}
|
||||||
#mail-compose table.et2_grid {
|
#mail-compose table.et2_grid {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
@ -333,7 +333,7 @@ div#mail-index{
|
|||||||
// gesamtbreite
|
// gesamtbreite
|
||||||
width: 870px;
|
width: 870px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
max-height: 700px;
|
max-height: 99%;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -373,6 +373,9 @@ div#mail-index{
|
|||||||
&:disabled {background-color: @color_disabled !important;}
|
&:disabled {background-color: @color_disabled !important;}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
button#toolbar-to_infolog:hover, button#toolbar-to_tracker:hover, button#toolbar-disposition:hover {
|
||||||
|
background: none;
|
||||||
|
}
|
||||||
} // Toolbar Ende
|
} // Toolbar Ende
|
||||||
|
|
||||||
table.et2_grid {display: inline-block;}
|
table.et2_grid {display: inline-block;}
|
||||||
|
Loading…
Reference in New Issue
Block a user