more fixes

views.py

@@ -21,7 +21,6 @@
 from cubicweb.web.views.calendar import MONTHNAMES
 from cubicweb.web.views.navigation import PageNavigation
 from cubicweb.web.htmlwidgets import BoxLink, BoxWidget
-from cubicweb.web.box import ExtResourcesBoxTemplate
 from cubicweb.interfaces import IFeed, ISIOC
 
 
@@ -108,12 +107,9 @@
         self.w(strio.getvalue())
 
     def render_entity_attributes(self, entity, siderelations):
-        rss_icon = self.req.external_resource('RSS_LOGO_16')
-        rss_label = u'%s <img src="%s" alt="%s"/>' %( self.req._(u'subscribe'),
-                                                      rss_icon,
-                                                      self.req._('rss icon'))
-        self.w('<a class="right" href="%s">%s</a>' % (entity.rss_feed_url(),
-                                                      rss_label))
+        self.w('<a class="right" href="%s"> <img src="%s" alt="%s"/></a>' % (
+            html_escape(entity.rss_feed_url()), self.req._(u'subscribe'),
+            self.req.external_resource('RSS_LOGO_16'), self.req._('rss icon')))
 
 class BlogEntryPrimaryView(baseviews.PrimaryView):
     accepts = ('BlogEntry',)
@@ -230,7 +226,6 @@
         box.append(BoxLink(html_escape(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
-        rss_url = self.build_url(vid='rss', rql=rql)
         rss_label = u'%s <img src="%s" alt="%s"/>' %( self.req._(u'subscribe'),
                                                       rss_icon,
                                                       self.req._('rss icon'))
@@ -234,6 +229,7 @@
         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)
         box.append(BoxLink(html_escape(rss_url), rss_label))
         box.render(self.w)