Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-07-30 90fab855b79c865083b2fefc74b848d4b6e71aa6

Merge branch 'master' of github.com:roundcube/roundcubemail

 plugins/enigma/enigma.php

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

 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/help.php

@@ -42,12 +42,11 @@
            '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");
        $skin_path = $this->local_skin_path();
        if (is_file($this->home . "/$skin_path/help.css")) {
            $this->include_stylesheet("$skin_path/help.css");
        }
    }

    function action()

 plugins/managesieve/managesieve.php

@@ -115,10 +115,10 @@
        $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,