ggrrr, redo some already done changes becoz of fu***** hg resolve

views.py

@@ -30,7 +30,7 @@
     accepts = ('Blog', 'BlogEntry')
     templatable = False
     __selectors__ = (implement_interface,)
-    accepts_intefaces = (ISIOC,)
+    accepts_interfaces = (ISIOC,)
     content_type = 'text/xml'
     item_vid = 'sioc_item'
     
@@ -216,10 +216,8 @@
         # empty string for title argument to deactivate auto-title
         for i in xrange(rset.rowcount):
             entity = rset.get_entity(i, 0)
-            url = self.build_url(rql=rql_for_eid(entity.eid))
-            label = entity.dc_title()
-            box.append( BoxLink(url, label) )
+            box.append(BoxLink(entity.absolute_url(), html_escape(entity.dc_title())))
         rqlst = rset.syntax_tree()
         rqlst.set_limit(None)
         rql = rqlst.as_string(kwargs=rset.args) # en gros...
         url = self.build_url(vid='boxListing', rql=rql, page_size=10)
@@ -222,7 +220,7 @@
         rqlst = rset.syntax_tree()
         rqlst.set_limit(None)
         rql = rqlst.as_string(kwargs=rset.args) # en gros...
         url = self.build_url(vid='boxListing', rql=rql, page_size=10)
-        box.append(BoxLink(html_escape(url),  u'[%s]' % self.req._(u'see more')))
+        box.append(BoxLink(url,  u'[%s]' % self.req._(u'see more')))
         rss_icon = self.req.external_resource('RSS_LOGO_16')
         # FIXME - could use rss_url defined as a property if available
@@ -227,6 +225,5 @@
         rss_icon = self.req.external_resource('RSS_LOGO_16')
         # FIXME - could use rss_url defined as a property if available
-        rss_label = u'%s <img src="%s" alt="%s"/>' %( self.req._(u'subscribe'),
-                                                      rss_icon,
-                                                      self.req._('rss icon'))
+        rss_label = u'%s <img src="%s" alt="%s"/>' % (
+                           self.req._(u'subscribe'), rss_icon, self.req._('rss icon'))
         rss_url = self.build_url(vid='rss', rql=rql)
@@ -232,5 +229,5 @@
         rss_url = self.build_url(vid='rss', rql=rql)
-        box.append(BoxLink(html_escape(rss_url), rss_label))
+        box.append(BoxLink(rss_url, html_escape(rss_label)))
         box.render(self.w)