extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-28 16:12:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compose toolbar ids

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,14 +335,14 @@ class mail_compose
} }
//error_log(__METHOD__.__LINE__.array2string($_content)); //error_log(__METHOD__.__LINE__.array2string($_content));
if (!empty($_content['serverID']) && $_content['serverID'] != $this->mail_bo->profileID && 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']); $this->changeProfile($_content['serverID']);
$composeProfile = $this->mail_bo->profileID; $composeProfile = $this->mail_bo->profileID;
} }
$buttonClicked = false; $buttonClicked = false;
if ($_content['toolbar'] === 'send') if ($_content['composeToolbar'] === 'send')
{ {
$buttonClicked = $suppressSigOnTop = true; $buttonClicked = $suppressSigOnTop = true;
$sendOK = true; $sendOK = true;
@ -1204,7 +1204,7 @@ class mail_compose
//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed //$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
$etpl = new etemplate_new('mail.compose'); $etpl = new etemplate_new('mail.compose');
$etpl->setElementAttribute('toolbar', 'actions', $this->getToolbarActions()); $etpl->setElementAttribute('composeToolbar', 'actions', $this->getToolbarActions());
if ($content['mimeType']=='html') if ($content['mimeType']=='html')
{ {
//mode="$cont[rtfEditorFeatures]" validation_rules="$cont[validation_rules]" base_href="$cont[upload_dir]" //mode="$cont[rtfEditorFeatures]" validation_rules="$cont[validation_rules]" base_href="$cont[upload_dir]"

2
mail/js/app.js
View File

@ -4227,7 +4227,7 @@ app.classes.mail = AppJS.extend(
compose_submitAction: function (_action) compose_submitAction: function (_action)
{ {
var action_widget = ['to_infolog','to_tracker','priority']; 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++) for(var i=0;action_widget.length>i;i++)
{ {
var widget = this.et2.getWidgetById(action_widget[i]); var widget = this.et2.getWidgetById(action_widget[i]);

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

@ -403,7 +403,7 @@ div.mailUploadSection > div.et2_hbox > label {
background-position: left; background-position: left;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.mail-compose_toolbar{ .mail-compose_composeToolbar{
border-left: 1px solid silver; border-left: 1px solid silver;
border-top: 1px solid silver; border-top: 1px solid silver;
border-right: 1px solid gray; border-right: 1px solid gray;
@ -413,11 +413,11 @@ div.mailUploadSection > div.et2_hbox > label {
background-position: center; background-position: center;
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.mail-compose_toolbar > span { .mail-compose_composeToolbarr > span {
padding: 10px; padding: 10px;
white-space: nowrap; white-space: nowrap;
} }
.mail-compose_toolbar > span.priority { .mail-compose_composeToolbar > span.priority {
border-right: none; border-right: none;
} }
.compose_egw_icons { .compose_egw_icons {
@ -462,23 +462,23 @@ div.mail-compose_fileselector {
overflow:scroll; overflow:scroll;
overflow-x:hidden; overflow-x:hidden;
} }
#mail-compose_toolbar { #mail-compose_composeToolbar {
padding: 0px !important; padding: 0px !important;
} }
#mail-compose_toolbar > button { #mail-compose_composeToolbar > button {
padding: .2em .4em; padding: .2em .4em;
} }
#mail-compose_toolbar > img { #mail-compose_composeToolbar > img {
width: 16px; width: 16px;
padding: 0px; padding: 0px;
height: 16px !important; height: 16px !important;
} }
#mail-compose_toolbar > button > span > img { #mail-compose_composeToolbar > button > span > img {
width: 16px; width: 16px;
padding: 0px; padding: 0px;
height: 16px !important; height: 16px !important;
} }
#mail-compose_toolbar > button { #mail-compose_composeToolbar > button {
padding: .2em .4em; padding: .2em .4em;
} }
#mail-compose_to div.ms-sel-ctn, #mail-compose_cc .ms-sel-ctn { #mail-compose_to div.ms-sel-ctn, #mail-compose_cc .ms-sel-ctn {

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

@ -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="6" flat_list="false"/> <toolbar id="composeToolbar" 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"/>

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

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

6
mail/templates/pixelegg/app.less
View File

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