From 7134da86b325d99e250f3db9c0911a87aac602e4 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 7 Jan 2015 17:37:56 +0000 Subject: [PATCH] Fix compose toolbar ids --- mail/inc/class.mail_compose.inc.php | 6 +++--- mail/js/app.js | 2 +- mail/templates/default/app.css | 16 ++++++++-------- mail/templates/default/compose.xet | 2 +- mail/templates/pixelegg/app.css | 12 ++++++------ mail/templates/pixelegg/app.less | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index 08960714ee..70d8597678 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -335,14 +335,14 @@ class mail_compose } //error_log(__METHOD__.__LINE__.array2string($_content)); if (!empty($_content['serverID']) && $_content['serverID'] != $this->mail_bo->profileID && - ($_content['toolbar'] === 'send' || $_content['button']['saveAsDraft']||$_content['button']['saveAsDraftAndPrint']) + ($_content['composeToolbar'] === 'send' || $_content['button']['saveAsDraft']||$_content['button']['saveAsDraftAndPrint']) ) { $this->changeProfile($_content['serverID']); $composeProfile = $this->mail_bo->profileID; } $buttonClicked = false; - if ($_content['toolbar'] === 'send') + if ($_content['composeToolbar'] === 'send') { $buttonClicked = $suppressSigOnTop = true; $sendOK = true; @@ -1204,7 +1204,7 @@ class mail_compose //$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed $etpl = new etemplate_new('mail.compose'); - $etpl->setElementAttribute('toolbar', 'actions', $this->getToolbarActions()); + $etpl->setElementAttribute('composeToolbar', 'actions', $this->getToolbarActions()); if ($content['mimeType']=='html') { //mode="$cont[rtfEditorFeatures]" validation_rules="$cont[validation_rules]" base_href="$cont[upload_dir]" diff --git a/mail/js/app.js b/mail/js/app.js index 11f82a59a4..f09a3fe127 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -4227,7 +4227,7 @@ app.classes.mail = AppJS.extend( compose_submitAction: function (_action) { var action_widget = ['to_infolog','to_tracker','priority']; - var toolbar = this.et2.getWidgetById('toolbar'); + var toolbar = this.et2.getWidgetById('composeToolbar'); for(var i=0;action_widget.length>i;i++) { var widget = this.et2.getWidgetById(action_widget[i]); diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css index 264d5d0c4f..868edf5f9d 100644 --- a/mail/templates/default/app.css +++ b/mail/templates/default/app.css @@ -403,7 +403,7 @@ div.mailUploadSection > div.et2_hbox > label { background-position: left; background-repeat: no-repeat; } -.mail-compose_toolbar{ +.mail-compose_composeToolbar{ border-left: 1px solid silver; border-top: 1px solid silver; border-right: 1px solid gray; @@ -413,11 +413,11 @@ div.mailUploadSection > div.et2_hbox > label { background-position: center; background-repeat: repeat-x; } -.mail-compose_toolbar > span { +.mail-compose_composeToolbarr > span { padding: 10px; white-space: nowrap; } -.mail-compose_toolbar > span.priority { +.mail-compose_composeToolbar > span.priority { border-right: none; } .compose_egw_icons { @@ -462,23 +462,23 @@ div.mail-compose_fileselector { overflow:scroll; overflow-x:hidden; } -#mail-compose_toolbar { +#mail-compose_composeToolbar { padding: 0px !important; } -#mail-compose_toolbar > button { +#mail-compose_composeToolbar > button { padding: .2em .4em; } -#mail-compose_toolbar > img { +#mail-compose_composeToolbar > img { width: 16px; padding: 0px; height: 16px !important; } -#mail-compose_toolbar > button > span > img { +#mail-compose_composeToolbar > button > span > img { width: 16px; padding: 0px; height: 16px !important; } -#mail-compose_toolbar > button { +#mail-compose_composeToolbar > button { padding: .2em .4em; } #mail-compose_to div.ms-sel-ctn, #mail-compose_cc .ms-sel-ctn { diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet index ae2153f749..ab5b2fa935 100644 --- a/mail/templates/default/compose.xet +++ b/mail/templates/default/compose.xet @@ -3,7 +3,7 @@