@@ -36,7 +36,7 @@
Navigation
-
diff --git a/browser/node.py b/browser/node.py
index d98e3a4..a7c39d4 100644
--- a/browser/node.py
+++ b/browser/node.py
@@ -24,6 +24,7 @@ $Id$
from zope.cachedescriptors.property import Lazy
from zope.app import zapi
+from zope.app.container.browser.contents import JustContents
from zope.app.dublincore.interfaces import ICMFDublinCore
from zope.proxy import removeAllProxies
from zope.security.proxy import removeSecurityProxy
@@ -32,6 +33,10 @@ from loops.interfaces import IConcept
class NodeView(object):
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def render(self, text):
if not text:
return u''
@@ -49,7 +54,7 @@ class NodeView(object):
d = dc.modified or dc.created
return d and d.strftime('%Y-%m-%d %H:%M') or ''
- def getContent(self, item=None):
+ def content(self, item=None):
if item is None:
item = self.context.getPage()
if item is None:
@@ -57,11 +62,11 @@ class NodeView(object):
result = {'title': item.title,
'url': zapi.absoluteURL(item, self.request),
'body': self.render(item.body),
- 'items': [self.getContent(child)
+ 'items': [self.content(child)
for child in item.getTextItems()]}
return result
- def getMenu(self, item=None):
+ def menu(self, item=None):
if item is None:
item = self.context.getMenu()
if item is None:
@@ -69,7 +74,53 @@ class NodeView(object):
result = {'title': item.title,
'url': zapi.absoluteURL(item, self.request),
'selected': item == self.context,
- 'items': [self.getMenu(child)
+ 'items': [self.menu(child)
for child in item.getMenuItems()]}
return result
+
+class OrderedContainerView(JustContents):
+ """ A view providing the necessary methods for moving sub-objects
+ within an ordered container.
+ """
+
+ @Lazy
+ def url(self):
+ return zapi.absoluteURL(self.context, self.request)
+
+ @Lazy
+ def orderable(self):
+ return len(self.context) > 1
+
+ def checkMoveAction(self):
+ request = self.request
+ for var in request:
+ if var.startswith('move_'):
+ params = []
+ if 'delta' in request:
+ params.append('delta=' + request['delta'])
+ if 'ids' in request:
+ for id in request['ids']:
+ params.append('ids:list=' + id)
+ request.response.redirect('%s/%s?%s'
+ % (self.url, var, '&'.join(params)))
+ return True
+ return False
+
+ def moveDown(self, ids, delta=1):
+ self.context.moveSubNodesByDelta(ids, int(delta))
+ self.request.response.redirect(self.url + '/contents.html')
+
+ def moveUp(self, ids, delta=1):
+ self.context.moveSubNodesByDelta(ids, -int(delta))
+ self.request.response.redirect(self.url + '/contents.html')
+
+ def moveToBottom(self, ids):
+ self.context.moveSubNodesByDelta(ids, len(self.context))
+ self.request.response.redirect(self.url + '/contents.html')
+
+ def moveToTop(self, ids):
+ self.context.moveSubNodesByDelta(ids, -len(self.context))
+ self.request.response.redirect(self.url + '/contents.html')
+
+
diff --git a/interfaces.py b/interfaces.py
index a2dfaea..c376ad9 100644
--- a/interfaces.py
+++ b/interfaces.py
@@ -169,9 +169,13 @@ class IView(Interface):
required=False)
target = Attribute('Target object that is referenced by this view')
+
+class IBaseNode(IOrderedContainer):
+ """ Common abstract base class for different types of nodes
+ """
-class INode(IView, IOrderedContainer):
+class INode(IView, IBaseNode):
""" A node is a view that may contain other views, thus building a
menu or folder hierarchy.
@@ -227,8 +231,14 @@ class INode(IView, IOrderedContainer):
a menu).
"""
+ def moveSubNodesByDelta(names, delta):
+ """ Move the sub-nodes specified by the list of names up
+ (negative delta) or down (positive delta) by the number of places
+ specified by delta.
+ """
-class IViewManager(IContainer):
+
+class IViewManager(IBaseNode):
""" A manager/container for views.
"""
contains(IView)
diff --git a/util.py b/util.py
new file mode 100644
index 0000000..2421daa
--- /dev/null
+++ b/util.py
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2006 Helmut Merz helmutm@cy55.de
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+"""
+Utility functions.
+
+$Id$
+"""
+
+def moveByDelta(objs, toMove, delta):
+ """ Return the list given by objs resorted in a way that the elements
+ of toMove (which must be in the objs list) have been moved by delta.
+ """
+ result = [obj for obj in objs if obj not in toMove]
+ if delta < 0:
+ objs = list(reversed(objs))
+ result.reverse()
+ toMove = sorted(toMove, lambda x,y: cmp(objs.index(x), objs.index(y)))
+ for element in toMove:
+ newPos = min(len(result), objs.index(element) + abs(delta))
+ result.insert(newPos, element)
+ if delta < 0:
+ result.reverse()
+ return result
+
+def nl2br(text):
+ if not text: return text
+ if '\n' in text: # Unix or DOS line endings
+ return '
\n'.join(x.replace('\r', '') for x in text.split('\n'))
+ else: # gracefully handle Mac line endigns
+ return '
\n'.join(text.split('\r'))
diff --git a/view.py b/view.py
index 2beb1bc..11c5b9f 100644
--- a/view.py
+++ b/view.py
@@ -34,6 +34,7 @@ from cybertools.relation.registry import IRelationsRegistry, getRelations
from interfaces import IView, INode
from interfaces import IViewManager, INodeContained
from interfaces import ILoopsContained
+from util import moveByDelta
class View(object):
@@ -122,8 +123,10 @@ class Node(View, OrderedContainer):
def getTextItems(self):
return self.getChildNodes(['text'])
+ def moveSubNodesByDelta(self, names, delta):
+ self.updateOrder(moveByDelta(self.keys(), names, delta))
-class ViewManager(BTreeContainer):
+class ViewManager(OrderedContainer):
implements(IViewManager, ILoopsContained)