From b2631bffd98a51fc8b61aa8452fbaf3e95bcde24 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 18 Aug 2012 17:57:08 +0200
Subject: More default->larry fixes

---
 plugins/hide_blockquote/hide_blockquote.php     |  6 +----
 plugins/hide_blockquote/skins/default/style.css | 31 -------------------------
 plugins/hide_blockquote/skins/larry/style.css   | 31 +++++++++++++++++++++++++
 program/include/rcube_plugin.php                |  2 +-
 4 files changed, 33 insertions(+), 37 deletions(-)
 delete mode 100644 plugins/hide_blockquote/skins/default/style.css
 create mode 100644 plugins/hide_blockquote/skins/larry/style.css

diff --git a/plugins/hide_blockquote/hide_blockquote.php b/plugins/hide_blockquote/hide_blockquote.php
index ca0273a5d..7af163dcd 100644
--- a/plugins/hide_blockquote/hide_blockquote.php
+++ b/plugins/hide_blockquote/hide_blockquote.php
@@ -27,11 +27,7 @@ class hide_blockquote extends rcube_plugin
             && ($limit = $rcmail->config->get('hide_blockquote_limit'))
         ) {
             // include styles
-            $skin = $rcmail->config->get('skin');
-            if (!file_exists($this->home."/skins/$skin/style.css")) {
-                $skin = 'default';
-            }
-            $this->include_stylesheet("skins/$skin/style.css");
+            $this->include_stylesheet($this->local_skin_path() . "/style.css");
 
             // Script and localization
             $this->include_script('hide_blockquote.js');
diff --git a/plugins/hide_blockquote/skins/default/style.css b/plugins/hide_blockquote/skins/default/style.css
deleted file mode 100644
index 198172f92..000000000
--- a/plugins/hide_blockquote/skins/default/style.css
+++ /dev/null
@@ -1,31 +0,0 @@
-span.blockquote-link {
-  font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-  top: 0;
-  cursor: pointer;
-  right: 5px;
-  height: 14px;
-  min-width: 40px;
-  padding: 0 8px;
-  font-size: 10px;
-  font-weight: bold;
-  color: #a8a8a8;
-  line-height: 14px;
-  text-decoration: none;
-  text-shadow: 0px 1px 1px #fff;
-  text-align: center;
-  border: 1px solid #e8e8e8;
-  border-top: none;
-  border-bottom-right-radius: 6px;
-  border-bottom-left-radius: 6px;
-  background: #f8f8f8;
-  background: -moz-linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#e8e8e8));
-  background: -o-linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%);
-  background: -ms-linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%);
-  background: linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%);
-}
-
-blockquote.blockquote-header {
-  text-overflow: ellipsis !important;
-  padding-right: 60px !important;
-}
\ No newline at end of file
diff --git a/plugins/hide_blockquote/skins/larry/style.css b/plugins/hide_blockquote/skins/larry/style.css
new file mode 100644
index 000000000..198172f92
--- /dev/null
+++ b/plugins/hide_blockquote/skins/larry/style.css
@@ -0,0 +1,31 @@
+span.blockquote-link {
+  font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+  top: 0;
+  cursor: pointer;
+  right: 5px;
+  height: 14px;
+  min-width: 40px;
+  padding: 0 8px;
+  font-size: 10px;
+  font-weight: bold;
+  color: #a8a8a8;
+  line-height: 14px;
+  text-decoration: none;
+  text-shadow: 0px 1px 1px #fff;
+  text-align: center;
+  border: 1px solid #e8e8e8;
+  border-top: none;
+  border-bottom-right-radius: 6px;
+  border-bottom-left-radius: 6px;
+  background: #f8f8f8;
+  background: -moz-linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#e8e8e8));
+  background: -o-linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%);
+  background: -ms-linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%);
+  background: linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%);
+}
+
+blockquote.blockquote-header {
+  text-overflow: ellipsis !important;
+  padding-right: 60px !important;
+}
\ No newline at end of file
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index b1ec32a8a..c1035733b 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -336,7 +336,7 @@ abstract class rcube_plugin
   public function local_skin_path()
   {
     $rcmail = rcube::get_instance();
-    foreach (array($rcmail->config->get('skin'),'default') as $skin) {
+    foreach (array($rcmail->config->get('skin'), 'larry') as $skin) {
       $skin_path = 'skins/' . $skin;
       if (is_dir(realpath(slashify($this->home) . $skin_path)))
         break;
-- 
cgit v1.2.3