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

[IMP] mass_mailing: revamp of the event snippet

Browse Source 
This snippet is now similar to the one being used in the web editor.
What was once a single event on three columns is now two events on
two columns.
The snippet's thumbnail has been redesigned to correspond to the
snippet's new design.

Part-of: odoo/odoo#95940
This commit is contained in:
Elisabeth Dickinson
2022-08-11 17:56:25 +02:00
committed by David Monjoie
parent 2815fe0807
commit 73160feed7
7 changed files with 150 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/__manifest__.py
+1
View File
@@ -61,6 +61,7 @@
'views/snippets/s_color_blocks_2.xml',
'views/snippets/s_company_team.xml',
'views/snippets/s_comparisons.xml',
'views/snippets/s_event.xml',
'views/snippets/s_features.xml',
'views/snippets/s_features_grid.xml',
'views/snippets/s_hr.xml',
addons/mass_mailing/static/src/img/snippets_thumbs/s_event.svg
+100
View File
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 82 60" style="enable-background:new 0 0 82 60;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#path-8_00000095300066650753250720000002666093597020083331_);}
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#path-8_00000093149943742714831120000011055561218156940933_);}
.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
.st3{fill-rule:evenodd;clip-rule:evenodd;}
.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;fill-opacity:0.348;}
.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;fill-opacity:0.78;}
.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000153707667966277653250000009137429941846899595_);}
</style>
<g>
<g>
<linearGradient id="path-8_00000176010670027675938670000004938458339886343844_" gradientUnits="userSpaceOnUse" x1="-1176.5044" y1="56.8991" x2="-1176.5044" y2="57.9573" gradientTransform="matrix(12.2244 0 0 12.2244 14408.0605 -682.6234)">
<stop offset="0" style="stop-color:#00A09D"/>
<stop offset="1" style="stop-color:#00E2FF"/>
</linearGradient>
<path id="path-8_00000101807681392685050550000002881477577771196326_" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#path-8_00000176010670027675938670000004938458339886343844_);" d="
M26.9,16.1l2.4,2.4L25,22.8l-2.4-2.4L26.9,16.1L26.9,16.1z M25.3,23.5l4.7-4.7c0.2-0.2,0.2-0.2,0.2-0.3c0-0.2,0-0.3-0.2-0.3
l-2.7-2.7c-0.2-0.2-0.2-0.2-0.3-0.2c-0.2,0-0.3,0-0.3,0.2l-4.7,4.7c-0.2,0.2-0.2,0.2-0.2,0.3c0,0.2,0,0.3,0.2,0.3l2.7,2.7
c0.2,0.2,0.2,0.2,0.3,0.2C25,23.6,25.1,23.6,25.3,23.5L25.3,23.5z M32,18.7l-6.9,6.9c-0.2,0.2-0.5,0.3-0.6,0.3
c-0.3,0-0.5-0.2-0.6-0.3l-1-1c0.3-0.3,0.5-0.6,0.5-1c0-0.5-0.2-0.8-0.5-1c-0.3-0.3-0.6-0.5-1-0.5c-0.5,0-0.8,0.2-1,0.5l-1-1
c-0.2-0.2-0.3-0.5-0.3-0.6c0-0.3,0.2-0.5,0.3-0.6l6.9-6.9c0.2-0.2,0.5-0.3,0.6-0.3c0.3,0,0.5,0.2,0.6,0.3l1,1
c-0.3,0.3-0.5,0.6-0.5,1c0,0.5,0.2,0.8,0.5,1c0.3,0.3,0.6,0.5,1,0.5c0.5,0,0.8-0.2,1-0.5l1,1c0.2,0.2,0.3,0.5,0.3,0.6
C32.4,18.2,32.2,18.5,32,18.7L32,18.7z"/>
</g>
<g>
<linearGradient id="path-8_00000132811078807879644690000010232793767224656295_" gradientUnits="userSpaceOnUse" x1="-1174.0503" y1="56.8991" x2="-1174.0503" y2="57.9573" gradientTransform="matrix(12.2244 0 0 12.2244 14408.0605 -682.6234)">
<stop offset="0" style="stop-color:#00A09D"/>
<stop offset="1" style="stop-color:#00E2FF"/>
</linearGradient>
<path id="path-8_00000013173299018101056130000011854440310922134964_" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#path-8_00000132811078807879644690000010232793767224656295_);" d="
M56.9,16.1l2.4,2.4L55,22.8l-2.4-2.4L56.9,16.1L56.9,16.1z M55.3,23.5l4.7-4.7c0.2-0.2,0.2-0.2,0.2-0.3c0-0.2,0-0.3-0.2-0.3
l-2.7-2.7c-0.2-0.2-0.2-0.2-0.3-0.2c-0.2,0-0.3,0-0.3,0.2l-4.7,4.7c-0.2,0.2-0.2,0.2-0.2,0.3c0,0.2,0,0.3,0.2,0.3l2.7,2.7
c0.2,0.2,0.2,0.2,0.3,0.2C55.1,23.6,55.3,23.6,55.3,23.5L55.3,23.5z M62,18.7l-6.9,6.9c-0.2,0.2-0.5,0.3-0.6,0.3
c-0.3,0-0.5-0.2-0.6-0.3l-1-1c0.3-0.3,0.5-0.6,0.5-1c0-0.5-0.2-0.8-0.5-1c-0.3-0.3-0.6-0.5-1-0.5c-0.5,0-0.8,0.2-1,0.5l-1-1
c-0.2-0.2-0.3-0.5-0.3-0.6c0-0.3,0.2-0.5,0.3-0.6l6.9-6.9c0.2-0.2,0.5-0.3,0.6-0.3c0.3,0,0.5,0.2,0.6,0.3l1,1
c-0.3,0.3-0.5,0.6-0.5,1c0,0.5,0.2,0.8,0.5,1c0.3,0.3,0.6,0.5,1,0.5c0.5,0,0.8-0.2,1-0.5l1,1c0.2,0.2,0.3,0.5,0.3,0.6
C62.4,18.2,62.4,18.5,62,18.7L62,18.7z"/>
</g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-1123.9047" y1="237.1782" x2="-1122.5414" y2="237.3699" gradientTransform="matrix(8 0 0 3 9011 -665)">
<stop offset="0" style="stop-color:#00A09D"/>
<stop offset="1" style="stop-color:#00E2FF"/>
</linearGradient>
<rect x="19.7" y="44.8" class="st2" width="11" height="4"/>
<g>
<g>
<path id="path-7" class="st3" d="M29.3,40.8v1H16v-1H29.3z M34.3,36.8v1H16v-1H34.3z"/>
</g>
<g>
<path id="path-7_00000049188432945054382670000012999828447748560522_" class="st4" d="M29.3,40.8v1H16v-1H29.3z M34.3,36.8v1
H16v-1H34.3z"/>
</g>
</g>
<g>
<g>
<rect id="path-11_00000042727771948489652620000007994651315568149948_" x="16" y="30.8" class="st3" width="20" height="3"/>
</g>
<g>
<rect id="path-11_00000069378958481318337710000011278380222473405829_" x="16" y="30.8" class="st5" width="20" height="3"/>
</g>
</g>
</g>
<g>
<linearGradient id="SVGID_00000046328548324713994340000006507111683487087778_" gradientUnits="userSpaceOnUse" x1="-1120.0671" y1="237.1759" x2="-1118.7037" y2="237.3676" gradientTransform="matrix(8 0 0 3 9011 -665)">
<stop offset="0" style="stop-color:#00A09D"/>
<stop offset="1" style="stop-color:#00E2FF"/>
</linearGradient>
<rect x="50.5" y="44.8" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000046328548324713994340000006507111683487087778_);" width="11" height="4"/>
<g>
<g>
<path id="path-7_00000073694205868785683900000016232603875333593771_" class="st3" d="M59.3,40.8v1H46v-1H59.3z M64.3,36.8v1
H46v-1H64.3z"/>
</g>
<g>
<path id="path-7_00000132075829523470887660000004823225826125989510_" class="st4" d="M59.3,40.8v1H46v-1H59.3z M64.3,36.8v1
H46v-1H64.3z"/>
</g>
</g>
<g>
<g>
<rect id="path-11_00000073705521831743585720000001575955891273760656_" x="46" y="30.8" class="st3" width="20" height="3"/>
</g>
<g>
<rect id="path-11_00000027596513270444160320000018432938704865459642_" x="46" y="30.8" class="st5" width="20" height="3"/>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

addons/mass_mailing/static/src/img/theme_default/s_default_image_block_event.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

addons/mass_mailing/static/src/img/theme_default/s_event_1.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

addons/mass_mailing/static/src/img/theme_default/s_event_2.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

addons/mass_mailing/views/snippets/s_event.xml
+43
View File
@@ -0,0 +1,43 @@
<odoo>
<template id="s_event" name="Event">
<div class="s_mail_block_event o_mail_snippet_general bg-100">
<div class="container">
<div class="row align-items-center">
<div class="s_col_no_bgcolor col-lg-6 pt32 pb32">
<div class="card bg-white h-100 rounded" style="border-radius: 5px !important; border-color: rgb(233, 236, 239) !important;">
<img class="card-img-top" src="/web/image/mass_mailing.s_event_default_image_1" alt=""/>
<div class="card-body">
<h3 class="card-title">
<font style="font-size: 18px;">Event One</font>
</h3>
<p><font class="text-o-color-1">25 September 2022 - 4:30 PM</font></p>
<p>London, United Kingdom</p>
<p>
<a href="#" target="_blank" class="btn btn-primary">Register Now</a>
</p>
</div>
</div>
</div>
<div class="s_col_no_bgcolor col-lg-6 pt32 pb32">
<div class="card bg-white h-100 rounded" style="border-radius: 5px !important; border-color: rgb(233, 236, 239) !important;">
<img class="card-img-top" src="/web/image/mass_mailing.s_event_default_image_2" alt=""/>
<div class="card-body">
<h3 class="card-title">
<font style="font-size: 18px">Event Two</font>
</h3>
<p><font class="text-o-color-1">26 September 2022 - 1:30 PM</font></p>
<p>London, United Kingdom</p>
<p>
<a href="#" target="_blank" class="btn btn-primary">Register Now</a>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
</odoo>
addons/mass_mailing/views/snippets_themes.xml
+6 -31
View File
@@ -77,7 +77,7 @@
<t t-snippet="mass_mailing.s_references" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_references.svg"/>
<t t-snippet="mass_mailing.s_coupon_code" t-thumbnail="/mass_mailing/static/src/img/blocks/block_discount2.png"/>
<t t-snippet="mass_mailing.s_mail_block_discount1" t-thumbnail="/mass_mailing/static/src/img/blocks/block_discount1.png"/>
<t t-snippet="mass_mailing.s_mail_block_event" t-thumbnail="/mass_mailing/static/src/img/blocks/block_event.png"/>
<t t-snippet="mass_mailing.s_event" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_event.svg"/>
<t t-snippet="mass_mailing.s_product_list" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_product_list.svg"/>
<t t-snippet="mass_mailing.s_features_grid" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_features_grid.svg"/>
</div>
@@ -186,31 +186,6 @@
</div>
</template>
<template id="s_mail_block_event" name="Event">
<div class="o_mail_snippet_general o_mail_block_event s_event bg-300">
<div class="container">
<div class="row align-items-center">
<div class="col-lg-3 px-0 text-center">
<h3>21 Jul</h3>
<p>ALL DAY</p>
</div>
<div class="col-lg-2 px-0">
<img src="/web/image/mass_mailing.s_mail_block_event_default_image" class="img w-100"/>
</div>
<div class="col-lg-7">
<h4>Cybersecurity</h4>
<p>Cyber-threats continue to increase.
<br/>The discussion will examine how to develop new norms and integrate them into EU
</p>
<div class="text-start">
<a href="#" class="btn btn-primary">Register</a>
</div>
</div>
</div>
</div>
</div>
</template>
<template id="s_mail_block_footer_social" name="Footer Center">
<div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200">
<div class="container">
@@ -493,9 +468,9 @@
<t t-set="with_shapes" t-value="false"/>
</t>
<!-- COLOR | .s_three_columns | .s_comparisons -->
<!-- COLOR | .s_three_columns | .s_comparisons | .s_event -->
<div data-js="Box"
data-selector=".s_three_columns .row > div, .s_comparisons .row > div"
data-selector=".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div"
data-target=".card-body">
<we-colorpicker string="Background Color"
data-select-style="true"
@@ -503,9 +478,9 @@
data-css-property="background-color"
data-color-prefix="bg-"/>
</div>
<!-- BORDER | .s_three_columns | .s_comparisons -->
<!-- BORDER | .s_three_columns | .s_comparisons | .s_event -->
<div data-js="Box"
data-selector=".s_three_columns .row > div, .s_comparisons .row > div"
data-selector=".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div"
data-target=".card">
<t t-call="mass_mailing.snippet_options_border_widgets">
<t t-set="so_rounded_no_dependencies" t-value="True"/>
@@ -520,7 +495,7 @@
</div>
<!-- Vertical Alignment -->
<div data-option-name="vAlignment" id="row_valign_snippet_option" data-selector=".s_text_image, .s_image_text, .s_three_columns" data-target=".row">
<div data-option-name="vAlignment" id="row_valign_snippet_option" data-selector=".s_text_image, .s_image_text, .s_three_columns, s_mail_block_event" data-target=".row">
<we-button-group string="Vert. Alignment" title="Vertical Alignment">
<we-button title="Align Top"
data-select-class="align-items-start"