[Yanel-commits] rev 22942 - public/yanel/trunk/src/core/java/org/wyona/yanel/servlet

Mon Feb 26 16:08:03 CET 2007

Author: michi
Date: 2007-02-26 16:08:02 +0100 (Mon, 26 Feb 2007)
New Revision: 22942

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
get toolbar menus 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-02-26 14:12:47 UTC (rev 22941)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-26 15:08:02 UTC (rev 22942)
@@ -1699,11 +1699,12 @@
     /**
      * Get toolbar menus
      */
-    private String getToolbarMenus() {
+    private  String getToolbarMenus(Resource resource, HttpServletRequest request) throws ServletException, IOException {
+        String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
         StringBuffer sb= new StringBuffer();
         sb.append("<ul><li>");
         sb.append("<h2>File</h2><ul>");
-        sb.append("<li><a href=\"create-new-page.html\">New</a></li>");
+        sb.append("<li><a href=\"" + backToRealm + "create-new-page.html\">New</a></li>");
         sb.append("<li><a href=\"?yanel.toolbar=off\">Turn off toolbar</a></li>");
         sb.append("<li><a href=\"?yanel.usecase=logout\">Logout</a></li>");
         sb.append("</ul></li></ul>");
@@ -1730,12 +1731,12 @@
                     tb.append("<html>");
                     tb.append("<head>");
                     // TODO: compute relative path ...
-                    tb.append("<link type=\"text/css\" href=\"" + backToRealm+reservedPrefix + "/toolbar.css\" rel=\"stylesheet\"/>");
+                    tb.append("<link type=\"text/css\" href=\"" + backToRealm + reservedPrefix + "/toolbar.css\" rel=\"stylesheet\"/>");
                     tb.append("</head>");
                     tb.append("<body>");
                     tb.append("<div id=\"headerwrap\">");
                     tb.append("<div id=\"menu\">");
-                    tb.append(getToolbarMenus());
+                    tb.append(getToolbarMenus(resource, request));
                     tb.append("</div>");
                     Identity identity = getIdentity(request);
                     if (identity != null) {


