[Yanel-commits] rev 23551 - in public/yanel/trunk/src:
core/java/org/wyona/yanel/servlet webapp/htdocs
michi at wyona.com
michi at wyona.com
Mon Apr 2 12:33:06 CEST 2007
Author: michi
Date: 2007-04-02 12:33:04 +0200 (Mon, 02 Apr 2007)
New Revision: 23551
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:
yanel toolbar improved
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-02 10:20:47 UTC (rev 23550)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java 2007-04-02 10:33:04 UTC (rev 23551)
@@ -1783,27 +1783,27 @@
String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
StringBuffer sb= new StringBuffer();
sb.append("<ul><li>");
- sb.append("<div id=\"menutitle\">Yanel</div><ul>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">Yanel</div><ul>");
sb.append("<li><a href=\"?yanel.resource.meta\">View page info</a></li>");
sb.append("<li><a href=\"?yanel.toolbar=off\">Turn off toolbar</a></li>");
if (getIdentity(request) != null) {
- sb.append("<li><a href=\"?yanel.usecase=logout\">Logout</a></li>");
+ sb.append("<li><a href=\"?yanel.usecase=logout\"><img class=\"yaneltoolbar_menuicon\" src=\"" + backToRealm + reservedPrefix + "/yanel-img/icons/system-log-out.png\" border=\"0\"/>Logout</a></li>");
}
sb.append("</ul></li></ul>");
sb.append("<ul><li>");
- sb.append("<div id=\"menutitle\">File</div><ul>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">File</div><ul>");
sb.append("<li><a href=\"" + backToRealm + "create-new-page.html\">New</a></li>");
- sb.append("<li>New language  ><ul><li>German</li><li>Mandarin</li></ul></li>");
+ sb.append("<li class=\"haschild\">New language<ul><li>German</li><li>Mandarin</li></ul></li>");
sb.append("</ul></li></ul>");
sb.append("<ul><li>");
- sb.append("<div id=\"menutitle\">Edit</div><ul>");
- sb.append("<li>Open with  ><ul><li>Source editor</li><li>WYSIWYG editor</li></ul></li>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">Edit</div><ul>");
+ sb.append("<li class=\"haschild\">Open with<ul><li>Source editor</li><li>WYSIWYG editor</li></ul></li>");
sb.append("</ul></li></ul>");
sb.append("<ul><li>");
- sb.append("<div id=\"menutitle\">Help</div><ul>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">Help</div><ul>");
sb.append("<li>About</li>");
sb.append("</ul></li></ul>");
return sb.toString();
@@ -1828,7 +1828,7 @@
sb.append(System.getProperty("line.separator"));
sb.append("<style type=\"text/css\" media=\"screen\">");
sb.append(System.getProperty("line.separator"));
- sb.append("#menu{float:none;} /* This is required for IE to avoid positioning bug when placing content first in source. */");
+ 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"));
@@ -1840,12 +1840,20 @@
sb.append(System.getProperty("line.separator"));
sb.append("}");
sb.append(System.getProperty("line.separator"));
- sb.append("#menu ul li{float:left;width:100%;}");
+ 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.png) 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.png) no-repeat 98% 50%;}");
+ sb.append("</style>");
+ sb.append(System.getProperty("line.separator"));
+
return sb.toString();
}
@@ -1860,20 +1868,20 @@
private String getToolbarBodyStart(Resource resource, HttpServletRequest request) throws Exception {
String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
StringBuffer buf = new StringBuffer();
- buf.append("<div id=\"headerwrap\">");
- buf.append("<div id=\"menu\">");
+ buf.append("<div id=\"yaneltoolbar_headerwrap\">");
+ buf.append("<div id=\"yaneltoolbar_menu\">");
buf.append(getToolbarMenus(resource, request));
buf.append("</div>");
Identity identity = getIdentity(request);
if (identity != null) {
- buf.append("<span id=\"user\">User: " + identity.getUser().getID() + " (Realm: " + resource.getRealm().getName() + ")</span>");
+ buf.append("<span id=\"yaneltoolbar_user\">User: " + identity.getUser().getID() + " (Realm: " + resource.getRealm().getName() + ")</span>");
} else {
- buf.append("<span id=\"user\">User: Not signed in!</span>");
+ buf.append("<span id=\"yaneltoolbar_user\">User: Not signed in!</span>");
}
- buf.append("<img src=\"" + backToRealm + reservedPrefix + "/yanel_toolbar_logo.png\" id=\"toolbar_logo\"/>");
+ buf.append("<img src=\"" + backToRealm + reservedPrefix + "/yanel_toolbar_logo.png\" id=\"yaneltoolbar_logo\"/>");
buf.append("</div>");
- buf.append("<div id=\"middlewrap\">");
+ buf.append("<div id=\"yaneltoolbar_middlewrap\">");
return buf.toString();
}
Modified: public/yanel/trunk/src/webapp/htdocs/ie6.css
===================================================================
--- public/yanel/trunk/src/webapp/htdocs/ie6.css 2007-04-02 10:20:47 UTC (rev 23550)
+++ public/yanel/trunk/src/webapp/htdocs/ie6.css 2007-04-02 10:33:04 UTC (rev 23551)
@@ -1,7 +1,8 @@
-#headerwrap {
+#yaneltoolbar_headerwrap {
position:absolute;
z-index:10000;
height:24px;
+ left:0px;
}
-#headerwrap {top:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? documentElement.scrollTop : document.body.scrollTop);}
-#middlewrap {padding:20px;}
\ No newline at end of file
+#yaneltoolbar_headerwrap {top:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? documentElement.scrollTop : document.body.scrollTop);}
+#yaneltoolbar_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-04-02 10:20:47 UTC (rev 23550)
+++ public/yanel/trunk/src/webapp/htdocs/toolbar.css 2007-04-02 10:33:04 UTC (rev 23551)
@@ -4,29 +4,29 @@
padding:0;
height:100%; /* 100 % height */
}
-html>body #headerwrap {height:23px;} /* 100 % height */
-#headerwrap {
+html>body #yaneltoolbar_headerwrap {height:23px;} /* 100 % height */
+#yaneltoolbar_headerwrap {
width:100%;
height:23px;
background:lightgrey;
border-bottom:1px solid #888;
}
-html>body #headerwrap {
+html>body #yaneltoolbar_headerwrap {
position:fixed;
top:0px;
z-index:10000; /* Prevent certain problems with form controls */
}
-html>body #middlewrap {height:100%;padding:23px 1em;} /* 100 % height */
+html>body #yaneltoolbar_middlewrap {height:100%;padding:23px 1em;} /* 100 % height */
/* toolbar style ends here */
-#toolbar_logo{
+#yaneltoolbar_logo{
position: absolute;
right:15px;
float:right;
top:0px;
}
-#user {
+#yaneltoolbar_user {
position: absolute;
right: 100px;
float: right;
@@ -34,7 +34,7 @@
}
/* menu style starts here */
-#menu{
+#yaneltoolbar_menu{
width:100%;
float:left;
margin-top:0px;
@@ -42,31 +42,31 @@
text-align:left;
}
-#menu a, #menu #menutitle{
+#yaneltoolbar_menu a, #yaneltoolbar_menu #yaneltoolbar_menutitle{
display:block;
color:#000;
white-space:nowrap;
margin:0;
}
-#menu a{
+#yaneltoolbar_menu a{
text-decoration:none;
}
-#menu a, #menu a:visited{
+#yaneltoolbar_menu a, #yaneltoolbar_menu a:visited{
color:#000;
}
-#menu a:hover{
+#yaneltoolbar_menu a:hover{
color:#000;
}
-#menu a:active{
+#yaneltoolbar_menu a:active{
color:#060;
background:#ccc;
}
-#menu ul{
+#yaneltoolbar_menu ul{
left:-1px;
list-style:none;
margin:0px;
@@ -75,18 +75,18 @@
width:9em;
}
-#menu li{
+#yaneltoolbar_menu li{
position:relative;
margin:1px;
padding:2px;
}
-#menu li li{
+#yaneltoolbar_menu li li{
background:lightgrey;
padding:4px;
}
-#menu ul ul{
+#yaneltoolbar_menu ul ul{
position:absolute;
z-index:500;
top:auto;
@@ -94,7 +94,7 @@
background:#888;
}
-#menu ul ul ul{
+#yaneltoolbar_menu ul ul ul{
top:-1px;
left:100%;
}
@@ -107,45 +107,50 @@
improves IE's performance speed to use the older
file and this method */
-div#menu #menutitle:hover,div#menu ul:hover{
+div#yaneltoolbar_menu #yaneltoolbar_menutitle:hover,div#yaneltoolbar_menu ul:hover{
color:#000;
}
-div#menu li:hover{
+div#yaneltoolbar_menu li:hover{
cursor:pointer;
z-index:500;
background:lightsteelblue;
}
-div#menu li:hover ul ul,
-div#menu li li:hover ul ul,
-div#menu li li li:hover ul ul,
-div#menu li li li li:hover ul ul
+div#yaneltoolbar_menu li:hover ul ul,
+div#yaneltoolbar_menu li li:hover ul ul,
+div#yaneltoolbar_menu li li li:hover ul ul,
+div#yaneltoolbar_menu li li li li:hover ul ul
{display:none;}
-div#menu li:hover ul,
-div#menu li li:hover ul,
-div#menu li li li:hover ul,
-div#menu li li li li:hover ul
+div#yaneltoolbar_menu li:hover ul,
+div#yaneltoolbar_menu li li:hover ul,
+div#yaneltoolbar_menu li li li:hover ul,
+div#yaneltoolbar_menu li li li li:hover ul
{display:block;}
/* End of non-anchor hover selectors */
/* Styling for Expand
-#menu a.x, #menu a.x:visited{
+#yaneltoolbar_menu a.x, #yaneltoolbar_menu a.x:visited{
color:#000;
}
-#menu a.x:hover{
+#yaneltoolbar_menu a.x:hover{
color:#a00;
}
*/
-#menu a.x:active{
+#yaneltoolbar_menu a.x:active{
color:#060;
background:#ccc;
}
/*
-#menu #menutitle, #menu a{
+#yaneltoolbar_menu #yaneltoolbar_menutitle, #yaneltoolbar_menu a{
height:10%;
}*/
+
+.yaneltoolbar_menuicon{
+ vertical-align:middle;
+ margin-right:4px;
+}
\ No newline at end of file
More information about the Yanel-commits
mailing list