- Use smaller action/rule buttons, create separate dir for images

git-svn-id: https://svn.roundcube.net/trunk@5334 208e9e7b-5314-0410-a742-e7e81cd9613c

9 files changed, 41 insertions, 14 deletions

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 .= '<td class="rowbuttons">';
-        $out .= '<input type="button" id="ruleadd' . $id .'" value="'. Q($this->gettext('add')). '"
-            onclick="rcmail.managesieve_ruleadd(' . $id .')" class="button" /> ';
-        $out .= '<input type="button" id="ruledel' . $id .'" value="'. Q($this->gettext('del')). '"
-            onclick="rcmail.managesieve_ruledel(' . $id .')" class="button' . ($rows_num<2 ? ' disabled' : '') .'"'
-            . ($rows_num<2 ? ' disabled="disabled"' : '') .' />';
+        $out .= '<a href="#" id="ruleadd' . $id .'" title="'. Q($this->gettext('add')). '"
+            onclick="rcmail.managesieve_ruleadd(' . $id .')" class="button add"></a>';
+        $out .= '<a href="#" id="ruledel' . $id .'" title="'. Q($this->gettext('del')). '"
+            onclick="rcmail.managesieve_ruledel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
         $out .= '</td></tr></table>';
 
         $out .= $div ? "</div>\n" : '';
@@ -1296,11 +1295,10 @@ class managesieve extends rcube_plugin
 
         // add/del buttons
         $out .= '<td class="rowbuttons">';
-        $out .= '<input type="button" id="actionadd' . $id .'" value="'. Q($this->gettext('add')). '"
-            onclick="rcmail.managesieve_actionadd(' . $id .')" class="button" /> ';
-        $out .= '<input type="button" id="actiondel' . $id .'" value="'. Q($this->gettext('del')). '"
-            onclick="rcmail.managesieve_actiondel(' . $id .')" class="button' . ($rows_num<2 ? ' disabled' : '') .'"'
-            . ($rows_num<2 ? ' disabled="disabled"' : '') .' />';
+        $out .= '<a href="#" id="actionadd' . $id .'" title="'. Q($this->gettext('add')). '"
+            onclick="rcmail.managesieve_actionadd(' . $id .')" class="button add"></a>';
+        $out .= '<a href="#" id="actiondel' . $id .'" title="'. Q($this->gettext('del')). '"
+            onclick="rcmail.managesieve_actiondel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
         $out .= '</td>';
 
         $out .= '</tr></table>';
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
--- /dev/null
+++ b/plugins/managesieve/skins/default/images/add.png
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
--- /dev/null
+++ b/plugins/managesieve/skins/default/images/del.png
diff --git a/plugins/managesieve/skins/default/filter.png b/plugins/managesieve/skins/default/images/filter.png
index a79ba1083..a79ba1083 100644
--- a/plugins/managesieve/skins/default/filter.png
+++ b/plugins/managesieve/skins/default/images/filter.png
diff --git a/plugins/managesieve/skins/default/managesieve_toolbar.png b/plugins/managesieve/skins/default/images/toolbar.png
index 473dbc8df..473dbc8df 100644
--- a/plugins/managesieve/skins/default/managesieve_toolbar.png
+++ b/plugins/managesieve/skins/default/images/toolbar.png
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;
 }