summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-07-30 14:37:16 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-07-30 14:37:16 +0200
commit90fab855b79c865083b2fefc74b848d4b6e71aa6 (patch)
treef7afea180eb80db3a0fb679a81735b2b90d296b5
parenta9cbbae0c8c6b8246897ce5d470e22f026774455 (diff)
parentbc92ca56ef6c51393d2782b7654eaa162dfc2e10 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--plugins/enigma/enigma.php2
-rw-r--r--plugins/enigma/skins/classic/enigma.css (renamed from plugins/enigma/skins/default/enigma.css)0
-rw-r--r--plugins/enigma/skins/classic/enigma.png (renamed from plugins/enigma/skins/default/enigma.png)bin1592 -> 1592 bytes
-rw-r--r--plugins/enigma/skins/classic/enigma_error.png (renamed from plugins/enigma/skins/default/enigma_error.png)bin1960 -> 1960 bytes
-rw-r--r--plugins/enigma/skins/classic/key.png (renamed from plugins/enigma/skins/default/key.png)bin1743 -> 1743 bytes
-rw-r--r--plugins/enigma/skins/classic/key_add.png (renamed from plugins/enigma/skins/default/key_add.png)bin1967 -> 1967 bytes
-rw-r--r--plugins/enigma/skins/classic/keys_toolbar.png (renamed from plugins/enigma/skins/default/keys_toolbar.png)bin14977 -> 14977 bytes
-rw-r--r--plugins/enigma/skins/classic/templates/keyimport.html (renamed from plugins/enigma/skins/default/templates/keyimport.html)0
-rw-r--r--plugins/enigma/skins/classic/templates/keyinfo.html (renamed from plugins/enigma/skins/default/templates/keyinfo.html)0
-rw-r--r--plugins/enigma/skins/classic/templates/keys.html (renamed from plugins/enigma/skins/default/templates/keys.html)0
-rw-r--r--plugins/help/help.php11
-rw-r--r--plugins/managesieve/managesieve.php10
12 files changed, 11 insertions, 12 deletions
diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php
index fb7c98635..22afc901d 100644
--- a/plugins/enigma/enigma.php
+++ b/plugins/enigma/enigma.php
@@ -435,7 +435,7 @@ class enigma extends rcube_plugin
'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
index b1c656f82..b1c656f82 100644
--- a/plugins/enigma/skins/default/enigma.css
+++ b/plugins/enigma/skins/classic/enigma.css
diff --git a/plugins/enigma/skins/default/enigma.png b/plugins/enigma/skins/classic/enigma.png
index 3ef106e2a..3ef106e2a 100644
--- a/plugins/enigma/skins/default/enigma.png
+++ b/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
index 9bf100efd..9bf100efd 100644
--- a/plugins/enigma/skins/default/enigma_error.png
+++ b/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
index ea1cbd11c..ea1cbd11c 100644
--- a/plugins/enigma/skins/default/key.png
+++ b/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
index f22cc870a..f22cc870a 100644
--- a/plugins/enigma/skins/default/key_add.png
+++ b/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
index 7cc258cc8..7cc258cc8 100644
--- a/plugins/enigma/skins/default/keys_toolbar.png
+++ b/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
index 4e0b304a5..4e0b304a5 100644
--- a/plugins/enigma/skins/default/templates/keyimport.html
+++ b/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
index 2e8ed61db..2e8ed61db 100644
--- a/plugins/enigma/skins/default/templates/keyinfo.html
+++ b/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
index 4271eccb7..4271eccb7 100644
--- a/plugins/enigma/skins/default/templates/keys.html
+++ b/plugins/enigma/skins/classic/templates/keys.html
diff --git a/plugins/help/help.php b/plugins/help/help.php
index ad7dbf0ba..1a76cbbda 100644
--- a/plugins/help/help.php
+++ b/plugins/help/help.php
@@ -42,12 +42,11 @@ class help extends rcube_plugin
'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 3fb63cd5b..e7828f1da 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -109,16 +109,16 @@ class managesieve extends rcube_plugin
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,