Changeset 90fab85 in github

Timestamp:

Jul 30, 2012 8:37:16 AM (10 months ago)

Author:

Thomas Bruederli <thomas@…>

Children:

cb190c0c

Parents:

a9cbbae (diff), bc92ca5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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

Files:

• plugins/enigma/enigma.php (modified) (1 diff)
• plugins/enigma/skins/classic/enigma.css (moved) (moved from plugins/enigma/skins/default/enigma.css)
• plugins/enigma/skins/classic/enigma.png (moved) (moved from plugins/enigma/skins/default/enigma.png)
• plugins/enigma/skins/classic/enigma_error.png (moved) (moved from plugins/enigma/skins/default/enigma_error.png)
• plugins/enigma/skins/classic/key.png (moved) (moved from plugins/enigma/skins/default/key.png)
• plugins/enigma/skins/classic/key_add.png (moved) (moved from plugins/enigma/skins/default/key_add.png)
• plugins/enigma/skins/classic/keys_toolbar.png (moved) (moved from plugins/enigma/skins/default/keys_toolbar.png)
• plugins/enigma/skins/classic/templates/keyimport.html (moved) (moved from plugins/enigma/skins/default/templates/keyimport.html)
• plugins/enigma/skins/classic/templates/keyinfo.html (moved) (moved from plugins/enigma/skins/default/templates/keyinfo.html)
• plugins/enigma/skins/classic/templates/keys.html (moved) (moved from plugins/enigma/skins/default/templates/keys.html)
• plugins/help/help.php (modified) (1 diff)
• plugins/managesieve/managesieve.php (modified) (2 diffs)
• program/include/rcube_config.php (modified) (1 diff)

plugins/enigma/enigma.php

@@ -436 +436 @@
                     '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')));
 

plugins/help/help.php

@@ -43 +43 @@
         ), '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");
+        }
     }
 

plugins/managesieve/managesieve.php

@@ -110 +110 @@
     {
         // use jQuery for popup window
-        $this->require_plugin('jqueryui'); 
+        $this->require_plugin('jqueryui');
 
         // include js script and localization
@@ -116 +116 @@
 
         // 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

program/include/rcube_config.php

@@ -253 +253 @@
         }
 
+        // larry is the new default skin :-)
+        if ($prefs['skin'] == 'default') {
+            $prefs['skin'] = 'larry';
+        }
+
         $this->userprefs = $prefs;
         $this->prop      = array_merge($this->prop, $prefs);