From affabd9a4b24d08ac4beb5828fc0103b4f36e3ef Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 04 Feb 2014 16:50:15 -0500
Subject: [PATCH] Fix some glitches in ACL table display
---
plugins/acl/skins/larry/acl.css | 9 +++++++--
plugins/acl/skins/larry/templates/table.html | 2 +-
plugins/acl/localization/en_US.inc | 2 +-
plugins/acl/acl.js | 4 +++-
skins/larry/styles.css | 2 +-
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index 6da96f3..0ee45d7 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -134,7 +134,9 @@
// ACL table initialization
rcube_webmail.prototype.acl_list_init = function()
{
- $('#acl-switch')[this.env.acl_advanced ? 'addClass' : 'removeClass']('selected');
+ var method = this.env.acl_advanced ? 'addClass' : 'removeClass';
+ $('#acl-switch')[method]('selected');
+ $(this.gui_objects.acltable)[method]('advanced');
this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
{multiselect:true, draggable:false, keyboard:true, toggleselect:true});
diff --git a/plugins/acl/localization/en_US.inc b/plugins/acl/localization/en_US.inc
index 390a08b..ce66576 100644
--- a/plugins/acl/localization/en_US.inc
+++ b/plugins/acl/localization/en_US.inc
@@ -19,7 +19,7 @@
$labels['sharing'] = 'Sharing';
$labels['myrights'] = 'Access Rights';
$labels['username'] = 'User:';
-$labels['advanced'] = 'advanced mode';
+$labels['advanced'] = 'Advanced mode';
$labels['newuser'] = 'Add entry';
$labels['editperms'] = 'Edit permissions';
$labels['actions'] = 'Access right actions...';
diff --git a/plugins/acl/skins/larry/acl.css b/plugins/acl/skins/larry/acl.css
index 9c74294..b1636990 100644
--- a/plugins/acl/skins/larry/acl.css
+++ b/plugins/acl/skins/larry/acl.css
@@ -38,19 +38,25 @@
border-left: #BBD3DA dotted 1px;
font-size: 11px;
font-weight: bold;
+ width: auto;
}
#acltable tbody td
{
border-bottom: #DDDDDD 1px solid;
text-align: center;
- padding: 2px;
+ height: 16px;
cursor: default;
}
#acltable thead td.user
{
border-left: none;
+ width: 30%;
+}
+
+#acltable.advanced thead td.user {
+ width: 25%;
}
#acltable tbody td.user
@@ -60,7 +66,6 @@
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
border-left: none;
- width: 50px;
}
#acltable tbody td.partial
diff --git a/plugins/acl/skins/larry/templates/table.html b/plugins/acl/skins/larry/templates/table.html
index c7c5463..c0b8329 100644
--- a/plugins/acl/skins/larry/templates/table.html
+++ b/plugins/acl/skins/larry/templates/table.html
@@ -12,7 +12,7 @@
<li><roundcube:button command="acl-edit" label="edit" class="icon" classAct="icon active" innerclass="icon edit" /></li>
<li><roundcube:button command="acl-delete" label="delete" class="icon" classAct="icon active" innerclass="icon delete" /></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>
+ <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch');return false" class="active" /></li>
<roundcube:endif />
</ul>
</div>
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 4cdf0f0..e1a8133 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1424,7 +1424,7 @@
.records-table tr.unfocused td {
color: #fff !important;
- background: #4db0d2 !important;
+ background-color: #4db0d2 !important;
}
.records-table tr.unfocused td a,
--
Gitblit v1.9.1