--- a/cubicweb/web/views/basetemplates.py Thu Nov 24 16:58:27 2016 +0100
+++ b/cubicweb/web/views/basetemplates.py Thu Nov 24 16:58:50 2016 +0100
@@ -18,20 +18,20 @@
"""default templates for CubicWeb web client"""
-from cubicweb import _
-
from logilab.mtconverter import xml_escape
from logilab.common.deprecation import class_renamed
from logilab.common.registry import objectify_predicate
from logilab.common.decorators import classproperty
-from cubicweb.predicates import match_kwargs, no_cnx, anonymous_user
+from cubicweb import _
+from cubicweb.predicates import match_kwargs, anonymous_user
from cubicweb.view import View, MainTemplate, NOINDEX, NOFOLLOW, StartupView
from cubicweb.utils import UStringIO
from cubicweb.schema import display_name
-from cubicweb.web import component, formfields as ff, formwidgets as fw
+from cubicweb.web import formfields as ff, formwidgets as fw
from cubicweb.web.views import forms
+
# main templates ##############################################################
class LogInOutTemplate(MainTemplate):
@@ -92,6 +92,7 @@
if req.form.get('__modal', None):
return 1
+
@objectify_predicate
def templatable_view(cls, req, rset, *args, **kwargs):
view = kwargs.pop('view', None)
@@ -176,7 +177,6 @@
def template_html_header(self, content_type, page_title, additional_headers=()):
w = self.whead
- lang = self._cw.lang
self.write_doctype()
self._cw.html_headers.define_var('BASE_URL', self._cw.base_url())
self._cw.html_headers.define_var('DATA_URL', self._cw.datadir_url)
@@ -215,7 +215,6 @@
boxes = list(self._cw.vreg['ctxcomponents'].poss_visible_objects(
self._cw, rset=self.cw_rset, view=view, context=context))
if boxes:
- getlayout = self._cw.vreg['components'].select
self.w(u'<td id="navColumn%s"><div class="navboxes">\n' % context.capitalize())
for box in boxes:
box.render(w=self.w, view=view)
@@ -248,7 +247,6 @@
def template_header(self, content_type, view=None, page_title='', additional_headers=()):
w = self.whead
- lang = self._cw.lang
self.write_doctype()
w(u'<meta http-equiv="content-type" content="%s; charset=%s"/>\n'
% (content_type, self._cw.encoding))
@@ -269,7 +267,6 @@
page_title = page_title or view.page_title()
additional_headers = additional_headers or view.html_headers()
whead = self.whead
- lang = self._cw.lang
self.write_doctype()
whead(u'<meta http-equiv="content-type" content="%s; charset=%s"/>\n'
% (content_type, self._cw.encoding))
@@ -337,10 +334,10 @@
def alternates(self):
urlgetter = self._cw.vreg['components'].select_or_none('rss_feed_url',
- self._cw, rset=self.cw_rset)
+ self._cw, rset=self.cw_rset)
if urlgetter is not None:
self.whead(u'<link rel="alternate" type="application/rss+xml" title="RSS feed" href="%s"/>\n'
- % xml_escape(urlgetter.feed_url()))
+ % xml_escape(urlgetter.feed_url()))
class HTMLPageHeader(View):
@@ -406,6 +403,7 @@
if i < (len(footeractions) - 1):
self.w(u' | ')
+
class HTMLContentHeader(View):
"""default html page content header:
* include message component if selectable for this request
@@ -439,6 +437,7 @@
comp.render(w=self.w, view=view)
self.w(u'</div>')
+
class BaseLogForm(forms.FieldsForm):
"""Abstract Base login form to be used by any login form
"""
@@ -461,7 +460,7 @@
fw.ResetButton(label=_('cancel'),
attrs={'class': 'loginButton',
'onclick': onclick}),]
- ## Can't shortcut next access because __dict__ is a "dictproxy" which
+ ## Can't shortcut next access because __dict__ is a "dictproxy" which
## does not support items assignement.
# cls.__dict__['form_buttons'] = form_buttons
return form_buttons
@@ -477,6 +476,7 @@
return self._cw.build_url('login', __secure__=True, **url_args)
return super(BaseLogForm, self).form_action()
+
class LogForm(BaseLogForm):
"""Simple login form that send username and password
"""
@@ -488,7 +488,7 @@
__password = ff.StringField('__password', label=_('password'),
widget=fw.PasswordSingleInput({'class': 'data'}))
- onclick_args = ('popupLoginBox', '__login')
+ onclick_args = ('popupLoginBox', '__login')
class LogFormView(View):
@@ -531,4 +531,5 @@
form.render(w=self.w, table_class='', display_progress_div=False)
cw.html_headers.add_onload('jQuery("#__login:visible").focus()')
+
LogFormTemplate = class_renamed('LogFormTemplate', LogFormView)