diff -r 9c650701cb17 -r 31c3a045e04d web/views/basetemplates.py --- a/web/views/basetemplates.py Thu Aug 13 09:59:35 2009 +0200 +++ b/web/views/basetemplates.py Thu Aug 13 10:02:18 2009 +0200 @@ -113,9 +113,9 @@ if vtitle: w(u'

%s

\n' % xml_escape(vtitle)) # display entity type restriction component - etypefilter = self.vreg['components'].select_vobject( + etypefilter = self.vreg['components'].select_or_none( 'etypenavigation', self.req, rset=self.rset) - if etypefilter: + if etypefilter and etypefilter.propval('visible'): etypefilter.render(w=w) self.nav_html = UStringIO() if view and view.need_navigation: @@ -256,9 +256,9 @@ w(u'

%s

' % xml_escape(vtitle)) def topleft_header(self): - logo = self.vreg['components'].select_vobject('logo', self.req, + logo = self.vreg['components'].select_or_none('logo', self.req, rset=self.rset) - if logo: + if logo and logo.propval('visible'): self.w(u'\n') self.w(u'