diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index dd33a0ba..77719c7d 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -459,7 +459,7 @@ class calendar extends rcube_plugin
// include color picker
$this->include_script('lib/js/jquery.miniColors.min.js');
- $this->include_stylesheet('skins/' .$this->rc->config->get('skin') . '/jquery.miniColors.css');
+ $this->include_stylesheet($this->local_skin_path() . '/jquery.miniColors.css');
$this->rc->output->set_env('mscolors', $this->driver->get_color_values());
$this->rc->output->add_script('$("input.colors").miniColors({ colorValues:rcmail.env.mscolors })', 'docready');
}
@@ -1942,9 +1942,9 @@ class calendar extends rcube_plugin
}
// Add CSS stylesheets to the page header
- $skin = $this->rc->config->get('skin');
- $this->include_stylesheet('skins/' . $skin . '/fullcalendar.css');
- $this->include_stylesheet('skins/' . $skin . '/print.css');
+ $skin_path = $this->local_skin_path();
+ $this->include_stylesheet($skin_path . '/fullcalendar.css');
+ $this->include_stylesheet($skin_path . '/print.css');
// Add JS files to the page header
$this->include_script('print.js');
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 9615cffd..a063a4df 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -59,8 +59,8 @@ class calendar_ui
$this->cal->include_script('lib/js/fullcalendar.js');
$this->cal->include_script('calendar_base.js');
- $skin = $this->rc->config->get('skin');
- $this->cal->include_stylesheet('skins/' . $skin . '/calendar.css');
+ $skin_path = $this->cal->local_skin_path();
+ $this->cal->include_stylesheet($skin_path . '/calendar.css');
$this->ready = true;
}
@@ -99,9 +99,9 @@ class calendar_ui
*/
public function addCSS()
{
- $skin = $this->rc->config->get('skin');
- $this->cal->include_stylesheet('skins/' . $skin . '/fullcalendar.css');
- $this->cal->include_stylesheet('skins/' . $skin . '/jquery.miniColors.css');
+ $skin_path = $this->cal->local_skin_path();
+ $this->cal->include_stylesheet($skin_path . '/fullcalendar.css');
+ $this->cal->include_stylesheet($skin_path . '/jquery.miniColors.css');
}
/**
@@ -648,7 +648,7 @@ class calendar_ui
if (!$attrib['id'])
$attrib['id'] = 'rcmAttachmentList';
- $skin_path = $this->rc->config->get('skin_path');
+ $skin_path = $this->cal->local_skin_path();
if ($attrib['deleteicon']) {
$_SESSION['calendar_deleteicon'] = $skin_path . $attrib['deleteicon'];
$this->rc->output->set_env('deleteicon', $skin_path . $attrib['deleteicon']);
diff --git a/plugins/calendar/package.xml b/plugins/calendar/package.xml
index 12844305..1dc6625c 100644
--- a/plugins/calendar/package.xml
+++ b/plugins/calendar/package.xml
@@ -113,46 +113,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/calendar/skins/default/README b/plugins/calendar/skins/classic/README
similarity index 100%
rename from plugins/calendar/skins/default/README
rename to plugins/calendar/skins/classic/README
diff --git a/plugins/calendar/skins/default/calendar.css b/plugins/calendar/skins/classic/calendar.css
similarity index 100%
rename from plugins/calendar/skins/default/calendar.css
rename to plugins/calendar/skins/classic/calendar.css
diff --git a/plugins/calendar/skins/default/fullcalendar.css b/plugins/calendar/skins/classic/fullcalendar.css
similarity index 100%
rename from plugins/calendar/skins/default/fullcalendar.css
rename to plugins/calendar/skins/classic/fullcalendar.css
diff --git a/plugins/calendar/skins/default/iehacks.css b/plugins/calendar/skins/classic/iehacks.css
similarity index 100%
rename from plugins/calendar/skins/default/iehacks.css
rename to plugins/calendar/skins/classic/iehacks.css
diff --git a/plugins/calendar/skins/default/images/attendee-status.gif b/plugins/calendar/skins/classic/images/attendee-status.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/attendee-status.gif
rename to plugins/calendar/skins/classic/images/attendee-status.gif
diff --git a/plugins/calendar/skins/default/images/badge_confidential.gif b/plugins/calendar/skins/classic/images/badge_confidential.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/badge_confidential.gif
rename to plugins/calendar/skins/classic/images/badge_confidential.gif
diff --git a/plugins/calendar/skins/default/images/badge_confidential.png b/plugins/calendar/skins/classic/images/badge_confidential.png
similarity index 100%
rename from plugins/calendar/skins/default/images/badge_confidential.png
rename to plugins/calendar/skins/classic/images/badge_confidential.png
diff --git a/plugins/calendar/skins/default/images/badge_private.gif b/plugins/calendar/skins/classic/images/badge_private.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/badge_private.gif
rename to plugins/calendar/skins/classic/images/badge_private.gif
diff --git a/plugins/calendar/skins/default/images/badge_private.png b/plugins/calendar/skins/classic/images/badge_private.png
similarity index 100%
rename from plugins/calendar/skins/default/images/badge_private.png
rename to plugins/calendar/skins/classic/images/badge_private.png
diff --git a/plugins/calendar/skins/default/images/calendar-blue.png b/plugins/calendar/skins/classic/images/calendar-blue.png
similarity index 100%
rename from plugins/calendar/skins/default/images/calendar-blue.png
rename to plugins/calendar/skins/classic/images/calendar-blue.png
diff --git a/plugins/calendar/skins/default/images/calendar.gif b/plugins/calendar/skins/classic/images/calendar.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/calendar.gif
rename to plugins/calendar/skins/classic/images/calendar.gif
diff --git a/plugins/calendar/skins/default/images/calendar.png b/plugins/calendar/skins/classic/images/calendar.png
similarity index 100%
rename from plugins/calendar/skins/default/images/calendar.png
rename to plugins/calendar/skins/classic/images/calendar.png
diff --git a/plugins/calendar/skins/default/images/calendars.gif b/plugins/calendar/skins/classic/images/calendars.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/calendars.gif
rename to plugins/calendar/skins/classic/images/calendars.gif
diff --git a/plugins/calendar/skins/default/images/calendars.png b/plugins/calendar/skins/classic/images/calendars.png
similarity index 100%
rename from plugins/calendar/skins/default/images/calendars.png
rename to plugins/calendar/skins/classic/images/calendars.png
diff --git a/plugins/calendar/skins/default/images/eventicons.gif b/plugins/calendar/skins/classic/images/eventicons.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/eventicons.gif
rename to plugins/calendar/skins/classic/images/eventicons.gif
diff --git a/plugins/calendar/skins/default/images/export.png b/plugins/calendar/skins/classic/images/export.png
similarity index 100%
rename from plugins/calendar/skins/default/images/export.png
rename to plugins/calendar/skins/classic/images/export.png
diff --git a/plugins/calendar/skins/default/images/freebusy-colors.gif b/plugins/calendar/skins/classic/images/freebusy-colors.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/freebusy-colors.gif
rename to plugins/calendar/skins/classic/images/freebusy-colors.gif
diff --git a/plugins/calendar/skins/default/images/freebusy-colors.png b/plugins/calendar/skins/classic/images/freebusy-colors.png
similarity index 100%
rename from plugins/calendar/skins/default/images/freebusy-colors.png
rename to plugins/calendar/skins/classic/images/freebusy-colors.png
diff --git a/plugins/calendar/skins/default/images/invitation.png b/plugins/calendar/skins/classic/images/invitation.png
similarity index 100%
rename from plugins/calendar/skins/default/images/invitation.png
rename to plugins/calendar/skins/classic/images/invitation.png
diff --git a/plugins/calendar/skins/default/images/listheader.gif b/plugins/calendar/skins/classic/images/listheader.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/listheader.gif
rename to plugins/calendar/skins/classic/images/listheader.gif
diff --git a/plugins/calendar/skins/default/images/loading_blue.gif b/plugins/calendar/skins/classic/images/loading_blue.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/loading_blue.gif
rename to plugins/calendar/skins/classic/images/loading_blue.gif
diff --git a/plugins/calendar/skins/default/images/minicolors-all.png b/plugins/calendar/skins/classic/images/minicolors-all.png
similarity index 100%
rename from plugins/calendar/skins/default/images/minicolors-all.png
rename to plugins/calendar/skins/classic/images/minicolors-all.png
diff --git a/plugins/calendar/skins/default/images/minicolors-handles.gif b/plugins/calendar/skins/classic/images/minicolors-handles.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/minicolors-handles.gif
rename to plugins/calendar/skins/classic/images/minicolors-handles.gif
diff --git a/plugins/calendar/skins/default/images/preview.png b/plugins/calendar/skins/classic/images/preview.png
similarity index 100%
rename from plugins/calendar/skins/default/images/preview.png
rename to plugins/calendar/skins/classic/images/preview.png
diff --git a/plugins/calendar/skins/default/images/print.png b/plugins/calendar/skins/classic/images/print.png
similarity index 100%
rename from plugins/calendar/skins/default/images/print.png
rename to plugins/calendar/skins/classic/images/print.png
diff --git a/plugins/calendar/skins/default/images/spacer.gif b/plugins/calendar/skins/classic/images/spacer.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/spacer.gif
rename to plugins/calendar/skins/classic/images/spacer.gif
diff --git a/plugins/calendar/skins/default/images/toggle.gif b/plugins/calendar/skins/classic/images/toggle.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/toggle.gif
rename to plugins/calendar/skins/classic/images/toggle.gif
diff --git a/plugins/calendar/skins/default/images/toolbar.gif b/plugins/calendar/skins/classic/images/toolbar.gif
similarity index 100%
rename from plugins/calendar/skins/default/images/toolbar.gif
rename to plugins/calendar/skins/classic/images/toolbar.gif
diff --git a/plugins/calendar/skins/default/images/toolbar.png b/plugins/calendar/skins/classic/images/toolbar.png
similarity index 100%
rename from plugins/calendar/skins/default/images/toolbar.png
rename to plugins/calendar/skins/classic/images/toolbar.png
diff --git a/plugins/calendar/skins/default/jquery.miniColors.css b/plugins/calendar/skins/classic/jquery.miniColors.css
similarity index 100%
rename from plugins/calendar/skins/default/jquery.miniColors.css
rename to plugins/calendar/skins/classic/jquery.miniColors.css
diff --git a/plugins/calendar/skins/default/print.css b/plugins/calendar/skins/classic/print.css
similarity index 100%
rename from plugins/calendar/skins/default/print.css
rename to plugins/calendar/skins/classic/print.css
diff --git a/plugins/calendar/skins/default/print.iehacks.css b/plugins/calendar/skins/classic/print.iehacks.css
similarity index 100%
rename from plugins/calendar/skins/default/print.iehacks.css
rename to plugins/calendar/skins/classic/print.iehacks.css
diff --git a/plugins/calendar/skins/default/templates/attachment.html b/plugins/calendar/skins/classic/templates/attachment.html
similarity index 100%
rename from plugins/calendar/skins/default/templates/attachment.html
rename to plugins/calendar/skins/classic/templates/attachment.html
diff --git a/plugins/calendar/skins/default/templates/calendar.html b/plugins/calendar/skins/classic/templates/calendar.html
similarity index 100%
rename from plugins/calendar/skins/default/templates/calendar.html
rename to plugins/calendar/skins/classic/templates/calendar.html
diff --git a/plugins/calendar/skins/default/templates/eventedit.html b/plugins/calendar/skins/classic/templates/eventedit.html
similarity index 100%
rename from plugins/calendar/skins/default/templates/eventedit.html
rename to plugins/calendar/skins/classic/templates/eventedit.html
diff --git a/plugins/calendar/skins/default/templates/freebusylegend.html b/plugins/calendar/skins/classic/templates/freebusylegend.html
similarity index 100%
rename from plugins/calendar/skins/default/templates/freebusylegend.html
rename to plugins/calendar/skins/classic/templates/freebusylegend.html
diff --git a/plugins/calendar/skins/default/templates/itipattend.html b/plugins/calendar/skins/classic/templates/itipattend.html
similarity index 100%
rename from plugins/calendar/skins/default/templates/itipattend.html
rename to plugins/calendar/skins/classic/templates/itipattend.html
diff --git a/plugins/calendar/skins/default/templates/kolabacl.html b/plugins/calendar/skins/classic/templates/kolabacl.html
similarity index 100%
rename from plugins/calendar/skins/default/templates/kolabacl.html
rename to plugins/calendar/skins/classic/templates/kolabacl.html
diff --git a/plugins/calendar/skins/default/templates/kolabform.html b/plugins/calendar/skins/classic/templates/kolabform.html
similarity index 100%
rename from plugins/calendar/skins/default/templates/kolabform.html
rename to plugins/calendar/skins/classic/templates/kolabform.html
diff --git a/plugins/calendar/skins/default/templates/print.html b/plugins/calendar/skins/classic/templates/print.html
similarity index 100%
rename from plugins/calendar/skins/default/templates/print.html
rename to plugins/calendar/skins/classic/templates/print.html
diff --git a/plugins/kolab_addressbook/package.xml b/plugins/kolab_addressbook/package.xml
index 61015a76..73e26a4a 100644
--- a/plugins/kolab_addressbook/package.xml
+++ b/plugins/kolab_addressbook/package.xml
@@ -44,10 +44,10 @@
-
-
-
-
+
+
+
+
diff --git a/plugins/kolab_addressbook/skins/default/kolab_addressbook.css b/plugins/kolab_addressbook/skins/classic/kolab_addressbook.css
similarity index 100%
rename from plugins/kolab_addressbook/skins/default/kolab_addressbook.css
rename to plugins/kolab_addressbook/skins/classic/kolab_addressbook.css
diff --git a/plugins/kolab_addressbook/skins/default/kolab_folders.gif b/plugins/kolab_addressbook/skins/classic/kolab_folders.gif
similarity index 100%
rename from plugins/kolab_addressbook/skins/default/kolab_folders.gif
rename to plugins/kolab_addressbook/skins/classic/kolab_folders.gif
diff --git a/plugins/kolab_addressbook/skins/default/kolab_folders.png b/plugins/kolab_addressbook/skins/classic/kolab_folders.png
similarity index 100%
rename from plugins/kolab_addressbook/skins/default/kolab_folders.png
rename to plugins/kolab_addressbook/skins/classic/kolab_folders.png
diff --git a/plugins/kolab_addressbook/skins/default/templates/bookedit.html b/plugins/kolab_addressbook/skins/classic/templates/bookedit.html
similarity index 100%
rename from plugins/kolab_addressbook/skins/default/templates/bookedit.html
rename to plugins/kolab_addressbook/skins/classic/templates/bookedit.html
diff --git a/plugins/kolab_zpush/package.xml b/plugins/kolab_zpush/package.xml
index ef6dfd72..ffa27d0b 100644
--- a/plugins/kolab_zpush/package.xml
+++ b/plugins/kolab_zpush/package.xml
@@ -32,13 +32,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/plugins/kolab_zpush/skins/default/alarm-clock.png b/plugins/kolab_zpush/skins/classic/alarm-clock.png
similarity index 100%
rename from plugins/kolab_zpush/skins/default/alarm-clock.png
rename to plugins/kolab_zpush/skins/classic/alarm-clock.png
diff --git a/plugins/kolab_zpush/skins/default/config.css b/plugins/kolab_zpush/skins/classic/config.css
similarity index 100%
rename from plugins/kolab_zpush/skins/default/config.css
rename to plugins/kolab_zpush/skins/classic/config.css
diff --git a/plugins/kolab_zpush/skins/default/deviceactions.png b/plugins/kolab_zpush/skins/classic/deviceactions.png
similarity index 100%
rename from plugins/kolab_zpush/skins/default/deviceactions.png
rename to plugins/kolab_zpush/skins/classic/deviceactions.png
diff --git a/plugins/kolab_zpush/skins/default/foldertypes.png b/plugins/kolab_zpush/skins/classic/foldertypes.png
similarity index 100%
rename from plugins/kolab_zpush/skins/default/foldertypes.png
rename to plugins/kolab_zpush/skins/classic/foldertypes.png
diff --git a/plugins/kolab_zpush/skins/default/pointer-left.gif b/plugins/kolab_zpush/skins/classic/pointer-left.gif
similarity index 100%
rename from plugins/kolab_zpush/skins/default/pointer-left.gif
rename to plugins/kolab_zpush/skins/classic/pointer-left.gif
diff --git a/plugins/kolab_zpush/skins/default/synchronize.png b/plugins/kolab_zpush/skins/classic/synchronize.png
similarity index 100%
rename from plugins/kolab_zpush/skins/default/synchronize.png
rename to plugins/kolab_zpush/skins/classic/synchronize.png
diff --git a/plugins/kolab_zpush/skins/default/templates/config.html b/plugins/kolab_zpush/skins/classic/templates/config.html
similarity index 100%
rename from plugins/kolab_zpush/skins/default/templates/config.html
rename to plugins/kolab_zpush/skins/classic/templates/config.html
diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
index d847cc3d..09edcee5 100644
--- a/plugins/owncloud/owncloud.php
+++ b/plugins/owncloud/owncloud.php
@@ -46,13 +46,8 @@ class owncloud extends rcube_plugin
'label' => 'owncloud.owncloud',
), 'taskbar');
- $skin = $rcmail->config->get('skin');
- if (!file_exists($this->home."/skins/$skin/owncloud.css")) {
- $skin = 'default';
- }
-
// add style for taskbar button (must be here) and Help UI
- $this->include_stylesheet("skins/$skin/owncloud.css");
+ $this->include_stylesheet($this->local_skin_path()."/owncloud.css");
}
function action()
diff --git a/plugins/owncloud/skins/default/cloud.png b/plugins/owncloud/skins/classic/cloud.png
similarity index 100%
rename from plugins/owncloud/skins/default/cloud.png
rename to plugins/owncloud/skins/classic/cloud.png
diff --git a/plugins/owncloud/skins/default/owncloud.css b/plugins/owncloud/skins/classic/owncloud.css
similarity index 100%
rename from plugins/owncloud/skins/default/owncloud.css
rename to plugins/owncloud/skins/classic/owncloud.css
diff --git a/plugins/owncloud/skins/default/templates/owncloud.html b/plugins/owncloud/skins/classic/templates/owncloud.html
similarity index 100%
rename from plugins/owncloud/skins/default/templates/owncloud.html
rename to plugins/owncloud/skins/classic/templates/owncloud.html