--- a/web/views/ibreadcrumbs.py Wed Sep 02 10:54:04 2009 +0200
+++ b/web/views/ibreadcrumbs.py Wed Sep 02 16:42:07 2009 +0200
@@ -16,14 +16,8 @@
from cubicweb.view import EntityView, Component
# don't use AnyEntity since this may cause bug with isinstance() due to reloading
from cubicweb.entity import Entity
-from cubicweb.common.uilib import cut
-
+from cubicweb.common import tags, uilib
-def bc_title(entity):
- textsize = entity.req.property_value('navigation.short-line-size')
- return xml_escape(cut(entity.dc_title(), textsize))
-
-# XXX only provides the component version
class BreadCrumbEntityVComponent(Component):
id = 'breadcrumbs'
@@ -38,7 +32,7 @@
separator = u' > '
def call(self, view=None, first_separator=True):
- entity = self.rset.get_entity(0,0)
+ entity = self.rset.get_entity(0, 0)
path = entity.breadcrumbs(view)
if path:
self.w(u'<span id="breadcrumbs" class="pathbar">')
@@ -62,17 +56,17 @@
def wpath_part(self, part, contextentity, last=False):
if isinstance(part, Entity):
if last and part.eid == contextentity.eid:
- self.w(bc_title(part))
+ part.view('breadcrumbtext', w=self.w)
else:
part.view('breadcrumbs', w=self.w)
elif isinstance(part, tuple):
url, title = part
textsize = self.req.property_value('navigation.short-line-size')
self.w(u'<a href="%s">%s</a>' % (
- xml_escape(url), xml_escape(cut(title, textsize))))
+ xml_escape(url), xml_escape(uilib.cut(title, textsize))))
else:
textsize = self.req.property_value('navigation.short-line-size')
- self.w(cut(unicode(part), textsize))
+ self.w(uilib.cut(unicode(part), textsize))
class BreadCrumbETypeVComponent(BreadCrumbEntityVComponent):
@@ -104,6 +98,15 @@
def cell_call(self, row, col):
entity = self.rset.get_entity(row, col)
- desc = xml_escape(cut(entity.dc_description(), 50))
- self.w(u'<a href="%s" title="%s">%s</a>' % (
- xml_escape(entity.absolute_url()), desc, bc_title(entity)))
+ desc = xml_escape(uilib.cut(entity.dc_description(), 50))
+ self.w(tags.a(entity.view('breadcrumbtext'), href=entity.absolute_url(),
+ title=desc))
+
+
+class BreadCrumbTextView(EntityView):
+ id = 'breadcrumbtext'
+
+ def cell_call(self, row, col):
+ entity = self.rset.get_entity(row, col)
+ textsize = self.req.property_value('navigation.short-line-size')
+ self.w(uilib.cut(entity.dc_title(), textsize))