From ff82712ac3c29337e59c93a63587943fa1efe98f Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 24 Feb 2010 13:36:20 +0000
Subject: [PATCH] IE6 compatibility for action buttons, html code cleanup

---
 felamimail/inc/class.felamimail_hooks.inc.php | 4 +++-
 felamimail/inc/class.uiwidgets.inc.php        | 2 +-
 felamimail/templates/default/app.css          | 2 --
 felamimail/templates/default/mainscreen.tpl   | 8 ++++----
 felamimail/templates/jerryr/app.css           | 1 -
 felamimail/templates/jerryr/mainscreen.tpl    | 8 ++++----
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/felamimail/inc/class.felamimail_hooks.inc.php b/felamimail/inc/class.felamimail_hooks.inc.php
index 100e087095..919b978554 100644
--- a/felamimail/inc/class.felamimail_hooks.inc.php
+++ b/felamimail/inc/class.felamimail_hooks.inc.php
@@ -533,7 +533,9 @@ class felamimail_hooks
 			$file[] = array(
 				'text' => "<TABLE WIDTH=\"100%\" CELLPADDING=\"0\" CELLSPACING=\"0\" style=\"border: solid #aaaaaa 1px; border-right: solid black 1px; \">
 							<tr class=\"navbarBackground\">
-								<td align=\"right\" width=\"100%\">".$navbarButtons."</td></tr></table></div>",
+								<td align=\"right\" width=\"100%\">".$navbarButtons."</td>
+							</tr>
+						   </table>",
 				'no_lang' => True,
 				'link' => False,
 				'icon' => False,
diff --git a/felamimail/inc/class.uiwidgets.inc.php b/felamimail/inc/class.uiwidgets.inc.php
index 9506897db2..c666e7328e 100644
--- a/felamimail/inc/class.uiwidgets.inc.php
+++ b/felamimail/inc/class.uiwidgets.inc.php
@@ -853,7 +853,7 @@
 			$image = $GLOBALS['egw']->common->image('felamimail',$_imageName);
 			$float = $_float == 'right' ? 'right' : 'left';
 
-			return "<div class='navButton' style='float:$float;' onmousedown='this.className=\"navButtonActive\";' onmouseup='this.className=\"navButtonHover\";' onmouseout='this.className=\"navButton\";' onclick=\"$_imageAction\"><img style='width:16px; height:16px;' title='$_toolTip' src='$image' ></div>";
+			return "<div class='navButton' style='float:$float;' onmousedown='this.className=\"navButtonActive\";' onmouseup='this.className=\"navButtonHover\";' onmouseout='this.className=\"navButton\";' onclick=\"$_imageAction\"><img style='width:16px; height:16px;' class=\"sideboxstar\" title='$_toolTip' src='$image' ></div>";
 		}
 
 		function navbarSeparator()
diff --git a/felamimail/templates/default/app.css b/felamimail/templates/default/app.css
index f1bc059618..39f4ce0608 100644
--- a/felamimail/templates/default/app.css
+++ b/felamimail/templates/default/app.css
@@ -312,8 +312,6 @@ div.navButton {
 	padding: 2px;
 	margin: 2px;
 	border: solid #dddddd 1px;
-	position: relative;
-	z-index:1;
 }
 
 div.navButton:hover, div.navButtonHover { 
diff --git a/felamimail/templates/default/mainscreen.tpl b/felamimail/templates/default/mainscreen.tpl
index 97bdfbd692..93f699e454 100644
--- a/felamimail/templates/default/mainscreen.tpl
+++ b/felamimail/templates/default/mainscreen.tpl
@@ -82,11 +82,11 @@ fm_startTimerMessageListUpdate(refreshTimeOut);
 </table>
 <form method="post" name="mainView" id="mainView" action="{reloadView}">
 </form>
-<TABLE  width="100%" cellpadding="0" cellspacing="0" border="0" style="height:100px;">
-		<input type="hidden" name="folderAction" id="folderAction" value="changeFolder">
-		<INPUT TYPE=hidden NAME="oldMailbox" value="{oldMailbox}">
-		<INPUT TYPE=hidden NAME="mailbox">
 
+<input type="hidden" name="folderAction" id="folderAction" value="changeFolder">
+<INPUT TYPE=hidden NAME="oldMailbox" value="{oldMailbox}">
+<INPUT TYPE=hidden NAME="mailbox">
+<TABLE  width="100%" cellpadding="0" cellspacing="0" border="0" style="height:100px;">
 	<tr style="height: 20px;">
 		<td nowrap>
 
diff --git a/felamimail/templates/jerryr/app.css b/felamimail/templates/jerryr/app.css
index 42c9c89cce..f3bea48699 100644
--- a/felamimail/templates/jerryr/app.css
+++ b/felamimail/templates/jerryr/app.css
@@ -357,7 +357,6 @@ div.navButton {
 	padding: 2px;
 	margin: 2px;
 	border: solid #dddddd 1px;
-	position: relative;
 }
 
 div.navButton:hover, div.navButtonHover { 
diff --git a/felamimail/templates/jerryr/mainscreen.tpl b/felamimail/templates/jerryr/mainscreen.tpl
index a8d6308e0b..8b9c1e247e 100644
--- a/felamimail/templates/jerryr/mainscreen.tpl
+++ b/felamimail/templates/jerryr/mainscreen.tpl
@@ -83,11 +83,11 @@ fm_startTimerMessageListUpdate(refreshTimeOut);
 </table>
 <form method="post" name="mainView" id="mainView" action="{reloadView}">
 </form>
+	
+<input type="hidden" name="folderAction" id="folderAction" value="changeFolder">
+<INPUT TYPE=hidden NAME="oldMailbox" value="{oldMailbox}">
+<INPUT TYPE=hidden NAME="mailbox">
 <TABLE  width="100%" cellpadding="0" cellspacing="0" border="0" style="height:100px;">
-		<input type="hidden" name="folderAction" id="folderAction" value="changeFolder">
-		<INPUT TYPE=hidden NAME="oldMailbox" value="{oldMailbox}">
-		<INPUT TYPE=hidden NAME="mailbox">
-
 	<tr style="height: 20px;">
 		<td nowrap>
 			<span id="folderFunction" align="left" style="font-size:11px;"></span>