Adjusting toolbar widget

-Fix toolbar widget droppable space
-Fix toolbar widget for first time user with no preferences
This commit is contained in:
Hadi Nategh 2014-09-29 08:24:38 +00:00
parent cff6b748a1
commit fec60aa03a
4 changed files with 26 additions and 3 deletions

View File

@ -111,12 +111,12 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
if (pref && !jQuery.isArray(pref)) this.preference = pref; if (pref && !jQuery.isArray(pref)) this.preference = pref;
//Set the default actions for the first time //Set the default actions for the first time
if (typeof pref === 'undefined' || jQuery.isEmptyObject(pref)) if (typeof pref === 'undefined')
{ {
for (var name in actions) for (var name in actions)
{ {
if (!actions[name].toolbarDefault && if (!actions[name].toolbarDefault &&
(typeof actions[name].children === 'undefined' || !this.flat_list)) (typeof actions[name].children === 'undefined' || !this.options.flat_list))
this.set_prefered(actions[name].id,'add'); this.set_prefered(actions[name].id,'add');
} }
} }
@ -294,7 +294,15 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
helper:"clone", helper:"clone",
appendTo:'body', appendTo:'body',
zIndex: 1000, zIndex: 1000,
cursor:"move" cursor:"move",
start: function()
{
jQuery(that.actionlist).addClass('et2_toolbarDropArea');
},
stop: function()
{
jQuery(that.actionlist).removeClass('et2_toolbarDropArea');
},
}); });
toolbox.children().droppable({ toolbox.children().droppable({
accept:toolbar, accept:toolbar,

View File

@ -1073,6 +1073,10 @@ div.message.floating {
width: 100% !important; width: 100% !important;
height: auto; height: auto;
} }
#cke_1_top.cke_top {
display: none;
border:none;
}
} }
/** /**
* Grid / nextmatch Hierarchy * Grid / nextmatch Hierarchy
@ -1459,6 +1463,11 @@ div.ui-toolbar-menulist{
} }
.et2_toolbar_actionlist{ .et2_toolbar_actionlist{
float:left; float:left;
width:80%;
height:24px;
}
.et2_toolbarDropArea{
border: 1px dashed lightgray;
} }
.et2_label > input.et2_checkbox { .et2_label > input.et2_checkbox {
margin-right: 5px; margin-right: 5px;

View File

@ -491,6 +491,9 @@ div.mail-compose_fileselector {
padding: 0px; padding: 0px;
height: 16px !important; height: 16px !important;
} }
#mail-index_toolbar > #toolbar-actionlist {
width:auto;
}
#mail-index_mailPreviewContainer { #mail-index_mailPreviewContainer {
position: absolute; position: absolute;
border: 1px solid silver; border: 1px solid silver;

View File

@ -491,6 +491,9 @@ div.mail-compose_fileselector {
padding: 0px; padding: 0px;
height: 16px !important; height: 16px !important;
} }
#mail-index_toolbar > #toolbar-actionlist {
width: auto;
}
#mail-index_mailPreviewContainer { #mail-index_mailPreviewContainer {
position: absolute; position: absolute;
border: 1px solid silver; border: 1px solid silver;