%s

# HG changeset patch # User Florent Cayré # Date 1330333945 -3600 # Node ID 80d37fb56312ebf9f3bb87bd9974bbbca7cd5c66 # Parent a4b009ba92ced8180328c024a507360f8eedc5c5 [web templates] fix invalid html in main-no-top template; closes #2174806 diff -r a4b009ba92ce -r 80d37fb56312 web/test/unittest_views_basetemplates.py --- a/web/test/unittest_views_basetemplates.py Fri Feb 24 12:35:24 2012 +0100 +++ b/web/test/unittest_views_basetemplates.py Mon Feb 27 10:12:25 2012 +0100 @@ -35,6 +35,13 @@ self.set_option('allow-email-login', 'no') self.assertEqual(self._login_labels(), ['login', 'password']) + +class MainNoTopTemplateTC(CubicWebTC): + + def test_valid_xhtml(self): + self.view('index', template='main-no-top') + + if __name__ == '__main__': from logilab.common.testlib import unittest_main unittest_main() diff -r a4b009ba92ce -r 80d37fb56312 web/views/basetemplates.py --- a/web/views/basetemplates.py Fri Feb 24 12:35:24 2012 +0100 +++ b/web/views/basetemplates.py Mon Feb 27 10:12:25 2012 +0100 @@ -256,10 +256,10 @@ whead(u'\n'.join(additional_headers) + u'\n') self.wview('htmlheader', rset=self.cw_rset) w = self.w - w(u'%s\n' % xml_escape(page_title)) + whead(u'%s\n' % xml_escape(page_title)) w(u'\n') w(u'

') - w(u'\n') + w(u'

\n') w(u'') - w(u'

\n') self.topleft_header() boxes = list(self._cw.vreg['ctxcomponents'].poss_visible_objects( @@ -270,11 +270,7 @@ box.render(w=w) self.w(u'\n') w(u'

') - w(u'

\n') - vtitle = self._cw.form.get('vtitle') - if vtitle: - w(u'

' % xml_escape(vtitle)) + w(u'

') def topleft_header(self): logo = self._cw.vreg['components'].select_or_none('logo', self._cw,