- Support skins in 'archive' and 'markasjunk' plugins

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

5 files changed, 13 insertions, 9 deletions

diff --git a/roundcubemail/plugins/archive/archive.js b/roundcubemail/plugins/archive/archive.js
index d771fb66b..954fd1549 100644
--- a/roundcubemail/plugins/archive/archive.js
+++ b/roundcubemail/plugins/archive/archive.js
@@ -29,8 +29,8 @@ if (window.rcmail) {
     
     // set css style for archive folder
     var li;
-    if (rcmail.env.archive_folder && (li = rcmail.get_folder_li(rcmail.env.archive_folder)))
-      $(li).css('background-image', 'url(plugins/archive/foldericon.png)');
+    if (rcmail.env.archive_folder && rcmail.env.archive_folder_icon && (li = rcmail.get_folder_li(rcmail.env.archive_folder)))
+      $(li).css('background-image', 'url(' + rcmail.env.archive_folder_icon + ')');
   })
 }
 
diff --git a/roundcubemail/plugins/archive/archive.php b/roundcubemail/plugins/archive/archive.php
index 9df7f8b99..7750160c5 100644
--- a/roundcubemail/plugins/archive/archive.php
+++ b/roundcubemail/plugins/archive/archive.php
@@ -17,18 +17,22 @@ class archive extends rcube_plugin
   {
     $this->register_action('plugin.archive', array($this, 'request_action'));
 
-    # There is no "Archived flags"
-    # $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
+    // There is no "Archived flags"
+    // $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
     
     $rcmail = rcmail::get_instance();
-    if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show') && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
+    if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
+      && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
+
+      $skin_path = 'skins/'.$rcmail->output->config['skin'];
+
       $this->include_script('archive.js');
       $this->add_texts('localization', true);
       $this->add_button(
         array(
             'command' => 'plugin.archive',
-            'imagepas' => 'archive_pas.png',
-            'imageact' => 'archive_act.png',
+            'imagepas' => $skin_path.'/archive_pas.png',
+            'imageact' => $skin_path.'/archive_act.png',
             'title' => 'buttontitle',
             'domain' => $this->ID,
         ),
@@ -39,13 +43,13 @@ 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)) {
         $default_folders[] = $archive_folder;
         $rcmail->config->set('default_imap_folders', $default_folders);
-      }
-      
+      }  
     }
     else if ($rcmail->task == 'settings') {
       $dont_override = $rcmail->config->get('dont_override', array());
diff --git a/roundcubemail/plugins/archive/archive_act.png b/roundcubemail/plugins/archive/skins/default/archive_act.png
index 2a1735868..2a1735868 100644
--- a/roundcubemail/plugins/archive/archive_act.png
+++ b/roundcubemail/plugins/archive/skins/default/archive_act.png
diff --git a/roundcubemail/plugins/archive/archive_pas.png b/roundcubemail/plugins/archive/skins/default/archive_pas.png
index 8de208583..8de208583 100644
--- a/roundcubemail/plugins/archive/archive_pas.png
+++ b/roundcubemail/plugins/archive/skins/default/archive_pas.png
diff --git a/roundcubemail/plugins/archive/foldericon.png b/roundcubemail/plugins/archive/skins/default/foldericon.png
index ec0853c44..ec0853c44 100644
--- a/roundcubemail/plugins/archive/foldericon.png
+++ b/roundcubemail/plugins/archive/skins/default/foldericon.png