[Yanel-commits] rev 23491 - in public/yanel/trunk/src: core/java/org/wyona/yanel/servlet webapp/htdocs

[michi at wyona.com]

Author: michi
Date: 2007-03-29 10:50:10 +0200 (Thu, 29 Mar 2007)
New Revision: 23491

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
   public/yanel/trunk/src/webapp/htdocs/ie6.css
   public/yanel/trunk/src/webapp/htdocs/toolbar.css
Log:
IE stuff fixed

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-03-29 08:37:03 UTC (rev 23490)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-03-29 08:50:10 UTC (rev 23491)
@@ -1821,7 +1821,7 @@
         
         sb.append("<link type=\"text/css\" href=\"" + backToRealm + reservedPrefix + "/toolbar.css\" rel=\"stylesheet\"/>");
         sb.append(System.getProperty("line.separator"));
-        sb.append("<!--[if gte IE 6]>");
+        sb.append("<!--[if lt IE 7]>");
         sb.append(System.getProperty("line.separator"));
         sb.append("<link rel=\"stylesheet\" href=\"" + backToRealm + reservedPrefix + "/ie6.css\" type=\"text/css\">");
         sb.append(System.getProperty("line.separator"));

Modified: public/yanel/trunk/src/webapp/htdocs/ie6.css
===================================================================
--- public/yanel/trunk/src/webapp/htdocs/ie6.css	2007-03-29 08:37:03 UTC (rev 23490)
+++ public/yanel/trunk/src/webapp/htdocs/ie6.css	2007-03-29 08:50:10 UTC (rev 23491)
@@ -1,7 +1,7 @@
-html {
-    overflow:hidden;
-	}
-body {
-    height:100%;
-    overflow:auto;
-	}
+#headerwrap {
+	position:absolute;
+	z-index:10000;
+	height:24px;
+}
+#headerwrap {top:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? documentElement.scrollTop : document.body.scrollTop);}
+#middlewrap {padding:20px;}
\ No newline at end of file

Modified: public/yanel/trunk/src/webapp/htdocs/toolbar.css
===================================================================
--- public/yanel/trunk/src/webapp/htdocs/toolbar.css	2007-03-29 08:37:03 UTC (rev 23490)
+++ public/yanel/trunk/src/webapp/htdocs/toolbar.css	2007-03-29 08:50:10 UTC (rev 23491)
@@ -1,48 +1,22 @@
-body, html{
-	margin:0;
+html,
+body {
+	margin:0 !important;
 	padding:0;
+	height:100%; /* 100 % height */
 }
-body {
-	min-width:720px; /* Prevent content from becoming unreachable in Gecko */
+html>body #headerwrap {height:23px;} /* 100 % height */
+#headerwrap {
+	width:100%;
+	height:23px;
+	background:lightgrey;
+	border-bottom:1px solid #888;
 }
-
-/* the whole page should scrolls */
-div#headerwrap {
-  position: absolute;
-  width: 100%;
-  top: 0;
-  left: 0;
-  height: 23px;
-  margin: 0 auto;
-  z-index: 500;
-/*border-right-width:20px;*/
-}
-
-/* position:fixed for modern browsers - header should not scroll */
-body>div#headerwrap {
+html>body #headerwrap {
 	position:fixed;
+	top:0px;
+	z-index:10000; /* Prevent certain problems with form controls */
 }
-
-/* set a left margin to compensate for IE/Win always making room for a scrollbar */
-div#middlewrap {
-/* set left margin and bottom padding for IE5/Win */
-	padding:24px 0 0 0;
-	margin-left:0;
-/* set left margin and bottom padding for others */
-	margin-left:16px;
-}
-
-/* set left margin for modern browsers */
-body>div#middlewrap {
-	margin-left:0;
-}
-
-div#headerwrap{
-  background:lightgrey;
-  color:#000;
-  border-bottom:1px solid #888;
-  font:normal 12px "lucida grande", tahoma, verdana, arial, sans-serif;
-}
+html>body #middlewrap {height:100%;padding:23px 1em;} /* 100 % height */
 /* toolbar style ends here */
 
 #toolbar_logo{