[Yanel-commits] rev 23766 - in
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet: .
menu menu/impl
michi at wyona.com
michi at wyona.com
Sun Apr 15 17:58:45 CEST 2007
Author: michi
Date: 2007-04-15 17:58:43 +0200 (Sun, 15 Apr 2007)
New Revision: 23766
Added:
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/impl/WelcomeRealmMenu.java
Modified:
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/Menu.java
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java
Log:
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-04-15 15:07:12 UTC (rev 23765)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java 2007-04-15 15:58:43 UTC (rev 23766)
@@ -1798,37 +1798,9 @@
* Get toolbar menus
*/
private String getToolbarMenus(Resource resource, HttpServletRequest request) throws ServletException, IOException, Exception {
- String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
- StringBuffer sb= new StringBuffer();
- sb.append("<ul><li>");
- 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>");
- Identity identity = getIdentity(request);
- if (identity != null) {
- sb.append("<li><a href=\"" + backToRealm + reservedPrefix + "/users/" + identity.getUsername() + ".html\">My profile</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=\"yaneltoolbar_menutitle\">File</div><ul>");
- sb.append("<li class=\"haschild\"><a href=\"" + backToRealm + "create-new-page.html\">New</a><ul><li><a href=\"" + backToRealm + "create-new-page.html?resource-type=http%3A%2F%2Fwww.wyona.org%2Fyanel%2Fresource%2F1.0%3A%3Axml\">Standard page (XHTML)</a></li><li><a href=\"" + backToRealm + "create-new-page.html?resource-type=http%3A%2F%2Fwww.wyona.org%2Fyanel%2Fresource%2F1.0%3A%3Awiki\">Wiki page</a></li></ul></li>");
- sb.append("<li class=\"haschild\">New language<ul><li>German</li><li>Mandarin</li></ul></li>");
- sb.append("<li>Publish</li>");
- sb.append("</ul></li></ul>");
-
- sb.append("<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("<li class=\"haschild\">Revisions<ul><li class=\"haschild\">53534<ul><li>Show diff</li><li>Revert to</li></ul></li><li class=\"haschild\">52108<ul><li>Show diff</li><li>Revert to</li></ul></li></ul></li>");
- sb.append("</ul></li></ul>");
-
- sb.append("<ul><li>");
- sb.append("<div id=\"yaneltoolbar_menutitle\">Help</div><ul>");
- sb.append("<li>About</li>");
- sb.append("</ul></li></ul>");
- return sb.toString();
+ //org.wyona.yanel.servlet.menu.Menu menu = new org.wyona.yanel.servlet.menu.impl.WelcomeRealmMenu();
+ org.wyona.yanel.servlet.menu.Menu menu = new org.wyona.yanel.servlet.menu.impl.DefaultMenu();
+ return menu.getYanelMenu(resource, request, map, reservedPrefix) + menu.getMenus(resource, request, map, reservedPrefix) + menu.getHelpMenu(resource, request, map, reservedPrefix);
}
/**
Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/Menu.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/Menu.java 2007-04-15 15:07:12 UTC (rev 23765)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/Menu.java 2007-04-15 15:58:43 UTC (rev 23766)
@@ -35,8 +35,8 @@
sb.append("<li><a href=\"" + backToRealm + reservedPrefix + "/users/" + identity.getUsername() + ".html\">My profile</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("</ul>");
+ sb.append("</li></ul>");
return sb.toString();
}
@@ -49,9 +49,11 @@
StringBuffer sb= new StringBuffer();
sb.append("<ul><li>");
- sb.append("<div id=\"yaneltoolbar_menutitle\">Help</div><ul>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">Help</div>");
+ sb.append("<ul>");
sb.append("<li>About</li>");
- sb.append("</ul></li></ul>");
+ sb.append("</ul>");
+ sb.append("</li></ul>");
return sb.toString();
}
Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java 2007-04-15 15:07:12 UTC (rev 23765)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java 2007-04-15 15:58:43 UTC (rev 23766)
@@ -28,17 +28,21 @@
String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
StringBuffer sb= new StringBuffer();
- sb.append("<div id=\"yaneltoolbar_menutitle\">File</div><ul>");
+ sb.append("<ul><li>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">File</div>");
+ sb.append("<ul>");
sb.append("<li class=\"haschild\"><a href=\"" + backToRealm + "create-new-page.html\">New</a><ul><li><a href=\"" + backToRealm + "create-new-page.html?resource-type=http%3A%2F%2Fwww.wyona.org%2Fyanel%2Fresource%2F1.0%3A%3Axml\">Standard page (XHTML)</a></li><li><a href=\"" + backToRealm + "create-new-page.html?resource-type=http%3A%2F%2Fwww.wyona.org%2Fyanel%2Fresource%2F1.0%3A%3Awiki\">Wiki page</a></li></ul></li>");
sb.append("<li class=\"haschild\">New language<ul><li>German</li><li>Mandarin</li></ul></li>");
sb.append("<li>Publish</li>");
- sb.append("</ul></li></ul>");
+ sb.append("</ul>");
+ sb.append("</li></ul>");
sb.append("<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("<li class=\"haschild\">Revisions<ul><li class=\"haschild\">53534<ul><li>Show diff</li><li>Revert to</li></ul></li><li class=\"haschild\">52108<ul><li>Show diff</li><li>Revert to</li></ul></li></ul></li>");
- sb.append("</ul></li></ul>");
+ sb.append("</ul>");
+ sb.append("</li></ul>");
return sb.toString();
}
Added: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/impl/WelcomeRealmMenu.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/impl/WelcomeRealmMenu.java 2007-04-15 15:07:12 UTC (rev 23765)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/menu/impl/WelcomeRealmMenu.java 2007-04-15 15:58:43 UTC (rev 23766)
@@ -0,0 +1,32 @@
+package org.wyona.yanel.servlet.menu.impl;
+
+import org.wyona.yanel.core.Resource;
+import org.wyona.yanel.core.map.Map;
+import org.wyona.yanel.core.map.Realm;
+
+import org.wyona.yanel.servlet.YanelServlet;
+import org.wyona.yanel.servlet.menu.Menu;
+
+import org.wyona.security.core.api.Identity;
+import org.wyona.security.core.api.IdentityMap;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import java.io.IOException;
+
+/**
+ *
+ */
+public class WelcomeRealmMenu extends Menu {
+
+ /**
+ * Get toolbar menus
+ */
+ public String getMenus(Resource resource, HttpServletRequest request, Map map, String reservedPrefix) throws ServletException, IOException, Exception {
+ String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
+ StringBuffer sb= new StringBuffer("");
+ return sb.toString();
+ }
+}
More information about the Yanel-commits
mailing list