Fixed CSS bugs (#1484210 and #1484161) and quoting issue (#1484253)

4 files changed, 14 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 409ac1046..839dc4bec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,16 +1,24 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2007/02/21 (thomasb)
+----------
+- Fixed some CSS issues in default skin (closes #1484210 and #1484161)
+- Prevent from double quoting of numeric HTML character references (closes #1484253)
+
+
 2007/02/07 (tomekp)
 ----------
 - Updated (bg) translation (Doichin Dokov)
 
+
 2007/02/06 (tomekp)
 ----------
 - Updated (pl) translation
 - Updated (pt_BR) translation (Robson F. Ramaldes)
 - Big cleanup in program/localization
 
+
 2007/02/05 (thomasb)
 ----------
 - Updated Italian, Slovenian, Greek, Bulgarian, Hungarian and Croatian translation
diff --git a/program/include/main.inc b/program/include/main.inc
index 88c22b85e..7e7f216de 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1032,7 +1032,7 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
       $str = strip_tags($str);
     
     // avoid douple quotation of &
-    $out = preg_replace('/&([a-z]{2,5});/', '&\\1;', strtr($str, $encode_arr));
+    $out = preg_replace('/&([a-z]{2,5}|#[0-9]{2,4});/', '&\\1;', strtr($str, $encode_arr));
       
     return $newlines ? nl2br($out) : $out;
     }
diff --git a/skins/default/common.css b/skins/default/common.css
index 86c3a9c03..178b267b1 100755
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -120,7 +120,7 @@ img
   width: 600px;
   height: 37px;
   background: url(images/taskbar.gif) top right no-repeat;
-  padding: 10px 24px 0px 0px;
+  padding: 10px 24px 10px 0px;
   text-align: right;
   white-space: nowrap;
   z-index: 2;
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 479fb6138..2666f9a5e 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -564,6 +564,9 @@ body.messagelist
 html>body*#quicksearchbar { background-image: none; }
 html>body*#quicksearchbar a { top: 5px; }
 html>body*#quicksearchbar #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
+html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) { background-image: none; }
+html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) a { top: 5px; }
+html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
 /**/
 
 
@@ -685,6 +688,7 @@ table.headers-table tr td.subject
 
 #messagebody
 {
+  position:relative;
   min-height: 300px;
   padding-top: 10px;
   padding-bottom: 10px;