From 686f0dacddc045a4db4557d9932f1ae596a90fe0 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 12 Mar 2015 13:45:30 +0100
Subject: [PATCH] Simplify HTML structure of ACL dialogs

---
 plugins/acl/acl.js                             | 5 +----
 plugins/acl/skins/classic/templates/table.html | 2 +-
 plugins/acl/skins/larry/templates/table.html   | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index af52b5b6f..f1e9922fb 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -347,12 +347,9 @@ rcube_webmail.prototype.acl_init_form = function(id)
     buttons[this.gettext('save')] = function(e) { me.command('acl-save'); };
     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
     this.acl_popup = this.show_popup_dialog(
-        popup_wrapper,
+        this.acl_form.show(),
         id ? this.gettext('acl.editperms') : this.gettext('acl.newuser'),
         buttons,
         {
diff --git a/plugins/acl/skins/classic/templates/table.html b/plugins/acl/skins/classic/templates/table.html
index 5c4d2d8a0..f19998cf4 100644
--- a/plugins/acl/skins/classic/templates/table.html
+++ b/plugins/acl/skins/classic/templates/table.html
@@ -24,7 +24,7 @@
     </ul>
 </div>
 
-<div id="aclform" style="position:absolute; width:480px; top:0; left:0; padding:10px">
+<div id="aclform" style="padding:10px 0">
     <fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend>
         <roundcube:object name="acluser" class="toolbarmenu" id="acluser" size="35" />
     </fieldset>
diff --git a/plugins/acl/skins/larry/templates/table.html b/plugins/acl/skins/larry/templates/table.html
index 2854524df..a4399ab98 100644
--- a/plugins/acl/skins/larry/templates/table.html
+++ b/plugins/acl/skins/larry/templates/table.html
@@ -19,7 +19,7 @@
     </ul>
 </div>
 
-<div id="aclform" class="propform" aria-labelledby="aria-label-aclform" aria-hidden="true" role="dialog">
+<div id="aclform" class="propform" aria-labelledby="aria-label-aclform" role="form">
     <h3 id="aria-label-aclform" class="voice"><roundcube:label name="acl.arialabelaclform" /></h3>
     <fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend>
         <roundcube:object name="acluser" id="acluser" size="35" class="proplist" />