implement jstree menu with ajax dynamic loading

pboard/pboard/controllers/api.py

@@ -24,59 +24,23 @@ from pboard.lib.base import BaseController
 from pboard.lib   import dbapi as pld
 from pboard.model import data as pmd
 from pboard.model import auth as pma
+from pboard.model import serializers as pms
 from pboard import model as pm
 from pboard.lib.auth import can_read, can_write
 
-__all__ = ['PODPublicApiController', 'PODApiController']
+from pboard.controllers import apimenu as pcam
 
-FIXME_ERROR_CODE=-1
-
-class PODPublicApiController(BaseController):
-
-    @expose()
-    def create_account(self, email='', password='', retyped_password='', **kw):
-      if email=='' or password=='' or retyped_password=='':
-        flash(_('Account creation error: please fill all the fields'), 'error')
-        redirect(lurl('/'))
-      elif password!=retyped_password:
-        flash(_('Account creation error: passwords do not match'), 'error')
-        redirect(lurl('/'))
-      else:
-        loExistingUser = pld.PODStaticController.getUserByEmailAddress(email)
-        if loExistingUser!=None:
-          flash(_('Account creation error: account already exist: %s') % (email), 'error')
-          redirect(lurl('/'))
-        
-        loNewAccount = pld.PODStaticController.createUser()
-        loNewAccount.email_address = email
-        loNewAccount.display_name  = email
-        loNewAccount.password      = password
-
-        loUserGroup = pld.PODStaticController.getGroup('user')
-        loUserGroup.users.append(loNewAccount)
-
-        pm.DBSession.add(loNewAccount)
-        pm.DBSession.flush()
-        pm.DBSession.refresh(loNewAccount)
-
-        loUserSpecificGroup = pld.PODStaticController.createGroup()
 
-        loUserSpecificGroup.group_id = 0-loNewAccount.user_id # group id of a given user is the opposite of the user id
-        loUserSpecificGroup.group_name = 'user_%d' % loNewAccount.user_id
-        loUserSpecificGroup.personnal_group = True
-        loUserSpecificGroup.users.append(loNewAccount)
-
-        pm.DBSession.flush()
-
-        flash(_('Account successfully created: %s') % (email), 'info')
-        redirect(lurl('/'))
+FIXME_ERROR_CODE=-1
 
 
 class PODApiController(BaseController):
     """Sample controller-wide authorization"""
     
     allow_only = tgp.in_group('user', msg=l_('You need to login in order to access this ressource'))
-    
+
+    menu = pcam.PODApiMenuController()
+
     @expose()
     def create_event(self, parent_id=None, data_label='', data_datetime=None, data_content='', data_reminder_datetime=None, add_reminder=False, **kw):
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
@@ -170,7 +134,7 @@ class PODApiController(BaseController):
         loImage     = pil.open(loJpegBytes)
         loImage.thumbnail([140,140], pil.ANTIALIAS)
         
-        loResultBuffer = StringIO()
+        loResultBuffer = csio.StringIO()
         loImage.save(loResultBuffer,"JPEG")
         tg.response.headers['Content-type'] = str(loFile.data_file_mime_type)
         return loResultBuffer.getvalue()
@@ -356,10 +320,7 @@ class PODApiController(BaseController):
       loNode = loApiController.getNode(node_id)
 
       is_shared_b = False if is_shared=='off' else True
-      print(is_shared_b)
-      print(loNode.is_shared)
-      print(loNode.owner_id)
-      print(loCurrentUser.user_id)
+
 
       # Only the node owner can modify is_shared
       if is_shared_b != loNode.is_shared and loNode.owner_id != loCurrentUser.user_id:
@@ -407,4 +368,3 @@ class PODApiController(BaseController):
             comment_right.rights = liRightLevel
 
       redirect(lurl('/document/%s#tab-accessmanagement'%(loNode.node_id)))
-

pboard/pboard/controllers/apimenu.py

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+import tg
+
+from pboard.lib import base as plb
+from pboard.lib import dbapi as pld
+from pboard.model import data as pmd
+from pboard.model import serializers as pms
+
+class PODApiMenuController(plb.BaseController):
+
+    @tg.expose('json')
+    @pms.PBNodeForMenu
+    def children(self, id='#'):
+        try:
+            real_id = int(id)
+        except Exception:
+            real_id = None
+
+        current_user = pld.PODStaticController.getCurrentUser()
+        api_controller = pld.PODUserFilteredApiController(current_user.user_id)
+
+        allowed_nodes = api_controller.getListOfAllowedNodes()
+        parent_node = api_controller.getNode(real_id)
+        child_nodes = api_controller.getChildNodesForMenu(parent_node, allowed_nodes)
+
+        return child_nodes
+
+    @tg.expose('json')
+    @pms.NodeTreeItemForMenu
+    def initialize(self, current_node_id=0, id='#'):
+        try:
+            real_id = int(id)
+        except Exception:
+            real_id = None
+
+        current_user = pld.PODStaticController.getCurrentUser()
+        api_controller = pld.PODUserFilteredApiController(current_user.user_id)
+
+        current_node = None
+        try:
+            current_node = api_controller.getNode(current_node_id)
+        except:
+            print("Node not found: {0}".format(current_node_id))
+
+        allowed_nodes = api_controller.getListOfAllowedNodes()
+        initial_menu_structure = api_controller.buildTreeListForMenu(current_node, pmd.PBNodeStatus.getVisibleIdsList(), allowed_nodes)
+
+        return initial_menu_structure
+
+
+

pboard/pboard/controllers/apipublic.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+import tg
+from tg import _compat
+from pboard.lib import base as plb
+from pboard.lib import dbapi as pld
+from pboard import model as pm
+from pboard.model import data as pmd
+from pboard.model import serializers as pms
+
+from tg.i18n import ugettext as _
+
+class PODPublicApiController(plb.BaseController):
+
+    @tg.expose()
+    def create_account(self, email='', password='', retyped_password='', **kw):
+      if email=='' or password=='' or retyped_password=='':
+        tg.flash(_('Account creation error: please fill all the fields'), 'error')
+        tg.redirect(tg.lurl('/'))
+      elif password!=retyped_password:
+        tg.flash(_('Account creation error: passwords do not match'), 'error')
+        tg.redirect(tg.lurl('/'))
+      else:
+        loExistingUser = pld.PODStaticController.getUserByEmailAddress(email)
+        if loExistingUser!=None:
+          tg.flash(_('Account creation error: account already exist: %s') % (email), 'error')
+          tg.redirect(tg.lurl('/'))
+
+        loNewAccount = pld.PODStaticController.createUser()
+        loNewAccount.email_address = email
+        loNewAccount.display_name  = email
+        loNewAccount.password      = password
+
+        loUserGroup = pld.PODStaticController.getGroup('user')
+        loUserGroup.users.append(loNewAccount)
+
+        pm.DBSession.add(loNewAccount)
+        pm.DBSession.flush()
+        pm.DBSession.refresh(loNewAccount)
+
+        loUserSpecificGroup = pld.PODStaticController.createGroup()
+
+        loUserSpecificGroup.group_id = 0-loNewAccount.user_id # group id of a given user is the opposite of the user id
+        loUserSpecificGroup.group_name = 'user_%d' % loNewAccount.user_id
+        loUserSpecificGroup.personnal_group = True
+        loUserSpecificGroup.users.append(loNewAccount)
+
+        pm.DBSession.flush()
+
+        tg.flash(_('Account successfully created: %s') % (email), 'info')
+        tg.redirect(tg.lurl('/'))

pboard/pboard/controllers/root.py

@@ -15,7 +15,8 @@ from pboard.lib.base import BaseController
 from pboard.controllers.error import ErrorController
 
 from pboard.lib import dbapi as pld
-from pboard.controllers import api as pbca
+from pboard.controllers import api as pca
+from pboard.controllers import apipublic as pcap
 from pboard.controllers import debug as pbcd
 
 from pboard import model as pm
@@ -46,11 +47,11 @@ class RootController(BaseController):
         config_type = tgat.TGAdminConfig
     )
 
-    api   = pbca.PODApiController()
+    api   = pca.PODApiController()
     debug = pbcd.DebugController()
     error = ErrorController()
 
-    public_api = pbca.PODPublicApiController()
+    public_api = pcap.PODPublicApiController()
 
     def _before(self, *args, **kw):
         tmpl_context.project_name = "pboard"
@@ -143,11 +144,9 @@ class RootController(BaseController):
         # FIXME - D.A - 2013-11-07 - Currently, the code build a new item if no item found for current user
         # the correct behavior should be to redirect to setup page
         loMenuItems = loApiController.buildTreeListForMenu(loCurrentNode, pbmd.PBNodeStatus.getVisibleIdsList(), llAccessibleNodes)
-        nodes_as_tree_for_select_field = loApiController.DIRTY_OLDbuildTreeListForMenu(pbmd.PBNodeStatus.getVisibleIdsList())
 
         return dict(
             menu_node_list=loMenuItems,
-            root_node_list_for_select_field=nodes_as_tree_for_select_field,
             current_node=loCurrentNode,
             node_status_list = loNodeStatusList,
             keywords = highlight,

pboard/pboard/lib/dbapi.py

@@ -9,6 +9,7 @@ from sqlalchemy import Table, ForeignKey, Column
 from sqlalchemy.types import Unicode, Integer, DateTime, Text
 from sqlalchemy.orm import relation, synonym
 from sqlalchemy.orm import joinedload_all
+import sqlalchemy.orm as sqlao
 import sqlalchemy as sqla
 
 from pboard.model import DeclarativeBase, metadata, DBSession
@@ -82,7 +83,7 @@ class PODUserFilteredApiController(object):
     self._iCurrentUserId       = piUserId
     self._iExtraUserIdList     = piExtraUserIdList
     self._iUserIdFilteringList = None
-  
+    self._cache_allowed_nodes = None
 
   def _getUserIdListForFiltering(self):
     if self._iUserIdFilteringList==None:
@@ -127,7 +128,7 @@ class PODUserFilteredApiController(object):
     lsNodeIdFiltering = lsSqlSelectQuery % (str(self._iCurrentUserId))
 
     if liNodeId!=None and liNodeId!=0:
-      return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren"))\
+      return DBSession.query(pbmd.PBNode).options(sqlao.joinedload_all("_oParent"), sqlao.joinedload_all("_lAllChildren"))\
         .filter(pbmd.PBNode.node_id==liNodeId)\
         .filter(
           sqla.or_(
@@ -146,28 +147,75 @@ class PODUserFilteredApiController(object):
     return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).order_by(pbmd.PBNode.updated_at.desc()).limit(piMaxNodeNb).all()
 
 
-  def getListOfAllowedNodes(self) -> pbmd.PBNode:
-    lsSqlQuery = """
-        SELECT
-            pgn.node_id
-        FROM
-            pod_group_node AS pgn
-            join pod_user_group AS pug ON pug.group_id = pgn.group_id
-        WHERE
-            pgn.rights > 0
-            AND pug.user_id = :owner_id
-        UNION
+  def getListOfAllowedNodes(self, reset_cache=False) -> pbmd.PBNode:
+      if self._cache_allowed_nodes==None or reset_cache==True:
+        lsSqlQuery = """
             SELECT
-                node_id
+                pn.node_id,
+                pn.parent_id,
+                pn.node_order,
+                pn.node_type,
+                pn.created_at,
+                pn.updated_at,
+                pn.data_label,
+                pn.data_content,
+                pn.data_datetime,
+                pn.node_status,
+                pn.data_reminder_datetime,
+                pn.parent_tree_path,
+                pn.node_depth,
+                pn.owner_id,
+                pn.is_shared,
+                pn.is_public,
+                pn.public_url_key
             FROM
-                pod_nodes
+                pod_group_node AS pgn
+                join pod_user_group AS pug ON pug.group_id = pgn.group_id
+                join pod_nodes AS pn ON pgn.node_id=pn.node_id
             WHERE
-            owner_id=:owner_id;
-    """
-
-    loNodeListResult = DBSession.query(pbmd.PBNode).from_statement(lsSqlQuery).params(owner_id=self._iCurrentUserId)
-
-    return loNodeListResult.all()
+                pn.node_type='data'
+                AND pn.node_status NOT IN ('deleted', 'closed')
+                AND pn.node_id=pgn.node_id
+                AND pgn.rights > 0
+                AND pug.user_id = 3
+
+            UNION
+                SELECT
+                    pn.node_id,
+                    pn.parent_id,
+                    pn.node_order,
+                    pn.node_type,
+                    pn.created_at,
+                    pn.updated_at,
+                    pn.data_label,
+                    pn.data_content,
+                    pn.data_datetime,
+                    pn.node_status,
+                    pn.data_reminder_datetime,
+                    pn.parent_tree_path,
+                    pn.node_depth,
+                    pn.owner_id,
+                    pn.is_shared,
+                    pn.is_public,
+                    pn.public_url_key
+                FROM
+                    pod_nodes AS pn
+                WHERE
+                    pn.node_type='data'
+                    AND pn.node_status NOT IN ('deleted', 'closed')
+                    AND pn.owner_id=:owner_id
+
+            ORDER BY node_id ASC
+        """
+
+        loNodeListResult = DBSession.query(pbmd.PBNode).\
+            from_statement(lsSqlQuery).\
+            params(owner_id=self._iCurrentUserId)
+        allowed_nodes = loNodeListResult.all()
+
+        self._cache_allowed_nodes = allowed_nodes
+
+      return self._cache_allowed_nodes
 
 
   def searchNodesByText(self, plKeywordList: [str], piMaxNodeNb=100):
@@ -197,6 +245,47 @@ class PODUserFilteredApiController(object):
     return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).filter(pbmd.PBNode.node_status==psNodeStatus).order_by(pbmd.PBNode.updated_at).limit(piMaxNodeNb).all()
 
 
+  def getChildNodesForMenu(self, poParentNode: pbmd.PBNode, allowed_nodes: [pbmd.PBNode]) -> [pbmd.PBNode]:
+    visible_child_nodes = []
+
+    if poParentNode!=None:
+        # standard case
+        print(" -------------- BEFORE @@@@@@@@@@@@@@@@ ")
+        all_child_nodes = poParentNode.getChildren()
+        print("@@@@@@@@@@@@@@@@ AFTER @@@@@@@@@@@@@@@@ ")
+        for child_node in all_child_nodes:
+          if child_node in allowed_nodes:
+            visible_child_nodes.append(child_node)
+    else:
+        # Root case
+        parent_nodes = DBSession
+        for allowed_node in allowed_nodes:
+            print("     @@@@@@@@@@@@@@@@ BEFORE @@@@@@@@@@@@@@@@ ")
+            # loParent = allowed_node._oParent
+            # print("@@@@@@@@@@@@@@@@ AFTER @@@@@@@@@@@@@@@@ {0}".format(allowed_node._oParent.node_id if allowed_node._oParent!=None else '0'))
+            # print("==== EXTRA {0}".format(allowed_node._oParent.node_id if allowed_node._oParent!=None else '0'))
+            print("====> ")
+
+            if allowed_node._oParent is None or allowed_node._oParent==allowed_node:
+                # D.A. - HACK - 2014-05-27
+                # I don't know why, but as from now (with use of sqlao.contains_eager in getListOfAllowedNodes()
+                # the root items have at first iteration itself as parent
+                print("==== EXTRA END")
+                # this is a root item => add it
+                visible_child_nodes.append(allowed_node)
+            else:
+                if allowed_node._oParent not in allowed_nodes:
+                    # the node is visible but not the parent => put it at the root
+                    visible_child_nodes.append(allowed_node)
+                else:
+                    print("==== EXTRA END 2 {0}".format(allowed_node._oParent.node_id))
+
+    print(" @@@@@@@@@@@@@@@@ PRE FAILURE @@@@@@@@@@@@@@@@ ")
+    return visible_child_nodes
+
+
+
+
   def buildTreeListForMenu(self, poCurrentNode: pbmd.PBNode, plViewableStatusId: [], plAllowedNodes: [pbmd.PBNode]) -> [pbmd.NodeTreeItem]:
     # The algorithm is:
     # 1. build an intermediate tree containing only current node and parent path
@@ -209,8 +298,10 @@ class PODUserFilteredApiController(object):
     previous_tree_item = None
     tmp_children_nodes = []
 
+    print("============================> ",poCurrentNode)
     if poCurrentNode is not None:
         breadcrumb_nodes = poCurrentNode.getBreadCrumbNodes()
+        print("====================> NODES", breadcrumb_nodes)
         breadcrumb_nodes.append(poCurrentNode) # by default the current node is not included
 
         for breadcrumb_node in reversed(breadcrumb_nodes):
@@ -218,25 +309,38 @@ class PODUserFilteredApiController(object):
                 # First iteration. We add all current_node children
                 for child_node in breadcrumb_node.getChildren():
                     child_item = pbmd.NodeTreeItem(child_node, [])
+                    assert(isinstance(child_item, pbmd.NodeTreeItem))
                     tmp_children_nodes.append(child_item)
                 previous_tree_item = pbmd.NodeTreeItem(breadcrumb_node, tmp_children_nodes)
             else:
                 tmp_children_nodes = []
                 for child_node in breadcrumb_node.getChildren():
                     if child_node == previous_tree_item.node:
+                        assert(isinstance(previous_tree_item, pbmd.NodeTreeItem))
                         tmp_children_nodes.append(previous_tree_item)
                     else:
                         sibling_node = pbmd.NodeTreeItem(child_node, [])
+                        assert(isinstance(sibling_node, pbmd.NodeTreeItem))
                         tmp_children_nodes.append(sibling_node)
 
                 previous_tree_item = pbmd.NodeTreeItem(breadcrumb_node, tmp_children_nodes)
 
     for node in plAllowedNodes:
+        # This part of the algorithm insert root items
         if node.parent_id==0 or node.parent_id is None:
             if previous_tree_item is not None and node == previous_tree_item.node:
+                assert(isinstance(previous_tree_item, pbmd.NodeTreeItem))
                 node_tree.append(previous_tree_item)
             else:
                 node_tree.append(pbmd.NodeTreeItem(node, []))
+        else:
+            # Try to add nodes shared with me but with a parent which is not shared
+            if node.owner_id!=self._iCurrentUserId:
+                # this is a node shared with me
+                if node._oParent!=None and node._oParent not in plAllowedNodes:
+                    # the node is shared but not the parent => put it in the root
+                    node_tree.append(pbmd.NodeTreeItem(node))
+
 
     return node_tree
 

pboard/pboard/lib/helpers.py

@@ -65,6 +65,10 @@ class ID(object):
       return 'add-file-modal-form'
 
   @classmethod
+  def MoveDocumentModalForm(cls, poNode):
+      return 'move-document-modal-form-{0}'.format(poNode.node_id)
+
+  @classmethod
   def AddEventModalForm(cls, poNode=None):
     if poNode:
       return 'add-event-modal-form-%d'%poNode.node_id

pboard/pboard/model/serializers.py

@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+import tg
+from pboard.model import data as pmd
+
+def PBNodeForMenu(func):
+
+    def process_item(item: pmd.PBNode):
+        """ convert given item into a dictionnary """
+        url = tg.url('/document/', dict(node_id=item.node_id)) ## FIXME - 2014-05-27 - Make this more flexible
+        print("########## BEFORE ##########")
+        new_item = dict(
+            id = item.node_id,
+            children = item.getChildNb()>0,
+            text = item.data_label,
+            # parent = item._oParent.node_id if (item._oParent!=None) else '#',
+            a_attr = { "href" : url },
+            li_attr = { "title": item.data_label }
+        )
+        print("########## AFTER ##########")
+        return new_item
+
+    def pre_serialize(*args, **kws):
+        initial_result = func(*args, **kws)
+        real_result = None
+
+        print("DEBUG ===================>", initial_result)
+        if isinstance(initial_result, list):
+            real_result = list()
+            for value_item in initial_result:
+                real_result.append(process_item(value_item))
+        else:
+            # We suppose here that we have an object only
+            real_result = process_item(initial_result)
+
+        return dict(d = real_result)
+
+    return pre_serialize
+
+
+def NodeTreeItemForMenu(func):
+    """ works with structure NodeTreeItem """
+    def process_item(structure_item: pmd.NodeTreeItem, current_node_id=None):
+        """ convert given item into a dictionnary """
+
+        item = structure_item.node
+        url = tg.url('/document/', dict(node_id=item.node_id)) ## FIXME - 2014-05-27 - Make this more flexible
+        children = []
+        for child_item in structure_item.children:
+            children.append(process_item(child_item, current_node_id))
+        # print("########## BEFORE ##########")
+
+        children_field_value = None
+        if len(children)>0:
+            children_field_value = children
+        elif item.getChildNb()>0:
+            children_field_value = True
+        else:
+            children_field_value = False
+
+        new_item_state = dict(
+            opened = len(children)>0,
+            selected = current_node_id!=None and item.node_id==current_node_id,
+        )
+
+        new_item = dict(
+            id = item.node_id,
+            children = children_field_value,
+            text = item.data_label,
+            # parent = item._oParent.node_id if (item._oParent!=None) else '#',
+            state = new_item_state,
+            a_attr = { "href" : url },
+            li_attr = { "title": item.data_label }
+        )
+        # print("########## AFTER ##########")
+        return new_item
+
+    def pre_serialize(*args, **kws):
+        initial_result = func(*args, **kws)
+        real_result = None
+
+        current_node_id = None
+        if "current_node_id" in kws:
+            current_node_id = int(kws['current_node_id'])
+
+        if isinstance(initial_result, list):
+            real_result = list()
+            for value_item in initial_result:
+                real_result.append(process_item(value_item, current_node_id))
+        else:
+            # We suppose here that we have an object only
+            real_result = process_item(initial_result, current_node_id)
+
+        return dict(d = real_result)
+
+    return pre_serialize

pboard/pboard/templates/document-widgets.mak

@@ -24,18 +24,18 @@
   % endif
 </%def>
 
-<%def name="ToolbarMenuItemModal(psTargetModalId, psIconClasses, psMenuLabel)">
-  <li><a href="#${psTargetModalId}" role="button" data-toggle="modal"><i class="${psIconClasses}"></i> ${psMenuLabel}</a></li>
+<%def name="ToolbarMenuItemModal(psTargetModalId, psIconClasses, psMenuLabel, psItemClasses='')">
+  <li class="${psItemClasses}"><a href="#${psTargetModalId}" role="button" data-toggle="modal"><i class="${psIconClasses}"></i> ${psMenuLabel}</a></li>
 </%def>
 
 <%def name="ToolbarMenuItemInline(psTargetId, psIconClasses, psMenuLabel)">
   <li><a href="#${psTargetId}"><i class="${psIconClasses}"></i> ${psMenuLabel}</a></li>
 </%def>
-<%def name="ToolbarMenuItemLink(psTargetUrl, psIconClasses, psMenuLabel, psLinkCss='', psLinkTitle='')">
+<%def name="ToolbarMenuItemLink(psTargetUrl, psIconClasses, psMenuLabel, psLinkCss='', psLinkTitle='', psOnClick='')">
   % if psTargetUrl=='#':
-    <li class="disabled"><a href="${psTargetUrl}" class="${psLinkCss}" title="${psLinkTitle}"><i class="${psIconClasses}"></i> ${psMenuLabel}</a></li>
+    <li class="disabled"><a href="${psTargetUrl}" class="${psLinkCss}" title="${psLinkTitle}" onclick="${psOnClick}"><i class="${psIconClasses}"></i> ${psMenuLabel}</a></li>
   % else:
-    <li><a href="${psTargetUrl}" class="${psLinkCss}" title="${psLinkTitle}"><i class="${psIconClasses}"></i> ${psMenuLabel}</a></li>
+    <li><a href="${psTargetUrl}" class="${psLinkCss}" title="${psLinkTitle}" onclick="${psOnClick}"><i class="${psIconClasses}"></i> ${psMenuLabel}</a></li>
   % endif
 </%def>
 
@@ -44,6 +44,7 @@
   <div id="${psDivId}">
     <div class="btn-group">
       ${POD.EditButton('current-document-content-edit-button', True)}
+
       <button class="btn btn-small"  data-toggle="dropdown" href="#"> 
         <i class="fa  fa-signal"></i>
         ${_("Change status")}
@@ -72,6 +73,7 @@
       % endfor
       </ul>
     </div>
+    
     <div class="btn-group">
       <button class="btn btn-small btn-success"  data-toggle="dropdown" href="#">
         <i class="fa fa-plus"></i> ${_('Add')}
@@ -102,26 +104,23 @@
         <li><p class="pod-grey"><i class="fa fa-danger"></i> coming soon!</p></li>
       </ul>
     </div>
-    <div class="btn-group ">
-      <a
-        class="btn btn-small btn-warning"
-        href="#"
-        data-toggle="dropdown"
-        title="${_('Move to')}"
-        ><i class="fa fa-arrows"></i></a>
+
+    <div class="btn-group pull-right">
+      <button class="btn btn-small btn-link"  data-toggle="dropdown" href="#">
+        ${_('more ...')}
+      </button>
       <ul class="dropdown-menu">
-        <li >
-          <div class="btn-warning strong" ><strong><i class="fa fa-magic"></i> ${_("Move the document...")}</strong><br/></div>
-          <div class="pod-grey"><i>move the document to...</i></div>
+        <li>
+          <div class="strong" ><strong><i class="fa fa-magic"></i> ${_('Advanced actions...')}</strong><br/></div>
+          <div class="pod-grey"><i>${_('power user actions...')}</i></div>
         </li>
-        ${node_treeview_for_set_parent_menu(poNode.node_id, plRootNodes)}
+##
+## Here are MOVE and DELETE buttons
+##
+        ${ToolbarMenuItemModal(h.ID.MoveDocumentModalForm(current_node), 'fa fa-arrows', _('Move'), 'btn-warning')}
+        ${ToolbarMenuItemLink(tg.url('/api/edit_status', dict(node_id=poNode.node_id, node_status='deleted')), 'fa fa-trash-o', _('Delete'), 'btn-danger', _('Delete the current document'), 'return confirm(\'{0}\');'.format('Delete current document?'))}
+
       </ul>
-      <a
-        class="btn btn-small btn-danger"
-        href='${tg.url('/api/edit_status', dict(node_id=poNode.node_id, node_status='deleted'))}'
-        id='current-document-force-delete-button' onclick="return confirm('${_('Delete current document?')}');"
-        title="${_('Delete')}"
-        ><i class="fa fa-trash-o"></i></a>
     </div>
   </div>
 </%def>
@@ -537,3 +536,86 @@
     </div>
   </div>
 </%def>
+
+<%def name="MoveDocumentModalDialog(poNode, psPostUrl, psModalId, psTitle)">
+  <div
+    id="${psModalId}"
+    class="modal hide"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="myModalLabel"
+    aria-hidden="true">
+    
+    <div class="modal-header">
+    ## MODAL HEADER
+      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      <h3 id="myModalLabel">${psTitle}</h3>
+    ## MODAL HEADER [END]
+    </div>
+
+    <div class="modal-body">
+    ## MODAL BODY
+          <p>${_('Select the destination:')}</p>
+          <div id="${psModalId}-new-parent-selector-tree"></div>
+          <script>
+            $(function () {
+              $('#${psModalId}-new-parent-selector-tree').jstree({
+                "plugins" : [ "wholerow"],
+                'core' : {
+
+                  'error': function (error) {
+                    console.log('Error ' + error.toString())
+                  },
+                  'data' : {
+                    'dataType': 'json',
+                    'contentType': 'application/json; charset=utf-8',
+                    'url' : function (node) {
+                         return '${tg.url("/api/menu/children")}';
+                    },
+                    'data' : function(node) {
+                      console.log("NODE => "+JSON.stringify(node))
+                      return {
+                        'id' : node.id
+                      };
+                    },
+                    'success': function (new_data) {
+                      console.log('loaded new menu data' + new_data)
+                      return new_data;
+                    },
+                  },
+                }
+              });
+              
+              $('#${psModalId}-new-parent-selector-tree').on("select_node.jstree", function (e, data) {
+                new_parent_id_selected = data.selected[0];
+                $("#${psModalId}-form-new-parent-field").attr("value", new_parent_id_selected)
+                console.log("About to move document "+${poNode.node_id}+" as child of "+new_parent_id_selected);
+              });
+            });
+          </script>
+          <form id='${psModalId}-form' method="POST" action="${psPostUrl}" enctype="multipart/form-data">
+            <input type="hidden" name="node_id" value="${poNode.node_id}"/>
+            <input type="hidden" name="new_parent_id" value="-1" id="${psModalId}-form-new-parent-field" />
+          </form>
+    ## MODAL BODY [END]
+    </div>
+    
+    <div class="modal-footer">
+    ## MODAL FOOTER
+      <button class="btn" data-dismiss="modal" aria-hidden="true">
+        <i class="fa fa-ban"></i> ${_('Cancel')}
+      </button>
+      <button class="btn btn-success" id="${psModalId}-form-submit-button">
+        <i class="fa fa-check"></i> ${_('Save changes')}
+      </button>
+      <script>
+        $('#${psModalId}-form-submit-button').click(function(){
+          $('#${psModalId}-textarea-wysiwyg').cleanHtml();
+          $('#${psModalId}-textarea').val($('#${psModalId}-textarea-wysiwyg').html());
+          $('#${psModalId}-form')[0].submit();
+        });
+      </script>
+    ## MODAL FOOTER [END]
+    </div>
+  </div>
+</%def>

pboard/pboard/templates/document.mak

@@ -69,10 +69,58 @@
   </div>
 
   <div class="row">
-    <div id='application-left-panel' class="span3">
-      <div>
-        ${node_treeview(menu_node_list)}
-      </div>
+    <div id='application-left-panel' class="span3" >
+      <link rel="stylesheet" href="${tg.url('/jstree/dist/themes/default/style.min.css')}" />
+      <script src="${tg.url('/jstree/dist/jstree.js')}"></script>
+      <style>
+        #mypodtree {overflow:hidden;}
+        #mypodtree:hover {overflow:visible; }
+      </style>
+      <div id="mypodtree"></div>
+      <script>
+        $(function () {
+          $('#mypodtree').jstree({
+            "plugins" : [ "wholerow"],
+            'core' : {
+
+              'error': function (error) {
+                console.log('Error ' + error.toString())
+              },
+              'data' : {
+                'dataType': 'json',
+                'contentType': 'application/json; charset=utf-8',
+                'url' : function (node) {
+                  if (node.id==='#') {
+                    return '${tg.url("/api/menu/initialize", dict(current_node_id=current_node.node_id if current_node else 0))}';
+                  } else {
+                    return '${tg.url("/api/menu/children")}';
+                  }
+                },
+                'data' : function(node) {
+                  console.log("NODE => "+JSON.stringify(node))
+                  return {
+                    'id' : node.id
+                  };
+                },
+                'success': function (new_data) {
+                  console.log('loaded new menu data' + new_data)
+                  return new_data;
+                },
+              },
+            }
+          });
+          
+          $('#mypodtree').on("select_node.jstree", function (e, data) {
+            url = "${tg.url('/document/')}"+data.selected[0];
+            console.log("Opening document: "+url);
+            location.href = url;
+          });
+        });
+      </script>
+## INFO - D.A. - 2014-05-28 - Hide old school menu
+##      <div>
+##        ${node_treeview(menu_node_list)}
+##      </div>
     </div>
     <div id='application-main-panel' class="span9">
 
@@ -106,7 +154,8 @@
           ${DOC.EventEditModalDialog(current_node.node_id, None, tg.url('/api/create_event'), h.ID.AddEventModalForm(current_node), _('Add an event'))}
           ${DOC.ContactEditModalDialog(current_node.node_id, None, tg.url('/api/create_contact'), h.ID.AddContactModalForm(current_node), _('Add a new contact'))}
           ${DOC.FileEditModalDialog(current_node.node_id, None, tg.url('/api/create_file'), h.ID.AddFileModalForm(current_node), _('Add a new file'))}
-          
+          ${DOC.MoveDocumentModalDialog(current_node, tg.url('/api/set_parent_node'), h.ID.MoveDocumentModalForm(current_node), _('Move the document'))}
+
           <div class="tabbable">
             <ul class="nav nav-tabs" style="margin-bottom: 0em;">
                 <li>${DOC.MetadataTab('#subdocuments', 'tab', _('Subdocuments'), 'fa-file-text-o', current_node.getChildren())}</li>