From d9012055cbc94e478c41c975c2d22843d847b065 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Jun 2012 05:18:52 -0400
Subject: [PATCH] Moved advanced switch into table actions menu - fixed css issue in Larry skin
---
plugins/acl/skins/larry/acl.css | 20 ++++++++++----------
plugins/acl/skins/larry/templates/table.html | 11 ++++-------
plugins/acl/acl.js | 5 +++++
plugins/acl/package.xml | 2 +-
plugins/acl/skins/default/templates/table.html | 12 ++++--------
5 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index aa9e06d..b6e2c81 100644
--- a/plugins/acl/acl.js
+++ b/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); });
diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
index 5f86384..9ef91d1 100644
--- a/plugins/acl/package.xml
+++ b/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>
diff --git a/plugins/acl/skins/default/templates/table.html b/plugins/acl/skins/default/templates/table.html
index 2365ef7..bca63d0 100644
--- a/plugins/acl/skins/default/templates/table.html
+++ b/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>
diff --git a/plugins/acl/skins/larry/acl.css b/plugins/acl/skins/larry/acl.css
index 658480e..5e2448e 100644
--- a/plugins/acl/skins/larry/acl.css
+++ b/plugins/acl/skins/larry/acl.css
@@ -79,21 +79,21 @@
#acltable tbody tr.selected td.partial
{
- background-color: #019bc6;
- background-image: url(images/partial.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background-image: url(images/partial.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
- background-image: url(images/partial.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background-image: url(images/partial.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background-color: #019bc6;
+ background-image: url(images/partial.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background-image: url(images/partial.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
+ background-image: url(images/partial.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background-image: url(images/partial.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
background-image: url(images/partial.png), linear-gradient(top, #019bc6 0%, #017cb4 100%);
}
#acltable tbody tr.selected td.enabled
{
- background-color: #019bc6;
- background-image: url(images/enabled.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background-image: url(images/enabled.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
- background-image: url(images/enabled.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background-image: url(images/enabled.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background-color: #019bc6;
+ background-image: url(images/enabled.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background-image: url(images/enabled.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
+ background-image: url(images/enabled.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background-image: url(images/enabled.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
background-image: url(images/enabled.png), linear-gradient(top, #019bc6 0%, #017cb4 100%);
}
diff --git a/plugins/acl/skins/larry/templates/table.html b/plugins/acl/skins/larry/templates/table.html
index c8dff81..7f99f6f 100644
--- a/plugins/acl/skins/larry/templates/table.html
+++ b/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="⚙" />
- <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>
--
Gitblit v1.9.1