mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
Adjusting toolbar widget
-Fix toolbar widget droppable space -Fix toolbar widget for first time user with no preferences
This commit is contained in:
parent
756b31ce9f
commit
acd07a1f93
@ -111,12 +111,12 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
|
||||
if (pref && !jQuery.isArray(pref)) this.preference = pref;
|
||||
|
||||
//Set the default actions for the first time
|
||||
if (typeof pref === 'undefined' || jQuery.isEmptyObject(pref))
|
||||
if (typeof pref === 'undefined')
|
||||
{
|
||||
for (var name in actions)
|
||||
{
|
||||
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');
|
||||
}
|
||||
}
|
||||
@ -294,7 +294,15 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
|
||||
helper:"clone",
|
||||
appendTo:'body',
|
||||
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({
|
||||
accept:toolbar,
|
||||
|
@ -1073,6 +1073,10 @@ div.message.floating {
|
||||
width: 100% !important;
|
||||
height: auto;
|
||||
}
|
||||
#cke_1_top.cke_top {
|
||||
display: none;
|
||||
border:none;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Grid / nextmatch Hierarchy
|
||||
@ -1459,6 +1463,11 @@ div.ui-toolbar-menulist{
|
||||
}
|
||||
.et2_toolbar_actionlist{
|
||||
float:left;
|
||||
width:80%;
|
||||
height:24px;
|
||||
}
|
||||
.et2_toolbarDropArea{
|
||||
border: 1px dashed lightgray;
|
||||
}
|
||||
.et2_label > input.et2_checkbox {
|
||||
margin-right: 5px;
|
||||
|
@ -491,6 +491,9 @@ div.mail-compose_fileselector {
|
||||
padding: 0px;
|
||||
height: 16px !important;
|
||||
}
|
||||
#mail-index_toolbar > #toolbar-actionlist {
|
||||
width:auto;
|
||||
}
|
||||
#mail-index_mailPreviewContainer {
|
||||
position: absolute;
|
||||
border: 1px solid silver;
|
||||
|
@ -491,6 +491,9 @@ div.mail-compose_fileselector {
|
||||
padding: 0px;
|
||||
height: 16px !important;
|
||||
}
|
||||
#mail-index_toolbar > #toolbar-actionlist {
|
||||
width: auto;
|
||||
}
|
||||
#mail-index_mailPreviewContainer {
|
||||
position: absolute;
|
||||
border: 1px solid silver;
|
||||
|
Loading…
Reference in New Issue
Block a user