From 90fab855b79c865083b2fefc74b848d4b6e71aa6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 30 Jul 2012 08:37:16 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
plugins/enigma/skins/classic/enigma_error.png | 0
plugins/enigma/skins/classic/keys_toolbar.png | 0
plugins/enigma/enigma.php | 2 +-
plugins/enigma/skins/classic/enigma.css | 0
plugins/help/help.php | 11 +++++------
plugins/enigma/skins/classic/templates/keyinfo.html | 0
plugins/enigma/skins/classic/key.png | 0
plugins/enigma/skins/classic/key_add.png | 0
plugins/enigma/skins/classic/templates/keyimport.html | 0
plugins/managesieve/managesieve.php | 10 +++++-----
plugins/enigma/skins/classic/enigma.png | 0
plugins/enigma/skins/classic/templates/keys.html | 0
12 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php
index fb7c986..22afc90 100644
--- a/plugins/enigma/enigma.php
+++ b/plugins/enigma/enigma.php
@@ -435,7 +435,7 @@
'href' => "#",
'onclick' => "return ".JS_OBJECT_NAME.".enigma_import_attachment('".JQ($part)."')",
'title' => $this->gettext('keyattimport')),
- html::img(array('src' => $this->url('skins/default/key_add.png'), 'style' => "vertical-align:middle")))
+ html::img(array('src' => $this->url('skins/classic/key_add.png'), 'style' => "vertical-align:middle")))
. ' ' . html::span(null, $this->gettext('keyattfound')));
$attach_script = true;
diff --git a/plugins/enigma/skins/default/enigma.css b/plugins/enigma/skins/classic/enigma.css
similarity index 100%
rename from plugins/enigma/skins/default/enigma.css
rename to plugins/enigma/skins/classic/enigma.css
diff --git a/plugins/enigma/skins/default/enigma.png b/plugins/enigma/skins/classic/enigma.png
similarity index 100%
rename from plugins/enigma/skins/default/enigma.png
rename to plugins/enigma/skins/classic/enigma.png
Binary files differ
diff --git a/plugins/enigma/skins/default/enigma_error.png b/plugins/enigma/skins/classic/enigma_error.png
similarity index 100%
rename from plugins/enigma/skins/default/enigma_error.png
rename to plugins/enigma/skins/classic/enigma_error.png
Binary files differ
diff --git a/plugins/enigma/skins/default/key.png b/plugins/enigma/skins/classic/key.png
similarity index 100%
rename from plugins/enigma/skins/default/key.png
rename to plugins/enigma/skins/classic/key.png
Binary files differ
diff --git a/plugins/enigma/skins/default/key_add.png b/plugins/enigma/skins/classic/key_add.png
similarity index 100%
rename from plugins/enigma/skins/default/key_add.png
rename to plugins/enigma/skins/classic/key_add.png
Binary files differ
diff --git a/plugins/enigma/skins/default/keys_toolbar.png b/plugins/enigma/skins/classic/keys_toolbar.png
similarity index 100%
rename from plugins/enigma/skins/default/keys_toolbar.png
rename to plugins/enigma/skins/classic/keys_toolbar.png
Binary files differ
diff --git a/plugins/enigma/skins/default/templates/keyimport.html b/plugins/enigma/skins/classic/templates/keyimport.html
similarity index 100%
rename from plugins/enigma/skins/default/templates/keyimport.html
rename to plugins/enigma/skins/classic/templates/keyimport.html
diff --git a/plugins/enigma/skins/default/templates/keyinfo.html b/plugins/enigma/skins/classic/templates/keyinfo.html
similarity index 100%
rename from plugins/enigma/skins/default/templates/keyinfo.html
rename to plugins/enigma/skins/classic/templates/keyinfo.html
diff --git a/plugins/enigma/skins/default/templates/keys.html b/plugins/enigma/skins/classic/templates/keys.html
similarity index 100%
rename from plugins/enigma/skins/default/templates/keys.html
rename to plugins/enigma/skins/classic/templates/keys.html
diff --git a/plugins/help/help.php b/plugins/help/help.php
index ad7dbf0..1a76cbb 100644
--- a/plugins/help/help.php
+++ b/plugins/help/help.php
@@ -42,12 +42,11 @@
'label' => 'help.help',
), 'taskbar');
- $skin = $rcmail->config->get('skin');
- if (!file_exists($this->home."/skins/$skin/help.css"))
- $skin = 'default';
-
- // add style for taskbar button (must be here) and Help UI
- $this->include_stylesheet("skins/$skin/help.css");
+ // add style for taskbar button (must be here) and Help UI
+ $skin_path = $this->local_skin_path();
+ if (is_file($this->home . "/$skin_path/help.css")) {
+ $this->include_stylesheet("$skin_path/help.css");
+ }
}
function action()
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 3fb63cd..e7828f1 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -109,16 +109,16 @@
function mail_task_handler()
{
// use jQuery for popup window
- $this->require_plugin('jqueryui');
+ $this->require_plugin('jqueryui');
// include js script and localization
$this->init_ui();
// include styles
- $skin = $this->rc->config->get('skin');
- if (!file_exists($this->home."/skins/$skin/managesieve_mail.css"))
- $skin = 'default';
- $this->include_stylesheet("skins/$skin/managesieve_mail.css");
+ $skin_path = $this->local_skin_path();
+ if (is_file($this->home . "/$skin_path/managesieve_mail.css")) {
+ $this->include_stylesheet("$skin_path/managesieve_mail.css");
+ }
// add 'Create filter' item to message menu
$this->api->add_content(html::tag('li', null,
--
Gitblit v1.9.1