Changeset 5334 in subversion

Timestamp:

Oct 12, 2011 5:47:15 AM (20 months ago)

Author:

alec

Message:

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

Location:

trunk/plugins/managesieve

Files:

• Changelog (modified) (1 diff)
• managesieve.js (modified) (3 diffs)
• managesieve.php (modified) (2 diffs)
• skins/default/filter.png (deleted)
• skins/default/images (added)
• skins/default/images/add.png (added)
• skins/default/images/del.png (added)
• skins/default/images/filter.png (added)
• skins/default/images/toolbar.png (added)
• skins/default/managesieve.css (modified) (2 diffs)
• skins/default/managesieve_mail.css (modified) (1 diff)
• skins/default/managesieve_toolbar.png (deleted)

trunk/plugins/managesieve/Changelog

@@ -10 +10 @@
 - 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]

trunk/plugins/managesieve/managesieve.js

@@ -329 +329 @@
 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);
@@ -359 +362 @@
 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);
@@ -401 +407 @@
     if (i>0 || buttons.length>1) {
       $(button).removeClass('disabled');
-      button.removeAttribute('disabled');
     }
     else {
       $(button).addClass('disabled');
-      button.setAttribute('disabled', true);
     }
   }

trunk/plugins/managesieve/managesieve.php

@@ -1172 +1172 @@
         // 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>';
 
@@ -1297 +1296 @@
         // 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>';
 

trunk/plugins/managesieve/skins/default/managesieve.css

@@ -62 +62 @@
   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 */
 }
@@ -294 +294 @@
 }
 
+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 */
 

trunk/plugins/managesieve/skins/default/managesieve_mail.css

@@ -1 +1 @@
 #messagemenu li a.filterlink {
-  background-image: url(filter.png);
+  background-image: url(images/filter.png);
   background-position: 7px 0;
 }