Make ACL popups scale to the actual content and avoid scrolling if possible

pull/269/head
Thomas Bruederli 10 years ago
parent 05b11f7ef0
commit 78118e3f60

@ -347,9 +347,12 @@ rcube_webmail.prototype.acl_init_form = function(id)
buttons[this.gettext('save')] = function(e) { me.command('acl-save'); }; buttons[this.gettext('save')] = function(e) { me.command('acl-save'); };
buttons[this.gettext('cancel')] = function(e) { me.command('acl-cancel'); }; buttons[this.gettext('cancel')] = function(e) { me.command('acl-cancel'); };
var popup_wrapper = $('<div style="width:480px; min-height:280px"></div>');
this.acl_form.appendTo(popup_wrapper).show();
// display it as popup // display it as popup
this.acl_popup = this.show_popup_dialog( this.acl_popup = this.show_popup_dialog(
'<div style="width:480px;height:280px">&nbsp;</div>', popup_wrapper,
id ? this.gettext('acl.editperms') : this.gettext('acl.newuser'), id ? this.gettext('acl.editperms') : this.gettext('acl.newuser'),
buttons, buttons,
{ {
@ -365,8 +368,6 @@ rcube_webmail.prototype.acl_init_form = function(id)
} }
); );
this.acl_form.appendTo(this.acl_popup).show();
if (type == 'user') if (type == 'user')
name_input.focus(); name_input.focus();
else else

@ -19,7 +19,7 @@
</ul> </ul>
</div> </div>
<div id="aclform" class="propform" style="position:absolute; width:480px; top:0; left:0; padding:8px" aria-labelledby="aria-label-aclform" aria-hidden="true" role="dialog"> <div id="aclform" class="propform" aria-labelledby="aria-label-aclform" aria-hidden="true" role="dialog">
<h3 id="aria-label-aclform" class="voice"><roundcube:label name="acl.arialabelaclform" /></h3> <h3 id="aria-label-aclform" class="voice"><roundcube:label name="acl.arialabelaclform" /></h3>
<fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend> <fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend>
<roundcube:object name="acluser" id="acluser" size="35" class="proplist" /> <roundcube:object name="acluser" id="acluser" size="35" class="proplist" />

Loading…
Cancel
Save