From bc92ca56ef6c51393d2782b7654eaa162dfc2e10 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 30 Jul 2012 13:20:56 +0200 Subject: Fixes after default->classic switch --- plugins/enigma/enigma.php | 2 +- plugins/enigma/skins/classic/enigma.css | 182 +++++++++++++++++++++ plugins/enigma/skins/classic/enigma.png | Bin 0 -> 1592 bytes plugins/enigma/skins/classic/enigma_error.png | Bin 0 -> 1960 bytes plugins/enigma/skins/classic/key.png | Bin 0 -> 1743 bytes plugins/enigma/skins/classic/key_add.png | Bin 0 -> 1967 bytes plugins/enigma/skins/classic/keys_toolbar.png | Bin 0 -> 14977 bytes .../enigma/skins/classic/templates/keyimport.html | 20 +++ .../enigma/skins/classic/templates/keyinfo.html | 17 ++ plugins/enigma/skins/classic/templates/keys.html | 76 +++++++++ plugins/enigma/skins/default/enigma.css | 182 --------------------- plugins/enigma/skins/default/enigma.png | Bin 1592 -> 0 bytes plugins/enigma/skins/default/enigma_error.png | Bin 1960 -> 0 bytes plugins/enigma/skins/default/key.png | Bin 1743 -> 0 bytes plugins/enigma/skins/default/key_add.png | Bin 1967 -> 0 bytes plugins/enigma/skins/default/keys_toolbar.png | Bin 14977 -> 0 bytes .../enigma/skins/default/templates/keyimport.html | 20 --- .../enigma/skins/default/templates/keyinfo.html | 17 -- plugins/enigma/skins/default/templates/keys.html | 76 --------- plugins/help/help.php | 11 +- plugins/managesieve/managesieve.php | 10 +- 21 files changed, 306 insertions(+), 307 deletions(-) create mode 100644 plugins/enigma/skins/classic/enigma.css create mode 100644 plugins/enigma/skins/classic/enigma.png create mode 100644 plugins/enigma/skins/classic/enigma_error.png create mode 100644 plugins/enigma/skins/classic/key.png create mode 100644 plugins/enigma/skins/classic/key_add.png create mode 100644 plugins/enigma/skins/classic/keys_toolbar.png create mode 100644 plugins/enigma/skins/classic/templates/keyimport.html create mode 100644 plugins/enigma/skins/classic/templates/keyinfo.html create mode 100644 plugins/enigma/skins/classic/templates/keys.html delete mode 100644 plugins/enigma/skins/default/enigma.css delete mode 100644 plugins/enigma/skins/default/enigma.png delete mode 100644 plugins/enigma/skins/default/enigma_error.png delete mode 100644 plugins/enigma/skins/default/key.png delete mode 100644 plugins/enigma/skins/default/key_add.png delete mode 100644 plugins/enigma/skins/default/keys_toolbar.png delete mode 100644 plugins/enigma/skins/default/templates/keyimport.html delete mode 100644 plugins/enigma/skins/default/templates/keyinfo.html delete mode 100644 plugins/enigma/skins/default/templates/keys.html diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php index fb7c98635..22afc901d 100644 --- a/plugins/enigma/enigma.php +++ b/plugins/enigma/enigma.php @@ -435,7 +435,7 @@ class enigma extends rcube_plugin '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; diff --git a/plugins/enigma/skins/classic/enigma.css b/plugins/enigma/skins/classic/enigma.css new file mode 100644 index 000000000..b1c656f82 --- /dev/null +++ b/plugins/enigma/skins/classic/enigma.css @@ -0,0 +1,182 @@ +/*** Style for Enigma plugin ***/ + +/***** Messages displaying *****/ + +#enigma-message, +/* fixes border-top */ +#messagebody div #enigma-message +{ + margin: 0; + margin-bottom: 5px; + min-height: 20px; + padding: 10px 10px 6px 46px; +} + +div.enigmaerror, +/* fixes border-top */ +#messagebody div.enigmaerror +{ + background: url(enigma_error.png) 6px 1px no-repeat; + background-color: #EF9398; + border: 1px solid #DC5757; +} + +div.enigmanotice, +/* fixes border-top */ +#messagebody div.enigmanotice +{ + background: url(enigma.png) 6px 1px no-repeat; + background-color: #A6EF7B; + border: 1px solid #76C83F; +} + +div.enigmawarning, +/* fixes border-top */ +#messagebody div.enigmawarning +{ + background: url(enigma.png) 6px 1px no-repeat; + background-color: #F7FDCB; + border: 1px solid #C2D071; +} + +#enigma-message a +{ + color: #666666; + padding-left: 10px; +} + +#enigma-message a:hover +{ + color: #333333; +} + +/***** Keys/Certs Management *****/ + +div.enigmascreen +{ + position: absolute; + top: 65px; + right: 10px; + bottom: 10px; + left: 10px; +} + +#enigmacontent-box +{ + position: absolute; + top: 0px; + left: 290px; + right: 0px; + bottom: 0px; + border: 1px solid #999999; + overflow: hidden; +} + +#enigmakeyslist +{ + position: absolute; + top: 0; + bottom: 0; + left: 0; + border: 1px solid #999999; + background-color: #F9F9F9; + overflow: hidden; +} + +#keylistcountbar +{ + margin-top: 4px; + margin-left: 4px; +} + +#keys-table +{ + width: 100%; + table-layout: fixed; +} + +#keys-table td +{ + cursor: default; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} + +#key-details table td.title +{ + font-weight: bold; + text-align: right; +} + +#keystoolbar +{ + position: absolute; + top: 30px; + left: 10px; + height: 35px; +} + +#keystoolbar a +{ + padding-right: 10px; +} + +#keystoolbar a.button, +#keystoolbar a.buttonPas, +#keystoolbar span.separator { + display: block; + float: left; + width: 32px; + height: 32px; + padding: 0; + margin-right: 10px; + overflow: hidden; + background: url(keys_toolbar.png) 0 0 no-repeat transparent; + opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */ +} + +#keystoolbar a.buttonPas { + opacity: 0.35; +} + +#keystoolbar a.createSel { + background-position: 0 -32px; +} + +#keystoolbar a.create { + background-position: 0 0; +} + +#keystoolbar a.deleteSel { + background-position: -32px -32px; +} + +#keystoolbar a.delete { + background-position: -32px 0; +} + +#keystoolbar a.importSel { + background-position: -64px -32px; +} + +#keystoolbar a.import { + background-position: -64px 0; +} + +#keystoolbar a.exportSel { + background-position: -96px -32px; +} + +#keystoolbar a.export { + background-position: -96px 0; +} + +#keystoolbar a.keymenu { + background-position: -128px 0; + width: 36px; +} + +#keystoolbar span.separator { + width: 5px; + background-position: -166px 0; +} diff --git a/plugins/enigma/skins/classic/enigma.png b/plugins/enigma/skins/classic/enigma.png new file mode 100644 index 000000000..3ef106e2a Binary files /dev/null and b/plugins/enigma/skins/classic/enigma.png differ diff --git a/plugins/enigma/skins/classic/enigma_error.png b/plugins/enigma/skins/classic/enigma_error.png new file mode 100644 index 000000000..9bf100efd Binary files /dev/null and b/plugins/enigma/skins/classic/enigma_error.png differ diff --git a/plugins/enigma/skins/classic/key.png b/plugins/enigma/skins/classic/key.png new file mode 100644 index 000000000..ea1cbd11c Binary files /dev/null and b/plugins/enigma/skins/classic/key.png differ diff --git a/plugins/enigma/skins/classic/key_add.png b/plugins/enigma/skins/classic/key_add.png new file mode 100644 index 000000000..f22cc870a Binary files /dev/null and b/plugins/enigma/skins/classic/key_add.png differ diff --git a/plugins/enigma/skins/classic/keys_toolbar.png b/plugins/enigma/skins/classic/keys_toolbar.png new file mode 100644 index 000000000..7cc258cc8 Binary files /dev/null and b/plugins/enigma/skins/classic/keys_toolbar.png differ diff --git a/plugins/enigma/skins/classic/templates/keyimport.html b/plugins/enigma/skins/classic/templates/keyimport.html new file mode 100644 index 000000000..4e0b304a5 --- /dev/null +++ b/plugins/enigma/skins/classic/templates/keyimport.html @@ -0,0 +1,20 @@ + + + +<roundcube:object name="pagetitle" /> + + + + + +
+ +
+ +

+
+

+
+ + + diff --git a/plugins/enigma/skins/classic/templates/keyinfo.html b/plugins/enigma/skins/classic/templates/keyinfo.html new file mode 100644 index 000000000..2e8ed61db --- /dev/null +++ b/plugins/enigma/skins/classic/templates/keyinfo.html @@ -0,0 +1,17 @@ + + + +<roundcube:object name="pagetitle" /> + + + + + +
+ +
+ +
+ + + diff --git a/plugins/enigma/skins/classic/templates/keys.html b/plugins/enigma/skins/classic/templates/keys.html new file mode 100644 index 000000000..4271eccb7 --- /dev/null +++ b/plugins/enigma/skins/classic/templates/keys.html @@ -0,0 +1,76 @@ + + + +<roundcube:object name="pagetitle" /> + + + + + + + + +
+
+ +
+ + +   + + + +
+ +
+ + + +
+ +
+ +
+
+
+ +
+
+ +
+
+ + + +
+ +
+ +
+
+ +
+
    +
    • +
    • +
    • +
    • +
+
+ + + diff --git a/plugins/enigma/skins/default/enigma.css b/plugins/enigma/skins/default/enigma.css deleted file mode 100644 index b1c656f82..000000000 --- a/plugins/enigma/skins/default/enigma.css +++ /dev/null @@ -1,182 +0,0 @@ -/*** Style for Enigma plugin ***/ - -/***** Messages displaying *****/ - -#enigma-message, -/* fixes border-top */ -#messagebody div #enigma-message -{ - margin: 0; - margin-bottom: 5px; - min-height: 20px; - padding: 10px 10px 6px 46px; -} - -div.enigmaerror, -/* fixes border-top */ -#messagebody div.enigmaerror -{ - background: url(enigma_error.png) 6px 1px no-repeat; - background-color: #EF9398; - border: 1px solid #DC5757; -} - -div.enigmanotice, -/* fixes border-top */ -#messagebody div.enigmanotice -{ - background: url(enigma.png) 6px 1px no-repeat; - background-color: #A6EF7B; - border: 1px solid #76C83F; -} - -div.enigmawarning, -/* fixes border-top */ -#messagebody div.enigmawarning -{ - background: url(enigma.png) 6px 1px no-repeat; - background-color: #F7FDCB; - border: 1px solid #C2D071; -} - -#enigma-message a -{ - color: #666666; - padding-left: 10px; -} - -#enigma-message a:hover -{ - color: #333333; -} - -/***** Keys/Certs Management *****/ - -div.enigmascreen -{ - position: absolute; - top: 65px; - right: 10px; - bottom: 10px; - left: 10px; -} - -#enigmacontent-box -{ - position: absolute; - top: 0px; - left: 290px; - right: 0px; - bottom: 0px; - border: 1px solid #999999; - overflow: hidden; -} - -#enigmakeyslist -{ - position: absolute; - top: 0; - bottom: 0; - left: 0; - border: 1px solid #999999; - background-color: #F9F9F9; - overflow: hidden; -} - -#keylistcountbar -{ - margin-top: 4px; - margin-left: 4px; -} - -#keys-table -{ - width: 100%; - table-layout: fixed; -} - -#keys-table td -{ - cursor: default; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} - -#key-details table td.title -{ - font-weight: bold; - text-align: right; -} - -#keystoolbar -{ - position: absolute; - top: 30px; - left: 10px; - height: 35px; -} - -#keystoolbar a -{ - padding-right: 10px; -} - -#keystoolbar a.button, -#keystoolbar a.buttonPas, -#keystoolbar span.separator { - display: block; - float: left; - width: 32px; - height: 32px; - padding: 0; - margin-right: 10px; - overflow: hidden; - background: url(keys_toolbar.png) 0 0 no-repeat transparent; - opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */ -} - -#keystoolbar a.buttonPas { - opacity: 0.35; -} - -#keystoolbar a.createSel { - background-position: 0 -32px; -} - -#keystoolbar a.create { - background-position: 0 0; -} - -#keystoolbar a.deleteSel { - background-position: -32px -32px; -} - -#keystoolbar a.delete { - background-position: -32px 0; -} - -#keystoolbar a.importSel { - background-position: -64px -32px; -} - -#keystoolbar a.import { - background-position: -64px 0; -} - -#keystoolbar a.exportSel { - background-position: -96px -32px; -} - -#keystoolbar a.export { - background-position: -96px 0; -} - -#keystoolbar a.keymenu { - background-position: -128px 0; - width: 36px; -} - -#keystoolbar span.separator { - width: 5px; - background-position: -166px 0; -} diff --git a/plugins/enigma/skins/default/enigma.png b/plugins/enigma/skins/default/enigma.png deleted file mode 100644 index 3ef106e2a..000000000 Binary files a/plugins/enigma/skins/default/enigma.png and /dev/null differ diff --git a/plugins/enigma/skins/default/enigma_error.png b/plugins/enigma/skins/default/enigma_error.png deleted file mode 100644 index 9bf100efd..000000000 Binary files a/plugins/enigma/skins/default/enigma_error.png and /dev/null differ diff --git a/plugins/enigma/skins/default/key.png b/plugins/enigma/skins/default/key.png deleted file mode 100644 index ea1cbd11c..000000000 Binary files a/plugins/enigma/skins/default/key.png and /dev/null differ diff --git a/plugins/enigma/skins/default/key_add.png b/plugins/enigma/skins/default/key_add.png deleted file mode 100644 index f22cc870a..000000000 Binary files a/plugins/enigma/skins/default/key_add.png and /dev/null differ diff --git a/plugins/enigma/skins/default/keys_toolbar.png b/plugins/enigma/skins/default/keys_toolbar.png deleted file mode 100644 index 7cc258cc8..000000000 Binary files a/plugins/enigma/skins/default/keys_toolbar.png and /dev/null differ diff --git a/plugins/enigma/skins/default/templates/keyimport.html b/plugins/enigma/skins/default/templates/keyimport.html deleted file mode 100644 index 4e0b304a5..000000000 --- a/plugins/enigma/skins/default/templates/keyimport.html +++ /dev/null @@ -1,20 +0,0 @@ - - - -<roundcube:object name="pagetitle" /> - - - - - -
- -
- -

-
-

-
- - - diff --git a/plugins/enigma/skins/default/templates/keyinfo.html b/plugins/enigma/skins/default/templates/keyinfo.html deleted file mode 100644 index 2e8ed61db..000000000 --- a/plugins/enigma/skins/default/templates/keyinfo.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -<roundcube:object name="pagetitle" /> - - - - - -
- -
- -
- - - diff --git a/plugins/enigma/skins/default/templates/keys.html b/plugins/enigma/skins/default/templates/keys.html deleted file mode 100644 index 4271eccb7..000000000 --- a/plugins/enigma/skins/default/templates/keys.html +++ /dev/null @@ -1,76 +0,0 @@ - - - -<roundcube:object name="pagetitle" /> - - - - - - - - -
-
- -
- - -   - - - -
- -
- - - -
- -
- -
-
-
- -
-
- -
-
- - - -
- -
- -
-
- -
-
    -
    • -
    • -
    • -
    • -
-
- - - diff --git a/plugins/help/help.php b/plugins/help/help.php index ad7dbf0ba..1a76cbbda 100644 --- a/plugins/help/help.php +++ b/plugins/help/help.php @@ -42,12 +42,11 @@ class help extends rcube_plugin '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"); + // add style for taskbar button (must be here) and Help UI + $skin_path = $this->local_skin_path(); + if (is_file($this->home . "/$skin_path/help.css")) { + $this->include_stylesheet("$skin_path/help.css"); + } } function action() diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php index 3fb63cd5b..e7828f1da 100644 --- a/plugins/managesieve/managesieve.php +++ b/plugins/managesieve/managesieve.php @@ -109,16 +109,16 @@ class managesieve extends rcube_plugin function mail_task_handler() { // use jQuery for popup window - $this->require_plugin('jqueryui'); + $this->require_plugin('jqueryui'); // include js script and localization $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, -- cgit v1.2.3