diff --git a/addons/website/models/mixins.py b/addons/website/models/mixins.py index a473ab51def..a2866dc7a86 100644 --- a/addons/website/models/mixins.py +++ b/addons/website/models/mixins.py @@ -42,9 +42,9 @@ class SeoMetadata(models.AbstractModel): if 'name' in self: title = '%s | %s' % (self.name, title) if request.website.social_default_image: - img = '/web/image/website/%s/social_default_image' % request.website.id + img = request.website.image_url(request.website, 'social_default_image') else: - img = '/web/image/res.company/%s/logo' % company.id + img = request.website.image_url(company, 'logo') # Default meta for OpenGraph default_opengraph = { 'og:type': 'website', diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 3025d7276cb..3b9979c712b 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -185,7 +185,7 @@ - + diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 6d20822b89d..9fa910dbb7c 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -417,7 +417,7 @@ class Post(models.Model): res = super(Post, self)._default_website_meta() res['default_opengraph']['og:title'] = res['default_twitter']['twitter:title'] = self.name res['default_opengraph']['og:description'] = res['default_twitter']['twitter:description'] = self.plain_content - res['default_opengraph']['og:image'] = res['default_twitter']['twitter:image'] = "/web/image/res.users/%s/image_1024" % (self.create_uid.id) + res['default_opengraph']['og:image'] = res['default_twitter']['twitter:image'] = self.env['website'].image_url(self.create_uid, 'image_1024') res['default_twitter']['twitter:card'] = 'summary' res['default_meta_description'] = self.plain_content return res diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 15ad892fa10..7cdedbec5e4 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -73,7 +73,7 @@ Writer - + @@ -399,7 +399,7 @@ + t-attf-style="background-image: url(#{website.image_url(forum, 'image_256')}); background-position: center;"/> @@ -913,7 +913,7 @@ - + - + - + diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml index b5470a833a9..17d19333f38 100644 --- a/addons/website_profile/views/website_profile.xml +++ b/addons/website_profile/views/website_profile.xml @@ -104,7 +104,7 @@ - + @@ -206,7 +206,7 @@ - + EDIT @@ -252,7 +252,7 @@ Current rank: - + More info @@ -341,7 +341,7 @@ @@ -367,7 +367,7 @@ - + @@ -406,7 +406,7 @@ - + points @@ -439,7 +439,7 @@ - + diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py index f50336eb381..5ff7890914c 100644 --- a/addons/website_sale/models/product.py +++ b/addons/website_sale/models/product.py @@ -361,7 +361,7 @@ class ProductTemplate(models.Model): res = super(ProductTemplate, self)._default_website_meta() res['default_opengraph']['og:description'] = res['default_twitter']['twitter:description'] = self.description_sale res['default_opengraph']['og:title'] = res['default_twitter']['twitter:title'] = self.name - res['default_opengraph']['og:image'] = res['default_twitter']['twitter:image'] = "/web/image/product.template/%s/image_1024" % (self.id) + res['default_opengraph']['og:image'] = res['default_twitter']['twitter:image'] = self.env['website'].image_url(self, 'image_1024') res['default_meta_description'] = self.description_sale return res diff --git a/addons/website_sale_comparison/views/website_sale_comparison_template.xml b/addons/website_sale_comparison/views/website_sale_comparison_template.xml index 15dd18b4c2e..20f579ff108 100644 --- a/addons/website_sale_comparison/views/website_sale_comparison_template.xml +++ b/addons/website_sale_comparison/views/website_sale_comparison_template.xml @@ -143,7 +143,7 @@ - + diff --git a/addons/website_slides/models/slide_slide.py b/addons/website_slides/models/slide_slide.py index 2cc0e839616..493b908dde4 100644 --- a/addons/website_slides/models/slide_slide.py +++ b/addons/website_slides/models/slide_slide.py @@ -676,6 +676,6 @@ class Slide(models.Model): res = super(Slide, self)._default_website_meta() res['default_opengraph']['og:title'] = res['default_twitter']['twitter:title'] = self.name res['default_opengraph']['og:description'] = res['default_twitter']['twitter:description'] = self.description - res['default_opengraph']['og:image'] = res['default_twitter']['twitter:image'] = "/web/image/slide.slide/%s/image_1024" % (self.id) + res['default_opengraph']['og:image'] = res['default_twitter']['twitter:image'] = self.env['website'].image_url(self, 'image_1024') res['default_meta_description'] = self.description return res diff --git a/addons/website_slides/views/website_slides_templates_course.xml b/addons/website_slides/views/website_slides_templates_course.xml index 9fac350ac71..6af0b555ce2 100644 --- a/addons/website_slides/views/website_slides_templates_course.xml +++ b/addons/website_slides/views/website_slides_templates_course.xml @@ -120,7 +120,7 @@ - + @@ -534,7 +534,7 @@ - + @@ -609,7 +609,7 @@ - + diff --git a/addons/website_slides/views/website_slides_templates_homepage.xml b/addons/website_slides/views/website_slides_templates_homepage.xml index 1ff6f0bc87f..561ab5f2823 100644 --- a/addons/website_slides/views/website_slides_templates_homepage.xml +++ b/addons/website_slides/views/website_slides_templates_homepage.xml @@ -297,7 +297,7 @@ - + @@ -408,7 +408,7 @@ Current rank: - + @@ -429,7 +429,7 @@ diff --git a/addons/website_slides/views/website_slides_templates_lesson.xml b/addons/website_slides/views/website_slides_templates_lesson.xml index 642e097aa64..560bc59fa19 100644 --- a/addons/website_slides/views/website_slides_templates_lesson.xml +++ b/addons/website_slides/views/website_slides_templates_lesson.xml @@ -89,7 +89,7 @@ - + @@ -234,7 +234,7 @@ + t-att-src="website.image_url(slide, 'image_1024')" class="img-fluid" style="width:100%" t-att-alt="slide.name"/> diff --git a/addons/website_slides/views/website_slides_templates_lesson_embed.xml b/addons/website_slides/views/website_slides_templates_lesson_embed.xml index d69ddef3215..6713bda120e 100644 --- a/addons/website_slides/views/website_slides_templates_lesson_embed.xml +++ b/addons/website_slides/views/website_slides_templates_lesson_embed.xml @@ -58,7 +58,7 @@ - + @@ -80,14 +80,14 @@ Loading... - + - + diff --git a/addons/website_slides/views/website_slides_templates_profile.xml b/addons/website_slides/views/website_slides_templates_profile.xml index e083fd724d6..a6f62c1b4b1 100644 --- a/addons/website_slides/views/website_slides_templates_profile.xml +++ b/addons/website_slides/views/website_slides_templates_profile.xml @@ -39,7 +39,7 @@ - + diff --git a/addons/website_slides_survey/views/website_profile.xml b/addons/website_slides_survey/views/website_profile.xml index dd80c485308..a2ab1fd0575 100644 --- a/addons/website_slides_survey/views/website_profile.xml +++ b/addons/website_slides_survey/views/website_profile.xml @@ -17,7 +17,7 @@ - +