Backported default -> classic skin renaming

Thomas Bruederli

2012-07-30 3185f3a52404baacaef29e4ace534c97e5ddc931

Backported default -> classic skin renaming

 config/main.inc.php.dist

@@ -677,7 +677,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;

 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>

 plugins/acl/skins/classic/acl.css

 plugins/acl/skins/classic/images/enabled.png

 plugins/acl/skins/classic/images/partial.png

 plugins/acl/skins/classic/templates/table.html

 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>

 plugins/archive/skins/classic/archive.css

 plugins/archive/skins/classic/archive_act.png

 plugins/archive/skins/classic/archive_pas.png

 plugins/archive/skins/classic/foldericon.png

 plugins/enigma/skins/classic/enigma.css

 plugins/enigma/skins/classic/enigma.png

 plugins/enigma/skins/classic/enigma_error.png

 plugins/enigma/skins/classic/key.png

 plugins/enigma/skins/classic/key_add.png

 plugins/enigma/skins/classic/keys_toolbar.png

 plugins/enigma/skins/classic/templates/keyimport.html

 plugins/enigma/skins/classic/templates/keyinfo.html

 plugins/enigma/skins/classic/templates/keys.html

 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>

 plugins/help/skins/classic/help.css

 plugins/help/skins/classic/help.gif

 plugins/help/skins/classic/templates/help.html

 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>

 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',
);


 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

 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>

 plugins/jqueryui/themes/classic/images/buttongradient.png

 plugins/jqueryui/themes/classic/images/listheader.png

 plugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png

 plugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png

 plugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png

 plugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png

 plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png

 plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png

 plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png

 plugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png

 plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png

 plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png

 plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png

 plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png

 plugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css

 plugins/jqueryui/themes/classic/roundcube-custom.diff

 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>

 plugins/managesieve/skins/classic/images/add.png

 plugins/managesieve/skins/classic/images/del.png

 plugins/managesieve/skins/classic/images/down_small.gif

 plugins/managesieve/skins/classic/images/filter.png

 plugins/managesieve/skins/classic/images/up_small.gif

 plugins/managesieve/skins/classic/managesieve.css

 plugins/managesieve/skins/classic/managesieve_mail.css

 plugins/managesieve/skins/classic/templates/filteredit.html

 plugins/managesieve/skins/classic/templates/managesieve.html

 plugins/managesieve/skins/classic/templates/setedit.html

 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>

 plugins/markasjunk/skins/classic/junk_act.png

 plugins/markasjunk/skins/classic/junk_pas.png

 plugins/markasjunk/skins/classic/markasjunk.css

 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>

 plugins/vcard_attachments/skins/classic/style.css

 plugins/vcard_attachments/skins/classic/vcard.png

 plugins/vcard_attachments/skins/classic/vcard_add_contact.png

 program/include/rcube_config.php

@@ -77,7 +77,11 @@
        if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
            $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
        else if (empty($this->prop['skin']))
            $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';
@@ -236,10 +240,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]);
            }
        }

@@ -248,6 +250,10 @@
            $prefs['timezone'] = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0);
        }

        // larry is the new default skin :-)
        if ($prefs['skin'] == 'default')
            $prefs['skin'] = 'larry';

        $this->userprefs = $prefs;
        $this->prop      = array_merge($this->prop, $prefs);


 program/include/rcube_template.php

@@ -77,7 +77,7 @@
        $this->set_env('x_frame_options', $this->app->config->get('x_frame_options', 'sameorigin'));

        // load the correct skin (in case user-defined)
        $skin = $this->app->config->get('skin', 'default');
        $skin = $this->app->config->get('skin');
        $this->set_skin($skin);
        $this->set_env('skin', $skin);


 skins/classic/README

 skins/classic/addressbook.css

 skins/classic/common.css

 skins/classic/editor_content.css

 skins/classic/functions.js

 skins/classic/googiespell.css

 skins/classic/ie6hacks.css

 skins/classic/iehacks.css

 skins/classic/images/abook_toolbar.gif

 skins/classic/images/abook_toolbar.png

 skins/classic/images/blank.gif

 skins/classic/images/buttons/add_act.png

 skins/classic/images/buttons/add_pas.png

 skins/classic/images/buttons/add_sel.png

 skins/classic/images/buttons/bg.gif

 skins/classic/images/cleardot.png

 skins/classic/images/contactpic.png

 skins/classic/images/dbutton.png

 skins/classic/images/dimple.png

 skins/classic/images/display/icons.gif

 skins/classic/images/display/icons.png

 skins/classic/images/display/loading.gif

 skins/classic/images/display/loading_blue.gif

 skins/classic/images/favicon.ico

 skins/classic/images/googiespell/change_lang.gif

 skins/classic/images/googiespell/indicator.gif

 skins/classic/images/googiespell/ok.gif

 skins/classic/images/googiespell/spellc.gif

 skins/classic/images/icons/attachment.png

 skins/classic/images/icons/blank.gif

 skins/classic/images/icons/collapsed.png

 skins/classic/images/icons/columnpicker.gif

 skins/classic/images/icons/delete.png

 skins/classic/images/icons/deleted.png

 skins/classic/images/icons/dot.png

 skins/classic/images/icons/down_small.gif

 skins/classic/images/icons/expanded.png

 skins/classic/images/icons/extwin.png

 skins/classic/images/icons/flagged.png

 skins/classic/images/icons/folders.gif

 skins/classic/images/icons/folders.png

 skins/classic/images/icons/forwarded.png

 skins/classic/images/icons/forwarded_replied.png

 skins/classic/images/icons/glass.gif

 skins/classic/images/icons/glass.png

 skins/classic/images/icons/glass_roll.png

 skins/classic/images/icons/groupactions.gif

 skins/classic/images/icons/groupactions.png

 skins/classic/images/icons/minus.gif

 skins/classic/images/icons/plus.gif

 skins/classic/images/icons/rename.png

 skins/classic/images/icons/replied.png

 skins/classic/images/icons/reset.gif

 skins/classic/images/icons/silhouette.png

 skins/classic/images/icons/sort.gif

 skins/classic/images/icons/unflagged.png

 skins/classic/images/icons/unread.png

 skins/classic/images/icons/unread_children.png

 skins/classic/images/icons/up_small.gif

 skins/classic/images/listheader.gif

 skins/classic/images/mail_footer.gif

 skins/classic/images/mail_footer.png

 skins/classic/images/mail_toolbar.gif

 skins/classic/images/mail_toolbar.png

 skins/classic/images/messageactions.gif

 skins/classic/images/messageactions.png

 skins/classic/images/messageicons.gif

 skins/classic/images/messageicons.png

 skins/classic/images/pagenav.gif

 skins/classic/images/quota-colors.png

 skins/classic/images/quota.gif

 skins/classic/images/quota.png

 skins/classic/images/roundcube_logo.png

 skins/classic/images/searchfield.gif

 skins/classic/images/tabs-left.gif

 skins/classic/images/tabs-right.gif

 skins/classic/images/taskbar.gif

 skins/classic/images/taskbar.png

 skins/classic/images/taskicons.gif

 skins/classic/images/taskicons.png

 skins/classic/images/tree.gif

 skins/classic/images/watermark.gif

 skins/classic/includes/header.html

 skins/classic/includes/links.html

 skins/classic/includes/messagetoolbar.html

 skins/classic/includes/settingstabs.html

 skins/classic/includes/taskbar.html

 skins/classic/mail.css

 skins/classic/pngbehavior.htc

 skins/classic/print.css

 skins/classic/safari.css

 skins/classic/settings.css

 skins/classic/splitter.js

 skins/classic/templates/about.html

 skins/classic/templates/addressbook.html

 skins/classic/templates/compose.html

 skins/classic/templates/contact.html

 skins/classic/templates/contactadd.html

 skins/classic/templates/contactedit.html

 skins/classic/templates/contactsearch.html

 skins/classic/templates/error.html

 skins/classic/templates/folderedit.html

 skins/classic/templates/folders.html

 skins/classic/templates/identities.html

 skins/classic/templates/identityedit.html

 skins/classic/templates/importcontacts.html

 skins/classic/templates/login.html

 skins/classic/templates/mail.html

 skins/classic/templates/message.html

 skins/classic/templates/messageerror.html

 skins/classic/templates/messagepart.html

 skins/classic/templates/messagepreview.html

 skins/classic/templates/messageprint.html

 skins/classic/templates/plugin.html

 skins/classic/templates/settings.html

 skins/classic/templates/settingsedit.html

 skins/classic/watermark.html