[Openutils-svn] SF.net SVN: openutils:[4182] magnoliamodules/trunk/openutils-mgnlmail/src/ main

[<fg...@us...>]

Revision: 4182
          http://openutils.svn.sourceforge.net/openutils/?rev=4182&view=rev
Author:   fgiust
Date:     2013-02-04 15:27:48 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
allow folder in the email repo + fix for uuidlink selection

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-resources/simplemail/icons/ico16-mail.png

Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java	2013-01-28 11:57:07 UTC (rev 4181)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java	2013-02-04 15:27:48 UTC (rev 4182)
@@ -19,13 +19,19 @@
 
 package net.sourceforge.openutils.mgnlmail;
 
+import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.gui.control.ContextMenuItem;
 import info.magnolia.cms.gui.control.Tree;
 import info.magnolia.module.admininterface.trees.WebsiteTreeConfiguration;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+
 /**
  * @author fgiust
  * @version $Id$
@@ -36,24 +42,68 @@
     private String urlprefix = "email";
 
     /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(SimplemailTreeConfiguration.class);
+
+    /**
      * {@inheritDoc}
      */
     @Override
+    public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request)
+    {
+        super.prepareTree(tree, browseMode, request);
+
+        tree.addIcon(ItemType.CONTENT.getSystemName(), "/.resources/simplemail/ico16-mail.png");
+        tree.addItemType(ItemType.NT_FOLDER, Tree.ICONDOCROOT + "folder.gif");
+        tree.setDrawShifter(true); // for folders
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void prepareContextMenu(Tree tree, boolean browseMode, HttpServletRequest request)
     {
         super.prepareContextMenu(tree, browseMode, request);
 
-        String action = "var w=window.open(mgnlEncodeURL(contextPath + '"
-            + (urlprefix != null ? "/" + urlprefix : "")
-            + "' + "
+        ContextMenuItem menuNewFolder = new ContextMenuItem("newFolder");
+        menuNewFolder.setLabel("New Folder"); // @todo translate
+        menuNewFolder.setIcon(request.getContextPath() + "/.resources/icons/16/folder_add.gif"); //$NON-NLS-1$
+        menuNewFolder.setOnclick(tree.getJavascriptTree() + ".createNode('" + ItemType.NT_FOLDER + "');"); //$NON-NLS-1$
+        menuNewFolder.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotItemType(" //$NON-NLS-1$
             + tree.getJavascriptTree()
-            + ".selectedNode.path + '.html'),'mgnlInline','');if (w) w.focus();";
+            + ", '" + ItemType.CONTENT + "')"); //$NON-NLS-1$
 
-        ContextMenuItem menuOpen = tree.getMenu().getMenuItemByName("open");
-        menuOpen.setOnclick(action);
+        // check needed for browse dialog in uuid links
+        if (!browseMode)
+        {
 
-        tree.setIconOndblclick(action);
+            List<ContextMenuItem> menuItems = tree.getMenu().getMenuItems();
+            menuItems.add(2, menuNewFolder); // add after "new page"
 
+            String action = "var w=window.open(mgnlEncodeURL(contextPath + '"
+                + (urlprefix != null ? "/" + urlprefix : "")
+                + "' + "
+                + tree.getJavascriptTree()
+                + ".selectedNode.path + '.html'),'mgnlInline','');if (w) w.focus();";
+
+            ContextMenuItem menuOpen = tree.getMenu().getMenuItemByName("open");
+            menuOpen.setOnclick(action);
+            menuOpen.setLabel("Open email");
+            menuOpen.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotItemType(" //$NON-NLS-1$
+                + tree.getJavascriptTree()
+                + ", '" + ItemType.FOLDER + "')"); //$NON-NLS-1$
+            tree.setIconOndblclick(action);
+
+            ContextMenuItem menuNew = tree.getMenu().getMenuItemByName("new");
+            menuNew.setLabel("New email");
+            menuNew.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotItemType(" //$NON-NLS-1$
+                + tree.getJavascriptTree()
+                + ", '" + ItemType.FOLDER + "')"); //$NON-NLS-1$
+
+        }
+
         // todo: add menu item "send test mail"?
     }
 

Added: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-resources/simplemail/icons/ico16-mail.png
===================================================================
(Binary files differ)


Property changes on: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-resources/simplemail/icons/ico16-mail.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.