Backported default -> classic skin renaming

19 files changed, 19 insertions, 18 deletions

diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist
index 65c01757a..a3c3f75a0 100644
--- a/plugins/jqueryui/config.inc.php.dist
+++ b/plugins/jqueryui/config.inc.php.dist
@@ -6,6 +6,7 @@ $rcmail_config['jquery_ui_i18n'] = array('datepicker');
 // 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 69b9ca1c0..f82a149b8 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -24,7 +24,7 @@ class jqueryui extends rcube_plugin
         $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 @@ class jqueryui extends rcube_plugin
             $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 18f241a2e..1d265169c 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/jqueryui/themes/default/images/buttongradient.png b/plugins/jqueryui/themes/classic/images/buttongradient.png
index 0595474c7..0595474c7 100644
--- a/plugins/jqueryui/themes/default/images/buttongradient.png
+++ b/plugins/jqueryui/themes/classic/images/buttongradient.png
diff --git a/plugins/jqueryui/themes/default/images/listheader.png b/plugins/jqueryui/themes/classic/images/listheader.png
index 670df0c4a..670df0c4a 100644
--- a/plugins/jqueryui/themes/default/images/listheader.png
+++ b/plugins/jqueryui/themes/classic/images/listheader.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2ab..5b5dab2ab 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229af..ac8b229af 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png
index 6a5d37d65..6a5d37d65 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png b/plugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc1a..4443fdc1a 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
index b3533aafe..b3533aafe 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
index d0a127f4d..d0a127f4d 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
index ecc0ac16a..ecc0ac16a 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png
index 7c211aa08..7c211aa08 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png
index fe079a595..fe079a595 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png
index f87de1ca1..f87de1ca1 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png
index b2fe02927..b2fe02927 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png
index 91aada0ab..91aada0ab 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png
diff --git a/plugins/jqueryui/themes/default/jquery-ui-1.8.18.custom.css b/plugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css
index 288e624ed..288e624ed 100755
--- a/plugins/jqueryui/themes/default/jquery-ui-1.8.18.custom.css
+++ b/plugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css
diff --git a/plugins/jqueryui/themes/default/roundcube-custom.diff b/plugins/jqueryui/themes/classic/roundcube-custom.diff
index f5be87956..f5be87956 100644
--- a/plugins/jqueryui/themes/default/roundcube-custom.diff
+++ b/plugins/jqueryui/themes/classic/roundcube-custom.diff