[Yanel-commits] rev 53656 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl

[michi at wyona.com]

Author: michi
Date: 2010-10-04 11:34:53 +0200 (Mon, 04 Oct 2010)
New Revision: 53656

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java
Log:
use new menu utility method

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java	2010-10-04 09:32:31 UTC (rev 53655)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java	2010-10-04 09:34:53 UTC (rev 53656)
@@ -49,13 +49,14 @@
         sb.append("<li class=\"haschild\">WYSIWYG editor&#160;&#160;&#160;");
         sb.append("<ul>");
         if (ResourceAttributeHelper.hasAttributeImplemented(resource, "Modifiable", "2")) {
-            sb.append("<li><a href=\"" + backToRealm + "usecases/tinymce.html?edit-path=" + resource.getPath() + "\">Edit page with tinyMCE&#160;&#160;&#160;</a></li>");
+            //sb.append("<li><a href=\"" + backToRealm + "usecases/tinymce.html?edit-path=" + resource.getPath() + "\">Edit page with tinyMCE&#160;&#160;&#160;</a></li>");
+            sb.append(getMenuItem("usecases/tinymce.html?edit-path=" + resource.getPath(), "Edit page with tinyMCE&#160;&#160;&#160;"));
             sb.append("<li><a href=\"" + backToRealm + "usecases/xinha.html?edit-path=" + resource.getPath() + "\">Edit page with Xinha&#160;&#160;&#160;</a></li>");
         } else {
             sb.append("<li>Edit page with tinyMCE&#160;&#160;&#160;</li>");
             sb.append("<li><a>Edit page with Xinha&#160;&#160;&#160;</a></li>");
         }
-        sb.append("<li><a href=\"http://www.yulup.org\">Edit page with Yulup&#160;&#160;&#160;</a></li>");
+        sb.append(getMenuItem("http://www.yulup.org", "Edit page with Yulup&#160;&#160;&#160;"));
         sb.append("</ul>");
         sb.append("</li>");
         sb.append("<li>Source editor</li>");

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java	2010-10-04 09:32:31 UTC (rev 53655)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java	2010-10-04 09:34:53 UTC (rev 53656)
@@ -43,7 +43,8 @@
         sb.append("<li class=\"haschild\">WYSIWYG editor&#160;&#160;&#160;");
         sb.append("<ul>");
         if (ResourceAttributeHelper.hasAttributeImplemented(resource, "Modifiable", "2")) {
-            sb.append("<li><a href=\"" + backToRealm + resource.getPath().substring(1) + ".tinymce-edit.html\">Edit page with tinyMCE&#160;&#160;&#160;</a></li>");
+            //sb.append("<li><a href=\"" + backToRealm + resource.getPath().substring(1) + ".tinymce-edit.html\">Edit page with tinyMCE&#160;&#160;&#160;</a></li>");
+            sb.append(getMenuItem(resource.getPath().substring(1) + ".tinymce-edit.html", "Edit page with tinyMCE&#160;&#160;&#160;"));
             sb.append("<li><a href=\"" + backToRealm + "usecases/xinha.html?edit-path=" + resource.getPath() + "\">Edit page with Xinha&#160;&#160;&#160;</a></li>");
         } else {
             sb.append("<li>Edit page with tinyMCE&#160;&#160;&#160;</li>");