From de2e0bfeb8bf6884ae4185b94d495a55322348ae Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 9 Dec 2008 17:44:45 +0000
Subject: [PATCH] #1485439: style fixes for IE6,7

---
 program/js/app.js                         | 2 +-
 program/steps/mail/func.inc               | 2 +-
 program/steps/settings/manage_folders.inc | 4 ++--
 skins/default/mail.css                    | 3 +--
 skins/default/settings.css                | 2 ++
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 2795ccc59..c46997afa 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3560,7 +3560,7 @@ function rcube_webmail()
           col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
       }
       else if (c=='attachment')
-        col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '';
+        col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '&nbsp;';
       else
         col.innerHTML = cols[c];
 
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 93dae6660..696390e9f 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -323,7 +323,7 @@ function rcmail_message_list($attrib)
       if ($col!='attachment')
         $out .= '<td class="'.$col.'">' . $cont . "</td>\n";
       else
-        $out .= sprintf("<td class=\"icon\">%s</td>\n", $attach_icon ? sprintf($image_tag, $skin_path, $attach_icon, '') : '');
+        $out .= sprintf("<td class=\"icon\">%s</td>\n", $attach_icon ? sprintf($image_tag, $skin_path, $attach_icon, '') : '&nbsp;');
       }
 
     $out .= "</tr>\n";
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index d44550e72..952d7914c 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -249,8 +249,8 @@ function rcube_subscription_form($attrib)
       $table->add('delete', html::a(array('href' => "#delete", 'title' => rcube_label('deletefolder')), $del_button));
     }
     else {
-      $table->add(null, '');
-      $table->add(null, '');
+      $table->add('rename', '&nbsp;');
+      $table->add('delete', '&nbsp;');
     }
     
     $a_js_folders['rcmrow'.$idx] = array($folder_utf8, $display_folder, $protected);
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 2ba02f609..7ca74b1fa 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -299,7 +299,6 @@ td.formlinks a:visited
 #mailboxlist
 {
   position:relative;
-  width: 100%;
   height: auto;
   margin: 0px;
   padding: 0px;
@@ -464,7 +463,7 @@ body.messagelist
   display: table;
   table-layout: fixed;
   /* css hack for IE */
-  width: expression(parseInt(document.getElementById('mailcontframe').clientWidth)+'px');
+  width: expression('auto');
 }
 
 #messagelist thead tr td
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 1e99c3bfb..2e181621c 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -216,6 +216,8 @@ div.settingspart
 #subscription-table
 {
   width: 100%;
+  /* css hack for IE */ 
+  width: expression('auto');
 }
 
 #subscription-table tbody td