diff --git a/cubicweb_squareui/views/basetemplates.py b/cubicweb_squareui/views/basetemplates.py index 78e173c8146b5cffc52e818bf9fefe14f9189dab_Y3ViaWN3ZWJfc3F1YXJldWkvdmlld3MvYmFzZXRlbXBsYXRlcy5weQ==..53a451a5dde44c1b6e8110da8e0525c71321511b_Y3ViaWN3ZWJfc3F1YXJldWkvdmlld3MvYmFzZXRlbXBsYXRlcy5weQ== 100644 --- a/cubicweb_squareui/views/basetemplates.py +++ b/cubicweb_squareui/views/basetemplates.py @@ -81,8 +81,8 @@ self.nav_column(view, left_boxes, 'left') self.content_column(view, content_cols) self.nav_column(view, right_boxes, 'right') - self.w(u'</div>\n') # closes class=row - self.w(u'</div>\n') # closes id="page" from template_page_content + self.w(u'</div>\n') # closes class=row + self.w(u'</div>\n') # closes id="page" from template_page_content self.template_footer(view) self.w(u'</body>\n') @@ -105,7 +105,7 @@ value = self._cw.view('oneline', self._cw.eid_rset(state[1][1])) target, eid, r_type, searched_type = self._cw.search_state[1] cancel_link = u'<a href="%(url)s" role="button" class="btn btn-default" title="%(title)s">%(title)s</a>' % { - 'url' : self._cw.build_url(str(eid), + 'url': self._cw.build_url(str(eid), vid='edition', __mode='normal'), 'title': _('cancel')} msg = ' '.join((_("searching for"), @@ -109,7 +109,7 @@ vid='edition', __mode='normal'), 'title': _('cancel')} msg = ' '.join((_("searching for"), - '<strong>"%s"</strong>' % \ + '<strong>"%s"</strong>' % display_name(self._cw, state[1][3]), _("to associate with"), value, _("by relation"), @@ -113,7 +113,7 @@ display_name(self._cw, state[1][3]), _("to associate with"), value, _("by relation"), - '<strong>"%s"</strong>' % \ + '<strong>"%s"</strong>' % display_name(self._cw, state[1][2], state[1][0]), cancel_link)) return self.w(u'<div class="alert alert-info">%s</div>' % msg) @@ -155,6 +155,6 @@ w(nav_html.getvalue()) w(u'<div id="contentmain">\n') view.render(w=w) - w(u'</div>\n') # closes id=contentmain + w(u'</div>\n') # closes id=contentmain w(nav_html.getvalue()) self.content_footer(view) @@ -159,7 +159,7 @@ w(nav_html.getvalue()) self.content_footer(view) - w(u'</div>\n') # closes div#pageContent - w(u'</div>\n') # closes div.%(prefix)s-%(col)s + w(u'</div>\n') # closes div#pageContent + w(u'</div>\n') # closes div.%(prefix)s-%(col)s @monkeypatch(basetemplates.TheMainTemplate) @@ -244,7 +244,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> - </button>''' % {'toggle_label':self._cw._('Toggle navigation')}) + </button>''' % {'toggle_label': self._cw._('Toggle navigation')}) components = self.get_components(view, context='header-logo') if components: for component in components: