pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mass_mailing: fix wrong templates with shape images

Browse Source 
Since [1], some mass_mailing snippet templates now have images with
shapes by default. However, the shapes were not added correctly:

- for the Blockquote snippet, the files specified are not correct (wrong
names and wrong extensions).
- for the Team snippet, the shapes are not present when dropping it.

This commit fixes that by properly adding the shape images as defined in
the commit [2]. It also removes the "circle images" files as they are
not necessary anymore. The basic shapes were also fixed by removing
their width and height, since the dropped snippets looked weird because
their images have a default width smaller than the shapes.

[1]: https://github.com/odoo/odoo/commit/f4995f560003c2180ad3cef50e1b172a151e50c8
[2]: https://github.com/odoo/odoo/commit/eb1262960f54fd81424a86ef4d6693a950e76cb4

opw-3137732

closes odoo/odoo#114966

X-original-commit: b1a3a3b18370ad76280726298602815769dce1c2
Signed-off-by: Romain Derie (rde) <rde@odoo.com>
This commit is contained in:
Soukéina Bojabza
2023-03-10 16:48:15 +01:00
parent 78bce8c069
commit 1dab4ffe28
9 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/static/image_shapes/basic/circle.svg
+1 -1
View File
@@ -5,7 +5,7 @@
</clipPath>
<path id="filterPath" d="M0.5,1C-0.1667,0.9795-0.1667,0.0203,0.5,0C1.1667,0.0205,1.1667,0.9797,0.5,1z"></path>
</defs>
<svg viewBox="0 0 1 1" width="800" height="600" id="preview" preserveAspectRatio="none">
<svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
<use xlink:href="#filterPath" fill="darkgrey"></use>
</svg>
<image xlink:href="" clip-path="url(#clip-path)"></image>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 561 B

addons/mass_mailing/static/image_shapes/basic/slanted.svg
+1 -1
View File
@@ -1,3 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="600">
<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M0.4128,0h0.5872L0.5872,1H0L0.4128,0z"></path></defs><svg viewBox="0 0 1 1" width="800" height="600" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M0.4128,0h0.5872L0.5872,1H0L0.4128,0z"></path></defs><svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 535 B

After

Width:  |  Height:  |  Size: 511 B

addons/mass_mailing/static/image_shapes/basic/triangle.svg
+1 -1
View File
@@ -1,3 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="600">
<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M1,1L0,0h1V1z"></path></defs><svg viewBox="0 0 1 1" width="800" height="600" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M1,1L0,0h1V1z"></path></defs><svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 511 B

After

Width:  |  Height:  |  Size: 487 B

addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1-circle.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.5 KiB

addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2-circle.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3-circle.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4-circle.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.9 KiB

addons/mass_mailing/views/snippets/s_blockquote.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<div>
<p><i>Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.</i></p>
<div>
<img src="/mass_mailing/static/src/img/theme_default/team_member_2-circle.png" style="width: 40px" class="img me-2" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.jpg" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
<img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_2/mass_mailing/basic/circle.svg" style="width: 40px" class="img me-2" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
<p style="font-weight: bolder; font-size: 14px;"><b>John DOE</b> &#8226; CEO of MyCompany</p>
</div>
</div>
addons/mass_mailing/views/snippets/s_company_team.xml
+4 -4
View File
@@ -9,7 +9,7 @@
<div class="container">
<div class="row">
<div class="col-lg-3 pb16 px-0">
<img src="/web/image/mass_mailing.s_company_team_default_image_1" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_1-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
<img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_1/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_1-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
</div>
<div class="col-lg-9">
<h3>Tony Fred, CEO</h3>
@@ -22,7 +22,7 @@
<div class="container">
<div class="row">
<div class="col-lg-3 px-0 pb16">
<img src="/web/image/mass_mailing.s_company_team_default_image_2" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
<img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_2/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
</div>
<div class="col-lg-9">
<h3>Mich Stark, COO</h3>
@@ -35,7 +35,7 @@
<div class="container">
<div class="row">
<div class="col-lg-3 px-0 pb16">
<img src="/web/image/mass_mailing.s_company_team_default_image_3" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_3-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
<img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_3/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_3-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
</div>
<div class="col-lg-9">
<h3>Aline Turner, CTO</h3>
@@ -48,7 +48,7 @@
<div class="container">
<div class="row">
<div class="col-lg-3 px-0 pb16">
<img src="/web/image/mass_mailing.s_company_team_default_image_4" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_4-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
<img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_4/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_4-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
</div>
<div class="col-lg-9">
<h3>Iris Joe, CFO</h3>