[REM] language passed as query param for bundles controllers
'translatable' has been removed from assets templates, no need for this anymore bzr revid: fme@openerp.com-20140428124513-vlbm1hjsv9989den
This commit is contained in:
parent
15ea586840
commit
fdaa70f319
|
@ -48,16 +48,6 @@ class Website(openerp.addons.web.controllers.main.Home):
|
||||||
# TODO: can't we just put auth=public, ... in web client ?
|
# TODO: can't we just put auth=public, ... in web client ?
|
||||||
return super(Website, self).web_login(*args, **kw)
|
return super(Website, self).web_login(*args, **kw)
|
||||||
|
|
||||||
@http.route(website=True)
|
|
||||||
def js_bundle(self, xmlid, **kw):
|
|
||||||
request.context['lang'] = kw.get('lang', request.context.get('lang'))
|
|
||||||
return super(Website, self).js_bundle(xmlid, **kw)
|
|
||||||
|
|
||||||
@http.route(website=True)
|
|
||||||
def css_bundle(self, xmlid, **kw):
|
|
||||||
request.context['lang'] = kw.get('lang', request.context.get('lang'))
|
|
||||||
return super(Website, self).css_bundle(xmlid, **kw)
|
|
||||||
|
|
||||||
@http.route('/page/<page:page>', type='http', auth="public", website=True, multilang=True)
|
@http.route('/page/<page:page>', type='http', auth="public", website=True, multilang=True)
|
||||||
def page(self, page, **opt):
|
def page(self, page, **opt):
|
||||||
values = {
|
values = {
|
||||||
|
|
|
@ -59,10 +59,6 @@ class QWeb(orm.AbstractModel):
|
||||||
val = qwebcontext.get('url_for')(val)
|
val = qwebcontext.get('url_for')(val)
|
||||||
return att, val
|
return att, val
|
||||||
|
|
||||||
def render_tag_call_assets(self, element, template_attributes, generated_attributes, qwebcontext):
|
|
||||||
qwebcontext['assets_query'] = dict(lang=qwebcontext['lang'])
|
|
||||||
return super(QWeb, self).render_tag_call_assets(element, template_attributes, generated_attributes, qwebcontext)
|
|
||||||
|
|
||||||
def get_converter_for(self, field_type):
|
def get_converter_for(self, field_type):
|
||||||
return self.pool.get(
|
return self.pool.get(
|
||||||
'website.qweb.field.' + field_type,
|
'website.qweb.field.' + field_type,
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
|
<link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template id="assets" name="Website assets">
|
<template id="website.assets" name="Website assets">
|
||||||
<t t-call="web.assets_common"/>
|
<t t-call="web.assets_common"/>
|
||||||
<t t-call="website.theme"/>
|
<t t-call="website.theme"/>
|
||||||
|
|
||||||
|
@ -75,9 +75,6 @@
|
||||||
and main_object.website_meta_keywords or website_meta_keywords"/>
|
and main_object.website_meta_keywords or website_meta_keywords"/>
|
||||||
<title><t t-esc="title"/></title>
|
<title><t t-esc="title"/></title>
|
||||||
|
|
||||||
<!-- Load stylesheets before scripts to avoid blocking -->
|
|
||||||
<link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>
|
|
||||||
|
|
||||||
<t t-call-assets="website.assets"/>
|
<t t-call-assets="website.assets"/>
|
||||||
|
|
||||||
<t t-raw="head or ''" name='layout_head'/>
|
<t t-raw="head or ''" name='layout_head'/>
|
||||||
|
|
Loading…
Reference in New Issue