From 38394350ffaf894e399b860531bc9d3cee303e0d Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 22 Dec 2011 12:05:16 +0000
Subject: Let plugins adapt better to different skins

git-svn-id: https://svn.roundcube.net/trunk@5642 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/archive/archive.js                |  6 ++----
 plugins/archive/archive.php               | 13 ++++++++-----
 plugins/archive/localization/en_US.inc    |  1 +
 plugins/archive/package.xml               |  4 ++--
 plugins/archive/skins/default/archive.css | 10 ++++++++++
 5 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 plugins/archive/skins/default/archive.css

(limited to 'plugins/archive')

diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index 5c576e100..af2b0d26d 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -27,10 +27,8 @@ if (window.rcmail) {
     
     // set css style for archive folder
     var li;
-    if (rcmail.env.archive_folder && rcmail.env.archive_folder_icon
-      && (li = rcmail.get_folder_li(rcmail.env.archive_folder, '', true))
-    )
-      $(li).css('background-image', 'url(' + rcmail.env.archive_folder_icon + ')');
+    if (rcmail.env.archive_folder && (li = rcmail.get_folder_li(rcmail.env.archive_folder, '', true)))
+      $(li).addClass('archive');
   })
 }
 
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index a56806263..ffac38a9e 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -20,16 +20,20 @@ class archive extends rcube_plugin
     // There is no "Archived flags"
     // $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
     if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
-      && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
+        && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
       $skin_path = $this->local_skin_path();
-      
+      if (is_file($this->home . "/$skin_path/archive.css"))
+        $this->include_stylesheet("$skin_path/archive.css");
+
       $this->include_script('archive.js');
       $this->add_texts('localization', true);
       $this->add_button(
         array(
+            'type' => 'link',
+            'label' => 'buttontext',
             'command' => 'plugin.archive',
-            'imagepas' => $skin_path.'/archive_pas.png',
-            'imageact' => $skin_path.'/archive_act.png',
+            'class' => 'button buttonPas archive disabled',
+            'classact' => 'button archive',
             'width' => 32,
             'height' => 32,
             'title' => 'buttontitle',
@@ -42,7 +46,6 @@ class archive extends rcube_plugin
 
       // set env variable for client
       $rcmail->output->set_env('archive_folder', $archive_folder);
-      $rcmail->output->set_env('archive_folder_icon', $this->url($skin_path.'/foldericon.png'));
 
       // add archive folder to the list of default mailboxes
       if (($default_folders = $rcmail->config->get('default_imap_folders')) && !in_array($archive_folder, $default_folders)) {
diff --git a/plugins/archive/localization/en_US.inc b/plugins/archive/localization/en_US.inc
index fce31a0b5..01a4f1e13 100644
--- a/plugins/archive/localization/en_US.inc
+++ b/plugins/archive/localization/en_US.inc
@@ -1,6 +1,7 @@
 <?php
 
 $labels = array();
+$labels['buttontext'] = 'Archive';
 $labels['buttontitle'] = 'Archive this message';
 $labels['archived'] = 'Successfully archived';
 $labels['archivefolder'] = 'Archive';
diff --git a/plugins/archive/package.xml b/plugins/archive/package.xml
index c549fc9b7..817157094 100644
--- a/plugins/archive/package.xml
+++ b/plugins/archive/package.xml
@@ -15,8 +15,8 @@
 	</lead>
 	<date>2011-11-23</date>
 	<version>
-		<release>1.5</release>
-		<api>1.4</api>
+		<release>1.6</release>
+		<api>1.6</api>
 	</version>
 	<stability>
 		<release>stable</release>
diff --git a/plugins/archive/skins/default/archive.css b/plugins/archive/skins/default/archive.css
new file mode 100644
index 000000000..9cd221549
--- /dev/null
+++ b/plugins/archive/skins/default/archive.css
@@ -0,0 +1,10 @@
+
+#messagetoolbar a.button.archive {
+	text-indent: -1000px;
+	background: url(archive_act.png) 0 0 no-repeat;
+}
+
+#mailboxlist li.mailbox.archive {
+	background-image: url(foldericon.png);
+	background-position: 5px 1px;
+}
-- 
cgit v1.2.3