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

* Mail: Fix spacing issue between grouped toolbars

Browse Source
This commit is contained in:
Hadi Nategh 2018-02-15 15:13:47 +01:00
parent ed68be0cdf
commit 2945021b20
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/templates/default/etemplate2.css
View File

@ -1925,6 +1925,9 @@ div.ui-dialog div.ui-dialog-content > div[id] {
margin: 0 !important;
padding: 0 !important;
}
.et2_toolbar .et2_toolbar_actionlist span[data-group]:not(:first-child) > button.et2_button:first-child {
margin-left: 7px;
}
.et2_toolbar .et2_toolbar_actionlist button.et2_button_with_image, .nextmatch_header_row .et2_button {
width: 24px;
background-position: center;

36
mail/inc/class.mail_compose.inc.php
View File

@ -125,15 +125,6 @@ class mail_compose
'shortcut' => array('ctrl' => true, 'keyCode' => 83, 'caption' => 'Ctrl + S'),
'toolbarDefault' => true
),
'pgp' => array(
'caption' => 'Encrypt',
'icon' => 'lock',
'group' => ++$group,
'onExecute' => 'javaScript:app.mail.togglePgpEncrypt',
'hint' => 'Send message PGP encrypted: requires keys from all recipients!',
'checkbox' => true,
'toolbarDefault' => true
),
'button[saveAsDraft]' => array(
'caption' => 'Save',
'icon' => 'save',
@ -145,10 +136,17 @@ class mail_compose
'button[saveAsDraftAndPrint]' => array(
'caption' => 'Print',
'icon' => 'print',
'group' => ++$group,
'group' => $group,
'onExecute' => 'javaScript:app.mail.saveAsDraft',
'hint' => 'Save as Draft and Print'
),
'save2vfs' => array (
'caption' => 'Save to filemanager',
'icon' => 'filesave',
'group' => $group,
'onExecute' => 'javaScript:app.mail.compose_saveDraft2fm',
'hint' => 'Save the drafted message as eml file into VFS'
),
'selectFromVFSForCompose' => array(
'caption' => 'VFS',
'icon' => 'filemanager',
@ -160,7 +158,7 @@ class mail_compose
'uploadForCompose' => array(
'caption' => 'Upload files...',
'icon' => 'attach',
'group' => ++$group,
'group' => $group,
'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
'hint' => 'Select files to upload',
'toolbarDefault' => true
@ -201,17 +199,19 @@ class mail_compose
),
'prty' => array(
'caption' => 'Priority',
'group' => ++$group,
'group' => $group,
'icon' => 'priority',
'children' => array(),
'hint' => 'Select the message priority tag',
),
'save2vfs' => array (
'caption' => 'Save to filemanager',
'icon' => 'filesave',
'pgp' => array(
'caption' => 'Encrypt',
'icon' => 'lock',
'group' => ++$group,
'onExecute' => 'javaScript:app.mail.compose_saveDraft2fm',
'hint' => 'Save the drafted message as eml file into VFS'
'onExecute' => 'javaScript:app.mail.togglePgpEncrypt',
'hint' => 'Send message PGP encrypted: requires keys from all recipients!',
'checkbox' => true,
'toolbarDefault' => true
),
);
@ -230,7 +230,7 @@ class mail_compose
'smime_encrypt' => array (
'caption' => 'SMIME Encryption',
'icon' => 'smime_encrypt',
'group' => ++$group,
'group' => $group,
'onExecute' => 'javaScript:app.mail.compose_setToggle',
'checkbox' => true,
'hint' => 'Encrypt your message with smime certificate'