[Yanel-commits] rev 23981 - in public/yanel/trunk/src:
core/java/org/wyona/yanel/servlet webapp/htdocs
josias at wyona.com
josias at wyona.com
Mon Apr 23 22:34:27 CEST 2007
Author: josias
Date: 2007-04-23 22:34:26 +0200 (Mon, 23 Apr 2007)
New Revision: 23981
Added:
public/yanel/trunk/src/webapp/htdocs/toolbarIE.css
public/yanel/trunk/src/webapp/htdocs/toolbarIE6.css
Removed:
public/yanel/trunk/src/webapp/htdocs/ie6.css
Modified:
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
public/yanel/trunk/src/webapp/htdocs/csshover.htc
Log:
fixed some issues with the toolbar css. see bug #5261, thanks to simon
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-04-23 19:58:56 UTC (rev 23980)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java 2007-04-23 20:34:26 UTC (rev 23981)
@@ -1823,43 +1823,34 @@
sb.append("<link type=\"text/css\" href=\"" + backToRealm + reservedPrefix + "/toolbar.css\" rel=\"stylesheet\"/>");
sb.append(System.getProperty("line.separator"));
- 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"));
sb.append("<style type=\"text/css\" media=\"screen\">");
sb.append(System.getProperty("line.separator"));
- sb.append("#yaneltoolbar_menu{float:none;} /* This is required for IE to avoid positioning bug when placing content first in source. */");
- sb.append(System.getProperty("line.separator"));
- sb.append(" /* IE Menu CSS */");
- sb.append(System.getProperty("line.separator"));
- sb.append(" /* csshover.htc file version: V1.21.041022 - Available for download from: http://www.xs4all.nl/~peterned/csshover.html */");
- sb.append(System.getProperty("line.separator"));
- sb.append(" body{behavior:url(" + backToRealm + reservedPrefix + "/csshover.htc);");
- sb.append(System.getProperty("line.separator"));
- sb.append(" font-size:100%; /* to enable text resizing in IE */");
- sb.append(System.getProperty("line.separator"));
- sb.append("}");
- sb.append(System.getProperty("line.separator"));
- sb.append("#yaneltoolbar_menu ul li{float:left;width:100%;}");
- sb.append(System.getProperty("line.separator"));
- sb.append("</style>");
- sb.append(System.getProperty("line.separator"));
- sb.append("<![endif]-->");
- sb.append(System.getProperty("line.separator"));
- sb.append("<style type=\"text/css\" media=\"screen\">");
- sb.append(System.getProperty("line.separator"));
sb.append("#yaneltoolbar_menu li li.haschild{ background: lightgrey url(" + backToRealm + reservedPrefix + "/yanel-img/submenu.gif) no-repeat 98% 50%;}");
sb.append(System.getProperty("line.separator"));
sb.append("#yaneltoolbar_menu li li.haschild:hover{ background: lightsteelblue url(" + backToRealm + reservedPrefix + "/yanel-img/submenu.gif) no-repeat 98% 50%;}");
sb.append("</style>");
sb.append(System.getProperty("line.separator"));
- // If browser is Mozilla
+ // If browser is Mozilla (gecko engine rv:1.7)
if (request.getHeader("User-Agent").indexOf("rv:1.7") >= 0) {
sb.append("<link type=\"text/css\" href=\"" + backToRealm + reservedPrefix + "/toolbarMozilla.css\" rel=\"stylesheet\"/>");
sb.append(System.getProperty("line.separator"));
}
+ // If browser is IE
+ if (request.getHeader("User-Agent").indexOf("compatible; MSIE") >= 0 && request.getHeader("User-Agent").indexOf("Windows") >= 0 ) {
+ sb.append("<link type=\"text/css\" href=\"" + backToRealm + reservedPrefix + "/toolbarIE.css\" rel=\"stylesheet\"/>");
+ sb.append(System.getProperty("line.separator"));
+ sb.append("<style type=\"text/css\" media=\"screen\">");
+ sb.append(" body{behavior:url(" + backToRealm + reservedPrefix + "/csshover.htc);font-size:100%;}");
+ sb.append("</style>");
+
+ }
+ // If browser is IE6
+ if (request.getHeader("User-Agent").indexOf("compatible; MSIE 6") >= 0 && request.getHeader("User-Agent").indexOf("Windows") >= 0 ) {
+ sb.append("<link type=\"text/css\" href=\"" + backToRealm + reservedPrefix + "/toolbarIE6.css\" rel=\"stylesheet\"/>");
+ sb.append(System.getProperty("line.separator"));
+ }
+
return sb.toString();
}
@@ -1889,7 +1880,10 @@
}
buf.append("</span>");
- buf.append("<img src=\"" + backToRealm + reservedPrefix + "/yanel_toolbar_logo.png\" id=\"yaneltoolbar_logo\"/>");
+ buf.append("<span id=\"yaneltoolbar_logo\">");
+ buf.append("<img src=\"" + backToRealm + reservedPrefix + "/yanel_toolbar_logo.png\"/>");
+ buf.append("</span>");
+
buf.append("</div>");
buf.append("<div id=\"yaneltoolbar_middlewrap\">");
return buf.toString();
Modified: public/yanel/trunk/src/webapp/htdocs/csshover.htc
===================================================================
--- public/yanel/trunk/src/webapp/htdocs/csshover.htc 2007-04-23 19:58:56 UTC (rev 23980)
+++ public/yanel/trunk/src/webapp/htdocs/csshover.htc 2007-04-23 20:34:26 UTC (rev 23981)
@@ -31,7 +31,7 @@
}
function parseStylesheets() {
- if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
+ if(!/MSIE (5|6)/.test(navigator.userAgent) && (!/MSIE (7)/.test(navigator.userAgent) && document.compatMode && document.compatMode=='CSS1Compat')) return;
window.attachEvent('onunload', unhookHoverEvents);
var sheets = doc.styleSheets, l = sheets.length;
for(var i=0; i<l; i++)
Deleted: public/yanel/trunk/src/webapp/htdocs/ie6.css
===================================================================
--- public/yanel/trunk/src/webapp/htdocs/ie6.css 2007-04-23 19:58:56 UTC (rev 23980)
+++ public/yanel/trunk/src/webapp/htdocs/ie6.css 2007-04-23 20:34:26 UTC (rev 23981)
@@ -1,12 +0,0 @@
-#yaneltoolbar_headerwrap {
- position:absolute;
- z-index:10000;
- height:24px;
- left:0px;
-}
-#yaneltoolbar_headerwrap {top:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? documentElement.scrollTop : document.body.scrollTop);}
-#yaneltoolbar_middlewrap {padding:20px;}
-
-#yaneltoolbar_menu ul{
- width:9em;
-}
\ No newline at end of file
Added: public/yanel/trunk/src/webapp/htdocs/toolbarIE.css
===================================================================
--- public/yanel/trunk/src/webapp/htdocs/toolbarIE.css 2007-04-23 19:58:56 UTC (rev 23980)
+++ public/yanel/trunk/src/webapp/htdocs/toolbarIE.css 2007-04-23 20:34:26 UTC (rev 23981)
@@ -0,0 +1,23 @@
+#yaneltoolbar_headerwrap {
+ position:absolute;
+ z-index:10000;
+ height:24px;
+ left:0px;
+}
+
+#yaneltoolbar_headerwrap {
+ top:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? documentElement.scrollTop : document.body.scrollTop);
+}
+
+#yaneltoolbar_middlewrap {
+ padding:20px;
+}
+
+#yaneltoolbar_menu ul li{
+ float:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? "none" : "left");
+ width:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? "none" : "100%");
+}
+
+#yaneltoolbar_menu ul{
+ width:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? "auto" : "9em");
+}
\ No newline at end of file
Property changes on: public/yanel/trunk/src/webapp/htdocs/toolbarIE.css
___________________________________________________________________
Name: svn:eol-style
+ native
Added: public/yanel/trunk/src/webapp/htdocs/toolbarIE6.css
===================================================================
--- public/yanel/trunk/src/webapp/htdocs/toolbarIE6.css 2007-04-23 19:58:56 UTC (rev 23980)
+++ public/yanel/trunk/src/webapp/htdocs/toolbarIE6.css 2007-04-23 20:34:26 UTC (rev 23981)
@@ -0,0 +1,12 @@
+#yaneltoolbar_menu {
+ float:none;
+}
+
+#yaneltoolbar_menu ul li {
+ float:left;width:100%;
+}
+
+#yaneltoolbar_menu ul {
+ width:9em;
+}
+
\ No newline at end of file
Property changes on: public/yanel/trunk/src/webapp/htdocs/toolbarIE6.css
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the Yanel-commits
mailing list