From a6f38ae792776f3593d7dc7345707ac7c358ccb5 Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 12 Oct 2011 09:47:15 +0000 Subject: - Use smaller action/rule buttons, create separate dir for images git-svn-id: https://svn.roundcube.net/trunk@5334 208e9e7b-5314-0410-a742-e7e81cd9613c --- plugins/managesieve/Changelog | 1 + plugins/managesieve/managesieve.js | 8 +++++-- plugins/managesieve/managesieve.php | 18 +++++++------- plugins/managesieve/skins/default/filter.png | Bin 547 -> 0 bytes plugins/managesieve/skins/default/images/add.png | Bin 0 -> 280 bytes plugins/managesieve/skins/default/images/del.png | Bin 0 -> 247 bytes .../managesieve/skins/default/images/filter.png | Bin 0 -> 547 bytes .../managesieve/skins/default/images/toolbar.png | Bin 0 -> 12093 bytes plugins/managesieve/skins/default/managesieve.css | 26 ++++++++++++++++++++- .../managesieve/skins/default/managesieve_mail.css | 2 +- .../skins/default/managesieve_toolbar.png | Bin 12093 -> 0 bytes 11 files changed, 41 insertions(+), 14 deletions(-) delete mode 100644 plugins/managesieve/skins/default/filter.png create mode 100644 plugins/managesieve/skins/default/images/add.png create mode 100644 plugins/managesieve/skins/default/images/del.png create mode 100644 plugins/managesieve/skins/default/images/filter.png create mode 100644 plugins/managesieve/skins/default/images/toolbar.png delete mode 100644 plugins/managesieve/skins/default/managesieve_toolbar.png (limited to 'plugins') diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index dfe5f0d58..f180f6792 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -9,6 +9,7 @@ - Added filters set selector in filter form when invoked in mail task - Improved script parser, added support for include and variables extensions - Added Kolab's KEP:14 support (http://wiki.kolab.org/User:Greve/Drafts/KEP:14) +- Use smaller action/rule buttons * version 4.3 [2011-07-28] ----------------------------------------------------------- diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js index 647f732f5..8f710b4c0 100644 --- a/plugins/managesieve/managesieve.js +++ b/plugins/managesieve/managesieve.js @@ -328,6 +328,9 @@ rcube_webmail.prototype.managesieve_rulefill = function(content, id, after) rcube_webmail.prototype.managesieve_ruledel = function(id) { + if ($('#ruledel'+id).hasClass('disabled')) + return; + if (confirm(this.get_label('managesieve.ruledeleteconfirm'))) { var row = document.getElementById('rulerow'+id); row.parentNode.removeChild(row); @@ -358,6 +361,9 @@ rcube_webmail.prototype.managesieve_actionfill = function(content, id, after) rcube_webmail.prototype.managesieve_actiondel = function(id) { + if ($('#actiondel'+id).hasClass('disabled')) + return; + if (confirm(this.get_label('managesieve.actiondeleteconfirm'))) { var row = document.getElementById('actionrow'+id); row.parentNode.removeChild(row); @@ -400,11 +406,9 @@ rcube_webmail.prototype.managesieve_formbuttons = function(div) button = document.getElementById(buttons[i]); if (i>0 || buttons.length>1) { $(button).removeClass('disabled'); - button.removeAttribute('disabled'); } else { $(button).addClass('disabled'); - button.setAttribute('disabled', true); } } }; diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php index ff27486d9..e7977dd85 100644 --- a/plugins/managesieve/managesieve.php +++ b/plugins/managesieve/managesieve.php @@ -1171,11 +1171,10 @@ class managesieve extends rcube_plugin // add/del buttons $out .= ''; - $out .= ' '; - $out .= ''; + $out .= ''; + $out .= ''; $out .= ''; $out .= $div ? "\n" : ''; @@ -1296,11 +1295,10 @@ class managesieve extends rcube_plugin // add/del buttons $out .= ''; - $out .= ' '; - $out .= ''; + $out .= ''; + $out .= ''; $out .= ''; $out .= ''; diff --git a/plugins/managesieve/skins/default/filter.png b/plugins/managesieve/skins/default/filter.png deleted file mode 100644 index a79ba1083..000000000 Binary files a/plugins/managesieve/skins/default/filter.png and /dev/null differ diff --git a/plugins/managesieve/skins/default/images/add.png b/plugins/managesieve/skins/default/images/add.png new file mode 100644 index 000000000..97a6422fb Binary files /dev/null and b/plugins/managesieve/skins/default/images/add.png differ diff --git a/plugins/managesieve/skins/default/images/del.png b/plugins/managesieve/skins/default/images/del.png new file mode 100644 index 000000000..518905bc4 Binary files /dev/null and b/plugins/managesieve/skins/default/images/del.png differ diff --git a/plugins/managesieve/skins/default/images/filter.png b/plugins/managesieve/skins/default/images/filter.png new file mode 100644 index 000000000..a79ba1083 Binary files /dev/null and b/plugins/managesieve/skins/default/images/filter.png differ diff --git a/plugins/managesieve/skins/default/images/toolbar.png b/plugins/managesieve/skins/default/images/toolbar.png new file mode 100644 index 000000000..473dbc8df Binary files /dev/null and b/plugins/managesieve/skins/default/images/toolbar.png differ diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/default/managesieve.css index 88f15bd59..6f4b5609c 100644 --- a/plugins/managesieve/skins/default/managesieve.css +++ b/plugins/managesieve/skins/default/managesieve.css @@ -61,7 +61,7 @@ padding: 0; margin-right: 3px; overflow: hidden; - background: url(managesieve_toolbar.png) 0 0 no-repeat transparent; + background: url(images/toolbar.png) 0 0 no-repeat transparent; opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */ } @@ -293,6 +293,30 @@ span.sieve.error width: 200px; } +a.button.add +{ + background: url(images/add.png) no-repeat; + width: 30px; + height: 20px; + margin-right: 4px; + display: inline-block; +} + +a.button.del +{ + background: url(images/del.png) no-repeat; + width: 30px; + height: 20px; + display: inline-block; +} + +a.button.disabled +{ + opacity: 0.35; + filter: alpha(opacity=35); + cursor: default; +} + /* fixes for popup window */ body.iframe.mail diff --git a/plugins/managesieve/skins/default/managesieve_mail.css b/plugins/managesieve/skins/default/managesieve_mail.css index 5bb2a2825..7fefaedf1 100644 --- a/plugins/managesieve/skins/default/managesieve_mail.css +++ b/plugins/managesieve/skins/default/managesieve_mail.css @@ -1,5 +1,5 @@ #messagemenu li a.filterlink { - background-image: url(filter.png); + background-image: url(images/filter.png); background-position: 7px 0; } diff --git a/plugins/managesieve/skins/default/managesieve_toolbar.png b/plugins/managesieve/skins/default/managesieve_toolbar.png deleted file mode 100644 index 473dbc8df..000000000 Binary files a/plugins/managesieve/skins/default/managesieve_toolbar.png and /dev/null differ -- cgit v1.2.3