cubicweb: comparison cubicweb/web/views/basetemplates.py

equal deleted inserted replaced

-:d8b66e3fd335
+:3a84a79c4ed5
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """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):
 @objectify_predicate
 def modal_view(cls, req, rset, *args, **kwargs):
 if req.form.get('__modal', None):
 return 1
 @objectify_predicate
 def templatable_view(cls, req, rset, *args, **kwargs):
 view = kwargs.pop('view', None)
 if view is None:
 self.template_html_header(content_type, page_title, additional_headers)
 self.template_body_header(view)
 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)
 w(u'<meta http-equiv="content-type" content="%s; charset=%s"/>\n'
 % (content_type, self._cw.encoding))
 def nav_column(self, view, context):
 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)
 self.w(u'</div></td>\n')
 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._cw.lang
 self.write_doctype()
 w(u'<meta http-equiv="content-type" content="%s; charset=%s"/>\n'
 % (content_type, self._cw.encoding))
 w(u'\n'.join(additional_headers))
 self.wview('htmlheader', rset=self.cw_rset)
 def template_header(self, content_type, view=None, page_title='', additional_headers=()):
 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))
 whead(u'\n'.join(additional_headers) + u'\n')
 self.wview('htmlheader', rset=self.cw_rset)
 for jscript in self._cw.uiprops['JAVASCRIPTS']:
 self._cw.add_js(jscript, localfile=False)
 def alternates(self):
 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'<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):
 """default html page header"""
 __regid__ = 'header'
 self.w(u'<a href="%s">%s</a>' % (action.url(),
 self._cw._(action.title)))
 if i < (len(footeractions) - 1):
 self.w(u' | ')
 class HTMLContentHeader(View):
 """default html page content header:
 * include message component if selectable for this request
 * include selectable content navigation components
 """
 if components:
 self.w(u'<div id="contentfooter">')
 for comp in components:
 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
 """
 __abstract__ = True
 form_buttons = [fw.SubmitButton(label=_('log in'),
 attrs={'class': 'loginButton'}),
 fw.ResetButton(label=_('cancel'),
 attrs={'class': 'loginButton',
 'onclick': onclick}),]
 ## 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
 def form_action(self):
 if target and target != '/':
 url_args['postlogin_path'] = target
 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
 """
 __regid__ = 'logform'
 domid = 'loginForm'
 # XXX have to recall fields name since python is mangling __login/__password
 __login = ff.StringField('__login', widget=fw.TextInput({'class': 'data'}))
 __password = ff.StringField('__password', label=_('password'),
 widget=fw.PasswordSingleInput({'class': 'data'}))
-onclick_args =  ('popupLoginBox', '__login')
+onclick_args = ('popupLoginBox', '__login')
 class LogFormView(View):
 # XXX an awful lot of hardcoded assumptions there
 #     makes it unobvious to reuse/specialize
 label = cw.pgettext('CWUser', 'login')
 form.field_by_name('__login').label = label
 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)

changeset 11870	3a84a79c4ed5
parent 11767	432f87a63057
child 11874	ea1d92b677b5