From 9f1652e29e2ed8be815cae4abf42bde989ffeb22 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 30 Jul 2012 06:04:43 -0400
Subject: [PATCH] Adapt to new default skin folder namimg
---
plugins/archive/package.xml | 6 +-
plugins/markasjunk/package.xml | 4 +-
plugins/vcard_attachments/package.xml | 6 +-
plugins/acl/package.xml | 8 ++--
plugins/hide_blockquote/package.xml | 2
plugins/jqueryui/package.xml | 32 ++++++++--------
config/main.inc.php.dist | 2
program/include/rcube_config.php | 12 +++--
program/include/rcube_plugin.php | 9 +++-
plugins/help/package.xml | 6 +-
plugins/jqueryui/config.inc.php.dist | 1
plugins/jqueryui/jqueryui.php | 4 +-
plugins/managesieve/package.xml | 20 +++++-----
13 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 7c22b8f..ad37c1b 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -678,7 +678,7 @@
$rcmail_config['default_charset'] = 'ISO-8859-1';
// skin name: folder from skins/
-$rcmail_config['skin'] = 'default';
+$rcmail_config['skin'] = 'larry';
// show up to X items in messages list view
$rcmail_config['mail_pagesize'] = 50;
diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
index 9ef91d1..e5d411e 100644
--- a/plugins/acl/package.xml
+++ b/plugins/acl/package.xml
@@ -38,10 +38,10 @@
<file name="localization/de_DE.inc" role="data"></file>
<file name="localization/en_US.inc" role="data"></file>
<file name="localization/pl_PL.inc" role="data"></file>
- <file name="skins/default/acl.css" role="data"></file>
- <file name="skins/default/images/enabled.png" role="data"></file>
- <file name="skins/default/images/partial.png" role="data"></file>
- <file name="skins/default/templates/table.html" role="data"></file>
+ <file name="skins/classic/acl.css" role="data"></file>
+ <file name="skins/classic/images/enabled.png" role="data"></file>
+ <file name="skins/classic/images/partial.png" role="data"></file>
+ <file name="skins/classic/templates/table.html" role="data"></file>
<file name="skins/larry/acl.css" role="data"></file>
<file name="skins/larry/images/enabled.png" role="data"></file>
<file name="skins/larry/images/partial.png" role="data"></file>
diff --git a/plugins/archive/package.xml b/plugins/archive/package.xml
index 0d02b2d..1aeffaf 100644
--- a/plugins/archive/package.xml
+++ b/plugins/archive/package.xml
@@ -50,9 +50,9 @@
<file name="localization/ru_RU.inc" role="data"></file>
<file name="localization/sv_SE.inc" role="data"></file>
<file name="localization/zh_TW.inc" role="data"></file>
- <file name="skins/default/archive_act.png" role="data"></file>
- <file name="skins/default/archive_pas.png" role="data"></file>
- <file name="skins/default/foldericon.png" role="data"></file>
+ <file name="skins/classic/archive_act.png" role="data"></file>
+ <file name="skins/classic/archive_pas.png" role="data"></file>
+ <file name="skins/classic/foldericon.png" role="data"></file>
</dir>
<!-- / -->
</contents>
diff --git a/plugins/help/package.xml b/plugins/help/package.xml
index 67e83fb..2c4fd2c 100644
--- a/plugins/help/package.xml
+++ b/plugins/help/package.xml
@@ -33,9 +33,9 @@
<file name="content/about.html" role="data"></file>
<file name="content/license.html" role="data"></file>
<file name="config.inc.php.dist" role="data"></file>
- <file name="skins/default/help.css" role="data"></file>
- <file name="skins/default/help.gif" role="data"></file>
- <file name="skins/default/templates/help.html" role="data"></file>
+ <file name="skins/classic/help.css" role="data"></file>
+ <file name="skins/classic/help.gif" role="data"></file>
+ <file name="skins/classic/templates/help.html" role="data"></file>
<file name="localization/cs_CZ.inc" role="data"></file>
<file name="localization/da_DK.inc" role="data"></file>
<file name="localization/de_DE.inc" role="data"></file>
diff --git a/plugins/hide_blockquote/package.xml b/plugins/hide_blockquote/package.xml
index 8336912..0d895c1 100644
--- a/plugins/hide_blockquote/package.xml
+++ b/plugins/hide_blockquote/package.xml
@@ -36,7 +36,7 @@
</file>
<file name="localization/en_US.inc" role="data"></file>
<file name="localization/pl_PL.inc" role="data"></file>
- <file name="skins/default/style.css" role="data"></file>
+ <file name="skins/classic/style.css" role="data"></file>
</dir>
<!-- / -->
</contents>
diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist
index 65c0175..a3c3f75 100644
--- a/plugins/jqueryui/config.inc.php.dist
+++ b/plugins/jqueryui/config.inc.php.dist
@@ -6,6 +6,7 @@
// map Roundcube skins with jquery-ui themes here
$rcmail_config['jquery_ui_skin_map'] = array(
'larry' => 'larry',
+ 'default' => 'larry',
'groupvice4' => 'redmond',
);
diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
index 69b9ca1..f82a149 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -24,7 +24,7 @@
$this->include_script("js/jquery-ui-$version.custom.min.js");
// include UI stylesheet
- $skin = $rcmail->config->get('skin', 'default');
+ $skin = $rcmail->config->get('skin');
$ui_map = $rcmail->config->get('jquery_ui_skin_map', array());
$ui_theme = $ui_map[$skin] ? $ui_map[$skin] : $skin;
@@ -32,7 +32,7 @@
$this->include_stylesheet("themes/$ui_theme/jquery-ui-$version.custom.css");
}
else {
- $this->include_stylesheet("themes/default/jquery-ui-$version.custom.css");
+ $this->include_stylesheet("themes/larry/jquery-ui-$version.custom.css");
}
// jquery UI localization
diff --git a/plugins/jqueryui/package.xml b/plugins/jqueryui/package.xml
index 18f241a..1d26516 100644
--- a/plugins/jqueryui/package.xml
+++ b/plugins/jqueryui/package.xml
@@ -99,22 +99,22 @@
<file name="js/i18n/jquery.ui.datepicker-zh-HK.js" role="data"></file>
<file name="js/i18n/jquery.ui.datepicker-zh-TW.js" role="data"></file>
- <file name="themes/default/jquery-ui-1.8.14.custom.css" role="data"></file>
- <file name="themes/default/roundcube-custom.diff" role="data"></file>
- <file name="themes/default/images/buttongradient.png" role="data"></file>
- <file name="themes/default/images/ui-bg_flat_90_cc3333_40x100.png" role="data"></file>
- <file name="themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png" role="data"></file>
- <file name="themes/default/images/ui-icons_cc3333_256x240.png" role="data"></file>
- <file name="themes/default/images/listheader.png" role="data"></file>
- <file name="themes/default/images/ui-bg_glass_95_fef1ec_1x400.png" role="data"></file>
- <file name="themes/default/images/ui-icons_000000_256x240.png" role="data"></file>
- <file name="themes/default/images/ui-icons_dddddd_256x240.png" role="data"></file>
- <file name="themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
- <file name="themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png" role="data"></file>
- <file name="themes/default/images/ui-icons_333333_256x240.png" role="data"></file>
- <file name="themes/default/images/ui-bg_flat_75_ffffff_40x100.png" role="data"></file>
- <file name="themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png" role="data"></file>
- <file name="themes/default/images/ui-icons_666666_256x240.png" role="data"></file>
+ <file name="themes/classic/jquery-ui-1.8.14.custom.css" role="data"></file>
+ <file name="themes/classic/roundcube-custom.diff" role="data"></file>
+ <file name="themes/classic/images/buttongradient.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_flat_90_cc3333_40x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_cc3333_256x240.png" role="data"></file>
+ <file name="themes/classic/images/listheader.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_000000_256x240.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_dddddd_256x240.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_333333_256x240.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_flat_75_ffffff_40x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png" role="data"></file>
+ <file name="themes/classic/images/ui-icons_666666_256x240.png" role="data"></file>
<file name="themes/redmont/jquery-ui-1.8.14.custom.css" role="data"></file>
<file name="themes/redmont/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
diff --git a/plugins/managesieve/package.xml b/plugins/managesieve/package.xml
index 1c60a7c..cde78c9 100644
--- a/plugins/managesieve/package.xml
+++ b/plugins/managesieve/package.xml
@@ -85,16 +85,16 @@
<file name="localization/vi_VN.inc" role="data"></file>
<file name="localization/zh_CN.inc" role="data"></file>
<file name="localization/zh_TW.inc" role="data"></file>
- <file name="skins/default/managesieve.css" role="data"></file>
- <file name="skins/default/managesieve_mail.css" role="data"></file>
- <file name="skins/default/templates/filteredit.html" role="data"></file>
- <file name="skins/default/templates/managesieve.html" role="data"></file>
- <file name="skins/default/templates/setedit.html" role="data"></file>
- <file name="skins/default/images/add.png" role="data"></file>
- <file name="skins/default/images/del.png" role="data"></file>
- <file name="skins/default/images/down_small.gif" role="data"></file>
- <file name="skins/default/images/filter.png" role="data"></file>
- <file name="skins/default/images/up_small.gif" role="data"></file>
+ <file name="skins/classic/managesieve.css" role="data"></file>
+ <file name="skins/classic/managesieve_mail.css" role="data"></file>
+ <file name="skins/classic/templates/filteredit.html" role="data"></file>
+ <file name="skins/classic/templates/managesieve.html" role="data"></file>
+ <file name="skins/classic/templates/setedit.html" role="data"></file>
+ <file name="skins/classic/images/add.png" role="data"></file>
+ <file name="skins/classic/images/del.png" role="data"></file>
+ <file name="skins/classic/images/down_small.gif" role="data"></file>
+ <file name="skins/classic/images/filter.png" role="data"></file>
+ <file name="skins/classic/images/up_small.gif" role="data"></file>
<file name="managesieve.php" role="php"></file>
<file name="lib/rcube_sieve.php" role="php"></file>
<file name="lib/rcube_sieve_script.php" role="php"></file>
diff --git a/plugins/markasjunk/package.xml b/plugins/markasjunk/package.xml
index 95690eb..a5b4bf9 100644
--- a/plugins/markasjunk/package.xml
+++ b/plugins/markasjunk/package.xml
@@ -50,8 +50,8 @@
<file name="localization/sk_SK.inc" role="data"></file>
<file name="localization/sv_SE.inc" role="data"></file>
<file name="localization/zh_TW.inc" role="data"></file>
- <file name="skins/default/junk_act.png" role="data"></file>
- <file name="skins/default/junk_pas.png" role="data"></file>
+ <file name="skins/classic/junk_act.png" role="data"></file>
+ <file name="skins/classic/junk_pas.png" role="data"></file>
</dir>
<!-- / -->
</contents>
diff --git a/plugins/vcard_attachments/package.xml b/plugins/vcard_attachments/package.xml
index cf94ef3..82b750a 100644
--- a/plugins/vcard_attachments/package.xml
+++ b/plugins/vcard_attachments/package.xml
@@ -61,9 +61,9 @@
<file name="localization/ru_RU.inc" role="data"></file>
<file name="localization/sv_SE.inc" role="data"></file>
<file name="localization/zh_TW.inc" role="data"></file>
- <file name="skins/default/style.css" role="data"></file>
- <file name="skins/default/vcard_add_contact.png" role="data"></file>
- <file name="skins/default/vcard.png" role="data"></file>
+ <file name="skins/classic/style.css" role="data"></file>
+ <file name="skins/classic/vcard_add_contact.png" role="data"></file>
+ <file name="skins/classic/vcard.png" role="data"></file>
<file name="skins/larry/style.css" role="data"></file>
<file name="skins/larry/vcard_add_contact.png" role="data"></file>
<file name="skins/larry/vcard.png" role="data"></file>
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 9db746f..a0e914b 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -81,9 +81,13 @@
$this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
}
else {
- $this->prop['skin'] = 'default';
+ $this->prop['skin'] = 'larry';
}
}
+
+ // larry is the new default skin :-)
+ if ($this->prop['skin'] == 'default')
+ $this->prop['skin'] = 'larry';
// fix paths
$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
@@ -238,10 +242,8 @@
// Honor the dont_override setting for any existing user preferences
$dont_override = $this->get('dont_override');
if (is_array($dont_override) && !empty($dont_override)) {
- foreach ($prefs as $key => $pref) {
- if (in_array($key, $dont_override)) {
- unset($prefs[$key]);
- }
+ foreach ($dont_override as $key) {
+ unset($prefs[$key]);
}
}
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index b91355c..b1ec32a 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -336,9 +336,12 @@
public function local_skin_path()
{
$rcmail = rcube::get_instance();
- $skin_path = 'skins/' . $rcmail->config->get('skin');
- if (!is_dir(realpath(slashify($this->home) . $skin_path)))
- $skin_path = 'skins/default';
+ foreach (array($rcmail->config->get('skin'),'default') as $skin) {
+ $skin_path = 'skins/' . $skin;
+ if (is_dir(realpath(slashify($this->home) . $skin_path)))
+ break;
+ }
+
return $skin_path;
}
--
Gitblit v1.9.1