| plugins/acl/acl.js | ●●●●● patch | view | raw | blame | history | |
| plugins/acl/acl.php | ●●●●● patch | view | raw | blame | history | |
| plugins/acl/localization/en_US.inc | ●●●●● patch | view | raw | blame | history | |
| plugins/acl/skins/classic/acl.css | ●●●●● patch | view | raw | blame | history | |
| plugins/acl/skins/classic/templates/table.html | ●●●●● patch | view | raw | blame | history | |
| plugins/acl/skins/larry/acl.css | ●●●●● patch | view | raw | blame | history | |
| plugins/acl/skins/larry/templates/table.html | ●●●●● patch | view | raw | blame | history | |
| program/js/app.js | ●●●●● patch | view | raw | blame | history |
plugins/acl/acl.js
@@ -11,9 +11,11 @@ rcmail.acl_list_init(); // enable autocomplete on user input if (rcmail.env.acl_users_source) { rcmail.init_address_input_events($('#acluser'), {action:'settings/plugin.acl-autocomplete'}); var inst = rcmail.is_framed() ? parent.rcmail : rcmail; inst.init_address_input_events($('#acluser'), {action:'settings/plugin.acl-autocomplete'}); // fix inserted value rcmail.addEventListener('autocomplete_insert', function(e) { inst.addEventListener('autocomplete_insert', function(e) { if (e.field.id != 'acluser') return; @@ -64,14 +66,14 @@ // Save ACL data rcube_webmail.prototype.acl_save = function() { var user = $('#acluser').val(), rights = '', type; var user = $('#acluser', this.acl_form).val(), rights = '', type; $(':checkbox', this.env.acl_advanced ? $('#advancedrights') : sim_ul = $('#simplerights')).map(function() { $((this.env.acl_advanced ? '#advancedrights :checkbox' : '#simplerights :checkbox'), this.acl_form).map(function() { if (this.checked) rights += this.value; }); if (type = $('input:checked[name=usertype]').val()) { if (type = $('input:checked[name=usertype]', this.acl_form).val()) { if (type != 'user') user = type; } @@ -97,7 +99,7 @@ rcube_webmail.prototype.acl_cancel = function() { this.ksearch_blur(); this.acl_form.hide(); this.acl_popup.dialog('close'); } // Update data after save (and hide form) @@ -115,7 +117,7 @@ // hide autocomplete popup this.ksearch_blur(); // hide form this.acl_form.hide(); this.acl_popup.dialog('close'); } // Switch table display mode @@ -302,7 +304,6 @@ if (id && (row = this.acl_list.rows[id])) { row = row.obj; li_elements.map(function() { val = this.value; td = $('td.'+this.id, row); if (td.length && td.hasClass('enabled')) this.checked = true; @@ -314,22 +315,37 @@ type = id; } // mark read (lrs) rights by default else else { li_elements.filter(function() { return this.id.match(/^acl([lrs]|read)$/); }).prop('checked', true); } name_input.val(val); $('input[value='+type+']').prop('checked', true); this.acl_id = id; // position the form horizontally var bw = body.width(), mw = this.acl_form.width(); var me = this, inst = window.rcmail, body = document.body; var buttons = {}; buttons[rcmail.gettext('save')] = function(e) { inst.command('acl-save'); }; buttons[rcmail.gettext('cancel')] = function(e) { inst.command('acl-cancel'); }; if (bw >= mw) this.acl_form.css({left: parseInt((bw - mw)/2)+'px'}); // display it as popup this.acl_popup = rcmail.show_popup_dialog( '<div style="width:480px;height:280px"> </div>', id ? rcmail.gettext('acl.editperms') : rcmail.gettext('acl.newuser'), buttons, { modal: true, closeOnEscape: false, close: function(e, ui) { me.acl_form.appendTo(body).hide(); $(this).remove(); } } ); // display it this.acl_form.show(); this.acl_form.appendTo(this.acl_popup).show(); if (type == 'user') name_input.focus();
@@ -150,7 +150,8 @@ $this->load_config(); $this->specials = $this->rc->config->get('acl_specials', $this->specials); $this->add_texts('localization/', array('deleteconfirm', 'norights', 'nouser', 'deleting', 'saving')); 'nouser', 'deleting', 'saving', 'newuser', 'editperms')); $this->rc->output->add_label('save', 'cancel'); $this->include_script('acl.js'); $this->rc->output->include_script('list.js'); $this->include_stylesheet($this->local_skin_path().'/acl.css'); @@ -307,7 +308,7 @@ . $val); } $out = html::tag('ul', array('id' => 'usertype'), $ul, html::$common_attrib); $out = html::tag('ul', array('id' => 'usertype', 'class' => $attrib['class']), $ul, html::$common_attrib); } // Display text input alone else { plugins/acl/localization/en_US.inc
@@ -21,6 +21,7 @@ $labels['username'] = 'User:'; $labels['advanced'] = 'Advanced mode'; $labels['newuser'] = 'Add entry'; $labels['editperms'] = 'Edit permissions'; $labels['actions'] = 'Access right actions...'; $labels['anyone'] = 'All users (anyone)'; $labels['anonymous'] = 'Guests (anonymous)'; plugins/acl/skins/classic/acl.css
@@ -87,9 +87,7 @@ #aclform { top: 80px; width: 480px; padding: 10px; display: none; } #aclform div plugins/acl/skins/classic/templates/table.html
@@ -24,17 +24,13 @@ </ul> </div> <div id="aclform" class="popupmenu"> <div id="aclform" style="position:absolute; width:480px; top:0; left:0; padding:10px"> <fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend> <roundcube:object name="acluser" class="toolbarmenu" id="acluser" size="35" /> </fieldset> <fieldset class="thinbordered"><legend><roundcube:label name="acl.myrights" /></legend> <roundcube:object name="aclrights" class="toolbarmenu" /> </fieldset> <div> <roundcube:button command="acl-cancel" type="input" class="button" label="cancel" /> <roundcube:button command="acl-save" type="input" class="button mainaction" label="save" /> </div> </div> <script type="text/javascript"> plugins/acl/skins/larry/acl.css
@@ -104,10 +104,7 @@ #aclform { top: 80px; width: 480px; padding: 10px; background-color: white; display: none; } #aclform div plugins/acl/skins/larry/templates/table.html
@@ -17,15 +17,11 @@ </ul> </div> <div id="aclform" class="popupmenu propform"> <div id="aclform" class="propform" style="position:absolute; width:480px; top:0; left:0; padding:8px"> <fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend> <roundcube:object name="acluser" id="acluser" size="35" /> <roundcube:object name="acluser" id="acluser" size="35" class="proplist" /> </fieldset> <fieldset class="thinbordered"><legend><roundcube:label name="acl.myrights" /></legend> <roundcube:object name="aclrights" /> <roundcube:object name="aclrights" class="proplist" /> </fieldset> <div class="formbuttons"> <roundcube:button command="acl-cancel" type="input" class="button" label="cancel" /> <roundcube:button command="acl-save" type="input" class="button mainaction" label="save" /> </div> </div> program/js/app.js
@@ -6335,7 +6335,7 @@ popup.dialog('option', { height: Math.min(h - 40, height + 75 + (buttons ? 50 : 0)), width: Math.min(w - 20, width + 20) width: Math.min(w - 20, width + 36) }); return popup;
