' % ( xml_escape(indexurl), - self.req._('go back to the index page'))) + self._cw._('go back to the index page'))) @objectify_selector def templatable_view(cls, req, rset, *args, **kwargs): @@ -84,9 +84,9 @@ def call(self, view): view.set_request_content_type() view.set_stream() - if (self.req.form.has_key('__notemplate') and view.templatable - and view.content_type == self.req.html_content_type()): - view.w(self.req.document_surrounding_div()) + if (self._cw.form.has_key('__notemplate') and view.templatable + and view.content_type == self._cw.html_content_type()): + view.w(self._cw.document_surrounding_div()) view.render() view.w(u'') else: @@ -109,12 +109,12 @@ self.template_header(self.content_type, view) w = self.w w(u'

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

%s

\n' % xml_escape(vtitle)) # display entity type restriction component - etypefilter = self.vreg['components'].select_or_none( - 'etypenavigation', self.req, rset=self.rset) + etypefilter = self._cw.vreg['components'].select_or_none( + 'etypenavigation', self._cw, rset=self.cw_rset) if etypefilter and etypefilter.cw_propval('visible'): etypefilter.render(w=w) self.nav_html = UStringIO() @@ -136,29 +136,29 @@ def template_html_header(self, content_type, page_title, additional_headers=()): w = self.whead - lang = self.req.lang + lang = self._cw.lang self.write_doctype() # explictly close the tag to avoid IE 6 bugs while browsing DOM - w(u'' % xml_escape(self.req.base_url())) + w(u'' % xml_escape(self._cw.base_url())) w(u'\n' - % (content_type, self.req.encoding)) + % (content_type, self._cw.encoding)) w(u'\n'.join(additional_headers) + u'\n') - self.wview('htmlheader', rset=self.rset) + self.wview('htmlheader', rset=self.cw_rset) if page_title: w(u'%s\n' % xml_escape(page_title)) def template_body_header(self, view): w = self.w w(u'\n') - self.wview('header', rset=self.rset, view=view) + self.wview('header', rset=self.cw_rset, view=view) w(u'

\n') self.nav_column(view, 'left') w(u'\n') self.nav_column(view, 'right') self.w(u'

\n') - components = self.vreg['components'] - rqlcomp = components.select_or_none('rqlinput', self.req, rset=self.rset) + components = self._cw.vreg['components'] + rqlcomp = components.select_or_none('rqlinput', self._cw, rset=self.cw_rset) if rqlcomp: rqlcomp.render(w=self.w, view=view) - msgcomp = components.select_or_none('applmessages', self.req, rset=self.rset) + msgcomp = components.select_or_none('applmessages', self._cw, rset=self.cw_rset) if msgcomp: msgcomp.render(w=self.w) self.content_header(view) @@ -168,12 +168,12 @@ self.w(u'

\n') - self.wview('footer', rset=self.rset) + self.wview('footer', rset=self.cw_rset) self.w(u'') def nav_column(self, view, context): - boxes = list(self.vreg['boxes'].poss_visible_objects( - self.req, rset=self.rset, view=view, context=context)) + boxes = list(self._cw.vreg['boxes'].poss_visible_objects( + self._cw, rset=self.cw_rset, view=view, context=context)) if boxes: self.w(u'

\n') for box in boxes: @@ -182,10 +182,10 @@ def content_header(self, view=None): """by default, display informal messages in content header""" - self.wview('contentheader', rset=self.rset, view=view) + self.wview('contentheader', rset=self.cw_rset, view=view) def content_footer(self, view=None): - self.wview('contentfooter', rset=self.rset, view=view) + self.wview('contentfooter', rset=self.cw_rset, view=view) class ErrorTemplate(TheMainTemplate): @@ -198,21 +198,21 @@ def call(self): """display an unexpected error""" self.set_request_content_type() - self.req.reset_headers() - view = self.vreg['views'].select('error', self.req, rset=self.rset) - self.template_header(self.content_type, view, self.req._('an error occured'), + self._cw.reset_headers() + view = self._cw.vreg['views'].select('error', self._cw, rset=self.cw_rset) + self.template_header(self.content_type, view, self._cw._('an error occured'), [NOINDEX, NOFOLLOW]) view.render(w=self.w) self.template_footer(view) def template_header(self, content_type, view=None, page_title='', additional_headers=()): w = self.whead - lang = self.req.lang + lang = self._cw.lang self.write_doctype() w(u'\n' - % (content_type, self.req.encoding)) + % (content_type, self._cw.encoding)) w(u'\n'.join(additional_headers)) - self.wview('htmlheader', rset=self.rset) + self.wview('htmlheader', rset=self.cw_rset) w(u'%s\n' % xml_escape(page_title)) self.w(u'\n') @@ -228,12 +228,12 @@ page_title = page_title or view.page_title() additional_headers = additional_headers or view.html_headers() whead = self.whead - lang = self.req.lang + lang = self._cw.lang self.write_doctype() whead(u'\n' - % (content_type, self.req.encoding)) + % (content_type, self._cw.encoding)) whead(u'\n'.join(additional_headers) + u'\n') - self.wview('htmlheader', rset=self.rset) + self.wview('htmlheader', rset=self.cw_rset) w = self.w w(u'%s\n' % xml_escape(page_title)) w(u'\n') @@ -241,8 +241,8 @@ w(u'\n') w(u'') w(u'

\n') self.topleft_header() - boxes = list(self.vreg['boxes'].poss_visible_objects( - self.req, rset=self.rset, view=view, context='left')) + boxes = list(self._cw.vreg['boxes'].poss_visible_objects( + self._cw, rset=self.cw_rset, view=view, context='left')) if boxes: w(u'

\n') for box in boxes: @@ -251,13 +251,13 @@ w(u'

') w(u'

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

%s

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

') @@ -279,9 +279,9 @@ """build the standard view, then when it's all done, convert xhtml to pdf """ super(PdfMainTemplate, self).call(view) - section = self.req.form.pop('section', 'contentmain') + section = self._cw.form.pop('section', 'contentmain') pdf = self.to_pdf(self._stream, section) - self.req.set_content_type('application/pdf', filename='report.pdf') + self._cw.set_content_type('application/pdf', filename='report.pdf') self.binary = True self.w = None self.set_stream() @@ -318,12 +318,12 @@ self.pageid() def favicon(self): - favicon = self.req.external_resource('FAVICON', None) + favicon = self._cw.external_resource('FAVICON', None) if favicon: self.whead(u'\n' % favicon) def stylesheets(self): - req = self.req + req = self._cw add_css = req.add_css for css in req.external_resource('STYLESHEETS'): add_css(css, localfile=False) @@ -333,18 +333,18 @@ add_css(css, localfile=False, ieonly=True) def javascripts(self): - for jscript in self.req.external_resource('JAVASCRIPTS'): - self.req.add_js(jscript, localfile=False) + for jscript in self._cw.external_resource('JAVASCRIPTS'): + self._cw.add_js(jscript, localfile=False) def alternates(self): - urlgetter = self.vreg['components'].select_or_none('rss_feed_url', - self.req, rset=self.rset) + urlgetter = self._cw.vreg['components'].select_or_none('rss_feed_url', + self._cw, rset=self.cw_rset) if urlgetter is not None: self.whead(u'\n' % xml_escape(urlgetter.feed_url())) def pageid(self): - req = self.req + req = self._cw pid = make_uid(id(req)) req.pageid = pid req.html_headers.define_var('pageid', pid) @@ -368,28 +368,28 @@ """build the top menu with authentification info and the rql box""" self.w(u'\n') self.w(u'\n') # appliname and breadcrumbs self.w(u'') # logged user and help self.w(u'') @@ -397,20 +397,20 @@ self.w(u'\n') self.w(u'

') - logo = self.vreg['components'].select_or_none( - 'logo', self.req, rset=self.rset) + logo = self._cw.vreg['components'].select_or_none( + 'logo', self._cw, rset=self.cw_rset) if logo and logo.cw_propval('visible'): logo.render(w=self.w) self.w(u'

') for cid in self.main_cell_components: - comp = self.vreg['components'].select_or_none( - cid, self.req, rset=self.rset) + comp = self._cw.vreg['components'].select_or_none( + cid, self._cw, rset=self.cw_rset) if comp and comp.cw_propval('visible'): comp.render(w=self.w) self.w(u'

\n') - comp = self.vreg['components'].select_or_none( - 'loggeduserlink', self.req, rset=self.rset) + comp = self._cw.vreg['components'].select_or_none( + 'loggeduserlink', self._cw, rset=self.cw_rset) if comp and comp.cw_propval('visible'): comp.render(w=self.w) self.w(u'

') - helpcomp = self.vreg['components'].select_or_none( - 'help', self.req, rset=self.rset) + helpcomp = self._cw.vreg['components'].select_or_none( + 'help', self._cw, rset=self.cw_rset) if helpcomp and helpcomp.cw_propval('visible'): helpcomp.render(w=self.w) self.w(u'

') self.w(u'

\n') - self.wview('logform', rset=self.rset, id='popupLoginBox', klass='hidden', + self.wview('logform', rset=self.cw_rset, id='popupLoginBox', klass='hidden', title=False, message=False) def state_header(self): - state = self.req.search_state + state = self._cw.search_state if state[0] == 'normal': return - _ = self.req._ - value = self.view('oneline', self.req.eid_rset(state[1][1])) + _ = self._cw._ + value = self.view('oneline', self._cw.eid_rset(state[1][1])) msg = ' '.join((_("searching for"), - display_name(self.req, state[1][3]), + display_name(self._cw, state[1][3]), _("to associate with"), value, _("by relation"), '"', - display_name(self.req, state[1][2], state[1][0]), + display_name(self._cw, state[1][2], state[1][0]), '"')) return self.w(u'

' % msg) @@ -422,7 +422,7 @@ __regid__ = 'footer' def call(self, **kwargs): - req = self.req + req = self._cw self.w(u'

') # XXX Take object from the registry if in there? would be # better anyway @@ -444,8 +444,8 @@ def call(self, view, **kwargs): """by default, display informal messages in content header""" - components = self.vreg['contentnavigation'].poss_visible_objects( - self.req, rset=self.rset, view=view, context='navtop') + components = self._cw.vreg['contentnavigation'].poss_visible_objects( + self._cw, rset=self.cw_rset, view=view, context='navtop') if components: self.w(u'

') for comp in components: @@ -460,8 +460,8 @@ __regid__ = 'contentfooter' def call(self, view, **kwargs): - components = self.vreg['contentnavigation'].poss_visible_objects( - self.req, rset=self.rset, view=view, context='navbottom') + components = self._cw.vreg['contentnavigation'].poss_visible_objects( + self._cw, rset=self.cw_rset, view=view, context='navbottom') if components: self.w(u'

') for comp in components: @@ -476,10 +476,10 @@ title = 'log in' def call(self, id, klass, title=True, message=True): - self.req.add_css('cubicweb.login.css') + self._cw.add_css('cubicweb.login.css') self.w(u'

' % (id, klass)) if title: - stitle = self.req.property_value('ui.site-title') + stitle = self._cw.property_value('ui.site-title') if stitle: stitle = xml_escape(stitle) else: @@ -489,7 +489,7 @@ if message: self.display_message() - if self.config['auth-mode'] == 'http': + if self._cw.config['auth-mode'] == 'http': # HTTP authentication pass else: @@ -498,17 +498,17 @@ self.w(u'

\n') def display_message(self): - message = self.req.message + message = self._cw.message if message: self.w(u'

\n' % message) def login_form(self, id): - _ = self.req._ + _ = self._cw._ self.w(u'\n') - self.req.html_headers.add_onload('jQuery("#__login:visible").focus()') + self._cw.html_headers.add_onload('jQuery("#__login:visible").focus()') def login_form_url(config, req):