Fix compose toolbar ids

This commit is contained in:
Hadi Nategh 2015-01-07 17:37:56 +00:00
parent 7009ba1de0
commit 7134da86b3
6 changed files with 22 additions and 22 deletions

View File

@ -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]"

View File

@ -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]);

View File

@ -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 {

View File

@ -3,7 +3,7 @@
<overlay>
<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
<vbox class="mailCompose mailComposeHeaderSection" width="100%">
<toolbar id="toolbar" width="et2_fullWidth" view_range="6" flat_list="false"/>
<toolbar id="composeToolbar" width="et2_fullWidth" view_range="6" flat_list="false"/>
<hbox class="mail-compose_toolbar_assist" width="100%">
<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"/>

View File

@ -1086,7 +1086,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
/*background-color: @gray-0;*/
/*.gradient_thead;*/
}
#mail-compose #mail-compose_toolbar button#toolbar-send {
#mail-compose #mail-compose_composeToolbar button#composeToolbar-send {
height: 24px;
/*margin-right: 3px !important;*/
margin-top: 0.7px !important;
@ -1103,18 +1103,18 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
background-color: #0c5da5;
color: #ffffff;
}
#mail-compose #mail-compose_toolbar button#toolbar-send:hover {
#mail-compose #mail-compose_composeToolbar button#composeToolbar-send:hover {
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
background-color: #189800;
}
#mail-compose #mail-compose_toolbar button#toolbar-send:disabled {
#mail-compose #mail-compose_composeToolbar button#composeToolbar-send:disabled {
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 {
#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:hover,
#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:hover,
#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover {
background: none;
}
#mail-compose table.et2_grid {

View File

@ -350,10 +350,10 @@ div#mail-index{
// ##################################
// Toolbar
#mail-compose_toolbar{
#mail-compose_composeToolbar{
// Senden Button
button#toolbar-send{
button#composeToolbar-send{
height: 24px;
/*margin-right: 3px !important;*/
margin-top: 0.7px !important;
@ -373,7 +373,7 @@ div#mail-index{
&:disabled {background-color: @color_disabled !important;}
}
button#toolbar-to_infolog:hover, button#toolbar-to_tracker:hover, button#toolbar-disposition:hover {
button#composeToolbar-to_infolog:hover, button#composeToolbar-to_tracker:hover, button#composeToolbar-disposition:hover {
background: none;
}
} // Toolbar Ende