Moved advanced switch into table actions menu - fixed css issue in Larry skin

Aleksander Machniak

2012-06-28 d9012055cbc94e478c41c975c2d22843d847b065

Moved advanced switch into table actions menu - fixed css issue in Larry skin

 plugins/acl/acl.js

@@ -28,6 +28,9 @@

        rcmail.enable_command('acl-create', 'acl-save', 'acl-cancel', 'acl-mode-switch', true);
        rcmail.enable_command('acl-delete', 'acl-edit', false);

        if (rcmail.env.acl_advanced)
            $('#acl-switch').addClass('selected');
    });
}

@@ -129,6 +132,8 @@
// ACL table initialization
rcube_webmail.prototype.acl_list_init = function()
{
    $('#acl-switch')[this.env.acl_advanced ? 'addClass' : 'removeClass']('selected');

    this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
        {multiselect:true, draggable:false, keyboard:true, toggleselect:true});
    this.acl_list.addEventListener('select', function(o) { rcmail.acl_list_select(o); });

 plugins/acl/package.xml

@@ -15,7 +15,7 @@
    </lead>
    <date>2012-06-28</date>
    <version>
        <release>0.9</release>
        <release>1.0</release>
        <api>0.7</api>
    </version>
    <stability>

 plugins/acl/skins/default/templates/table.html

@@ -11,20 +11,16 @@
<div class="boxfooter">
    <roundcube:button command="acl-create" id="aclcreatelink" type="link" title="acl.newuser" class="buttonPas addgroup" classAct="button addgroup" content=" " />
    <roundcube:button name="aclmenulink" id="aclmenulink" type="link" title="acl.actions" class="button groupactions" onclick="show_aclmenu(); return false" content=" " />
    <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
    <div id="acladvswitch" class="pagenav">
        <span><label for="acl-switch"><roundcube:label name="acl.advanced" /></label>
        <input type="checkbox" id="acl-switch" onclick="rcmail.command('acl-mode-switch')"<roundcube:exp expression="config:acl_advanced_mode == true ? ' checked=checked' : ''" /> />
        </span>
    </div>
    <roundcube:endif />
</div>
</div>

<div id="aclmenu" class="popupmenu">
<div id="aclmenu" class="popupmenu selectable">
    <ul>
        <li><roundcube:button command="acl-edit" label="edit" classAct="active" /></li>
        <li><roundcube:button command="acl-delete" label="delete" classAct="active" /></li>
        <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
            <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch')" class="active" /></li>
        <roundcube:endif />
    </ul>
</div>


 plugins/acl/skins/larry/acl.css

 plugins/acl/skins/larry/templates/table.html

@@ -4,19 +4,16 @@
</div>
<div id="acllist-footer" class="boxfooter">
    <roundcube:button command="acl-create" id="aclcreatelink" type="link" title="acl.newuser" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="aclmenulink" id="aclmenulink" type="link" title="acl.actions" class="listbutton groupactions"onclick="UI.show_popup('aclmenu');return false" innerClass="inner" content="&#9881;" />
    <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
        <span class="countdisplay" style="display: inline">
        <label for="acl-switch"><roundcube:label name="acl.advanced" /></label>
        <input type="checkbox" id="acl-switch" onclick="rcmail.command('acl-mode-switch')"<roundcube:exp expression="config:acl_advanced_mode == true ? ' checked=checked' : ''" /> />
        </span>
    <roundcube:endif />
</div>
</div>

<div id="aclmenu" class="popupmenu">
    <ul class="toolbarmenu">
    <ul class="toolbarmenu selectable">
        <li><roundcube:button command="acl-edit" label="edit" classAct="active" /></li>
        <li><roundcube:button command="acl-delete" label="delete" classAct="active" /></li>
        <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
            <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch')" class="active" /></li>
        <roundcube:endif />
    </ul>
</div>