--- a/i18n/es.po Tue Mar 03 09:59:58 2009 +0100
+++ b/i18n/es.po Wed Mar 04 13:25:51 2009 +0100
@@ -104,10 +104,6 @@
msgstr "%d semanas"
#, python-format
-msgid "%d years"
-msgstr "%d años"
-
-#, python-format
msgid "%s error report"
msgstr "%s reporte de errores"
--- a/web/views/tabs.py Tue Mar 03 09:59:58 2009 +0100
+++ b/web/views/tabs.py Wed Mar 04 13:25:51 2009 +0100
@@ -1,7 +1,7 @@
"""base classes to handle tabbed views
:organization: Logilab
-:copyright: 2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
"""
@@ -11,7 +11,7 @@
from logilab.mtconverter import html_escape
from cubicweb import NoSelectableObject, role
-from cubicweb.common.view import EntityView
+from cubicweb.common.view import EntityView
from cubicweb.common.selectors import has_related_entities
from cubicweb.common.utils import HTMLHead
from cubicweb.common.uilib import rql_for_eid
@@ -33,15 +33,22 @@
});""" % {'event': 'load_%s' % vid, 'vid': vid,
'reloadable' : str(reloadable).lower()})
- def lazyview(self, vid, eid=None, reloadable=False, show_spinbox=True, w=None):
+ def lazyview(self, vid, rql=None, eid=None, rset=None, static=False,
+ reloadable=False, show_spinbox=True, w=None):
"""a lazy version of wview
first version only support lazy viewing for an entity at a time
"""
+ assert rql or eid or rset or static, \
+ 'lazyview wants at least : rql, or an eid, or an rset -- or call it with static=True'
w = w or self.w
self.req.add_js('cubicweb.lazy.js')
urlparams = {'vid' : vid, 'mode' : 'html'}
- if eid:
+ if rql:
+ urlparams['rql'] = rql
+ elif eid:
urlparams['rql'] = rql_for_eid(eid)
+ elif rset:
+ urlparams['rql'] = rset.printable_rql()
w(u'<div id="lazy-%s" cubicweb:loadurl="%s">' % (
vid, html_escape(self.build_url('json', **urlparams))))
if show_spinbox:
@@ -65,12 +72,12 @@
return str('%s_active_tab' % self.config.appid)
def active_tab(self, tabs, default):
- cookie = self.req.get_cookie()
+ cookies = self.req.get_cookie()
cookiename = self.cookie_name
- activetab = cookie.get(cookiename)
+ activetab = cookies.get(cookiename)
if activetab is None:
- cookie[cookiename] = default
- self.req.set_cookie(cookie, cookiename)
+ cookies[cookiename] = default
+ self.req.set_cookie(cookies, cookiename)
tab = default
else:
tab = activetab.value
@@ -90,13 +97,18 @@
self.req.add_css('ui.tabs.css')
self.req.add_js(('ui.core.js', 'ui.tabs.js',
'cubicweb.ajax.js', 'cubicweb.tabs.js', 'cubicweb.lazy.js'))
+ # tabbed views do no support concatenation
+ # hence we delegate to the default tab
+ if self.req.form.get('vid') == 'primary':
+ entity.view(default)
+ return
# prune tabs : not all are to be shown
tabs = self.prune_tabs(tabs)
# select a tab
active_tab = self.active_tab(tabs, default)
# build the html structure
w = self.w
- w(u'<div id="entity-tabs">')
+ w(u'<div id="entity-tabs-%s">' % entity.eid)
w(u'<ul>')
for tab in tabs:
w(u'<li>')
@@ -110,15 +122,16 @@
w(u'</div>')
for tab in tabs:
w(u'<div id="as-%s">' % tab)
- self.lazyview(tab, entity.eid)
+ self.lazyview(tab, eid=entity.eid)
w(u'</div>')
# call the set_tab() JS function *after* each tab is generated
# because the callback binding needs to be done before
self.req.html_headers.add_onload(u"""
- jQuery('#entity-tabs > ul').tabs( { selected: %(tabindex)s });
+ jQuery('#entity-tabs-%(eeid)s > ul').tabs( { selected: %(tabindex)s });
set_tab('%(vid)s', '%(cookiename)s');
""" % {'tabindex' : tabs.index(active_tab),
'vid' : active_tab,
+ 'eeid' : entity.eid,
'cookiename' : self.cookie_name})
@@ -138,11 +151,10 @@
vid = 'gallery'
__selectors__ = EntityRelationView.__selectors__ + (one_line_rset,)
-
This is the view we want to have in a tab, only if there is something to show.
Then, just define as below, and declare this being the tab content :
- class ProjectScreenshotTab(DataDependantTab, ProjectScreenshotsView):
+ class ProjectScreenshotTab(EntityRelatedTab, ProjectScreenshotsView):
id = 'screenshots_tab'
"""
__selectors__ = EntityView.__selectors__ + (has_related_entities,)
--- a/web/views/treeview.py Tue Mar 03 09:59:58 2009 +0100
+++ b/web/views/treeview.py Wed Mar 04 13:25:51 2009 +0100
@@ -1,10 +1,18 @@
+"""Set of tree-building widgets, based on jQuery treeview plugin
+
+:organization: Logilab
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
+"""
+__docformat__ = "restructuredtext en"
from logilab.mtconverter import html_escape
-
from cubicweb.interfaces import ITree
from cubicweb.common.selectors import implement_interface, yes
+from cubicweb.common.utils import make_uid
from cubicweb.common.view import EntityView
-from cubicweb.web.views.baseviews import OneLineView
+def treecookiename(treeid):
+ return str('treestate-%s' % treeid)
class TreeView(EntityView):
id = 'treeview'
@@ -12,27 +20,30 @@
itemvid = 'treeitemview'
css_classes = 'treeview widget'
title = _('tree view')
-
- def call(self, subvid=None):
- if subvid is None and 'subvid' in self.req.form:
- subvid = self.req.form.pop('subvid') # consume it
+
+ def call(self, subvid=None, treeid=None, initial_load=True):
if subvid is None:
- subvid = 'oneline'
- self.req.add_css('jquery.treeview.css')
- self.req.add_js(('cubicweb.ajax.js', 'jquery.treeview.js', 'cubicweb.widgets.js'))
- # XXX noautoload is a quick hack to avoid treeview to be rebuilt
- # after a json query and avoid double toggling bugs.
- # Need to find a way to do that cleanly.
- if 'noautoload' in self.req.form:
- self.w(u'<ul class="%s" cubicweb:wdgtype="TreeView">' % self.css_classes)
- else:
- self.w(u'<ul class="%s" cubicweb:loadtype="auto" cubicweb:wdgtype="TreeView">'
- % self.css_classes)
+ if 'subvid' in self.req.form:
+ subvid = self.req.form.pop('subvid') # consume it
+ else:
+ subvid = 'oneline'
+ if treeid is None:
+ if 'treeid' in self.req.form:
+ treeid = self.req.form.pop('treeid')
+ else:
+ treeid = make_uid('throw away uid')
+ self.warning('Tree state won\'t be properly restored after next reload')
+ if initial_load:
+ self.req.add_css('jquery.treeview.css')
+ self.req.add_js(('cubicweb.ajax.js', 'jquery.treeview.js'))
+ self.req.html_headers.add_onload(u"""
+ jQuery("#tree-%s").treeview({toggle: toggleTree,
+ prerendered: true});""" % treeid)
+ self.w(u'<ul id="tree-%s" class="%s">' % (treeid, self.css_classes))
for rowidx in xrange(len(self.rset)):
self.wview(self.itemvid, self.rset, row=rowidx, col=0,
- vid=subvid, parentvid=self.id)
+ vid=subvid, parentvid=self.id, treeid=treeid)
self.w(u'</ul>')
-
class FileTreeView(TreeView):
"""specific version of the treeview to display file trees
@@ -41,10 +52,8 @@
css_classes = 'treeview widget filetree'
title = _('file tree view')
- def call(self, subvid=None):
- super(FileTreeView, self).call(subvid='filetree-oneline')
-
-
+ def call(self, subvid=None, treeid=None, initial_load=True):
+ super(FileTreeView, self).call(treeid=treeid, subvid='filetree-oneline', initial_load=initial_load)
class FileItemInnerView(EntityView):
"""inner view used by the TreeItemView instead of oneline view
@@ -57,10 +66,10 @@
def cell_call(self, row, col):
entity = self.entity(row, col)
if ITree.is_implemented_by(entity.__class__) and not entity.is_leaf():
- self.w(u'<div class="folder">%s</div>' % entity.view('oneline'))
+ self.w(u'<div class="folder">%s</div>\n' % entity.view('oneline'))
else:
# XXX define specific CSS classes according to mime types
- self.w(u'<div class="file">%s</div>' % entity.view('oneline'))
+ self.w(u'<div class="file">%s</div>\n' % entity.view('oneline'))
class DefaultTreeViewItemView(EntityView):
@@ -68,8 +77,9 @@
"""
id = 'treeitemview'
accepts = ('Any',)
-
- def cell_call(self, row, col, vid='oneline', parentvid='treeview'):
+
+ def cell_call(self, row, col, vid='oneline', parentvid='treeview', treeid=None):
+ assert treeid is not None
entity = self.entity(row, col)
itemview = self.view(vid, self.rset, row=row, col=col)
if row == len(self.rset) - 1:
@@ -80,7 +90,7 @@
class TreeViewItemView(EntityView):
"""specific treeitem view for entities which implement ITree
-
+
(each item should be exandable if it's not a tree leaf)
"""
id = 'treeitemview'
@@ -88,33 +98,83 @@
# the default treeitem view
__selectors__ = (implement_interface, yes)
accepts_interfaces = (ITree,)
-
- def cell_call(self, row, col, vid='oneline', parentvid='treeview'):
+
+ def open_state(self, eeid, treeid):
+ cookies = self.req.get_cookie()
+ treestate = cookies.get(treecookiename(treeid))
+ if treestate:
+ return str(eeid) in treestate.value.split(';')
+ return False
+
+ def cell_call(self, row, col, treeid, vid='oneline', parentvid='treeview'):
+ w = self.w
entity = self.entity(row, col)
- cssclasses = []
+ liclasses = []
is_leaf = False
- if row == len(self.rset) - 1:
- is_leaf = True
+ is_last = row == len(self.rset) - 1
+ is_open = self.open_state(entity.eid, treeid)
if not hasattr(entity, 'is_leaf') or entity.is_leaf():
- if is_leaf : cssclasses.append('last')
- self.w(u'<li class="%s">' % u' '.join(cssclasses))
+ if is_last:
+ liclasses.append('last')
+ w(u'<li class="%s">' % u' '.join(liclasses))
else:
rql = entity.children_rql() % {'x': entity.eid}
url = html_escape(self.build_url('json', rql=rql, vid=parentvid,
pageid=self.req.pageid,
- subvid=vid,
- noautoload=True))
- cssclasses.append('expandable')
- divclasses = ['hitarea expandable-hitarea']
- if is_leaf :
- cssclasses.append('lastExpandable')
- divclasses.append('lastExpandable-hitarea')
- self.w(u'<li cubicweb:loadurl="%s" class="%s">' % (url, u' '.join(cssclasses)))
- self.w(u'<div class="%s"> </div>' % u' '.join(divclasses))
-
+ treeid=treeid,
+ subvid=vid))
+ divclasses = ['hitarea']
+ if is_open:
+ liclasses.append('collapsable')
+ divclasses.append('collapsable-hitarea')
+ else:
+ liclasses.append('expandable')
+ divclasses.append('closed-hitarea expandable-hitarea')
+ if is_last:
+ if is_open:
+ liclasses.append('lastCollapsable')
+ divclasses.append('lastCollapsable-hitarea')
+ else:
+ liclasses.append('lastExpandable')
+ divclasses.append('lastExpandable-hitarea')
+ if is_open:
+ w(u'<li class="%s">' % u' '.join(liclasses))
+ else:
+ w(u'<li cubicweb:loadurl="%s" class="%s">' % (url, u' '.join(liclasses)))
+ if is_leaf:
+ divtail = ''
+ else:
+ divtail = ''' onclick="async_remote_exec('node_clicked', '%s', '%s')"''' % \
+ (treeid, entity.eid)
+ w(u'<div class="%s"%s></div>' % (u' '.join(divclasses), divtail))
+
# add empty <ul> because jquery's treeview plugin checks for
# sublists presence
- self.w(u'<ul class="placeholder"><li>place holder</li></ul>')
+ if not is_open:
+ w(u'<ul class="placeholder"><li>place holder</li></ul>')
+ # the local node info
self.wview(vid, self.rset, row=row, col=col)
- self.w(u'</li>')
+ if is_open: # recurse if needed
+ self.wview(parentvid, self.req.execute(rql), treeid=treeid, initial_load=False)
+ w(u'</li>')
+
+from logilab.common.decorators import monkeypatch
+from cubicweb.web.views.basecontrollers import JSonController
+@monkeypatch(JSonController)
+def js_node_clicked(self, treeid, nodeeid):
+ """add/remove eid in treestate cookie"""
+ cookies = self.req.get_cookie()
+ statename = treecookiename(treeid)
+ treestate = cookies.get(statename)
+ if treestate is None:
+ cookies[statename] = nodeeid
+ self.req.set_cookie(cookies, statename)
+ else:
+ marked = set(filter(None, treestate.value.split(';')))
+ if nodeeid in marked:
+ marked.remove(nodeeid)
+ else:
+ marked.add(nodeeid)
+ cookies[statename] = ';'.join(marked)
+ self.req.set_cookie(cookies, statename)