From 816ce83846686e59a8a603c77c3eccddb6a4b336 Mon Sep 17 00:00:00 2001
From: "Antoine (anso)" <anso@odoo.com>
Date: Thu, 25 Jul 2024 13:30:01 +0200
Subject: [PATCH] [IMP] theme_*: adapt themes with new `s_image_wall` design

*: (artists, bookstore, cobalt, enark, graphene, monglia, real_estate,
vehicle, yes, zap)

This commit adapts the design of `s_image_wall` for multiple themes,
based on the new Odoo 18 snippet redesign.

task-3654301

closes odoo/design-themes#843

Related: odoo/odoo#163839
Signed-off-by: Robin Lejeune (role) <role@odoo.com>
---
 .../views/snippets/s_image_gallery.xml        | 10 ++++----
 theme_bookstore/__manifest__.py               |  1 +
 .../views/snippets/s_image_gallery.xml        | 25 +++++++++++++++++++
 theme_cobalt/views/customizations.xml         | 19 ++++++++++++++
 .../views/snippets/s_image_gallery.xml        | 18 +++++++++++++
 theme_graphene/views/customizations.xml       | 22 ++++++++++++++++
 theme_monglia/views/customizations.xml        | 19 --------------
 .../views/snippets/s_image_gallery.xml        | 19 ++++++++++++++
 theme_vehicle/views/customizations.xml        | 22 ++++++++++++++++
 theme_yes/views/snippets/s_image_gallery.xml  | 10 --------
 theme_yes/views/snippets/s_images_wall.xml    | 19 --------------
 theme_zap/__manifest__.py                     |  1 +
 theme_zap/views/snippets/s_image_gallery.xml  | 25 +++++++++++++++++++
 13 files changed, 157 insertions(+), 53 deletions(-)
 create mode 100644 theme_bookstore/views/snippets/s_image_gallery.xml
 create mode 100644 theme_zap/views/snippets/s_image_gallery.xml

diff --git a/theme_artists/views/snippets/s_image_gallery.xml b/theme_artists/views/snippets/s_image_gallery.xml
index 17d8612f0..e258e7f3d 100644
--- a/theme_artists/views/snippets/s_image_gallery.xml
+++ b/theme_artists/views/snippets/s_image_gallery.xml
@@ -14,19 +14,19 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="class" add="rounded shadow" separator=" "/>
+        <attribute name="class" add="shadow" separator=" "/>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="class" add="rounded shadow" separator=" "/>
+        <attribute name="class" add="shadow" separator=" "/>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="class" add="rounded shadow" separator=" "/>
+        <attribute name="class" add="shadow" separator=" "/>
     </xpath>
     <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="class" add="rounded shadow" separator=" "/>
+        <attribute name="class" add="shadow" separator=" "/>
     </xpath>
     <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="class" add="rounded shadow" separator=" "/>
+        <attribute name="class" add="shadow" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/__manifest__.py b/theme_bookstore/__manifest__.py
index 50af7fcdc..61391f805 100644
--- a/theme_bookstore/__manifest__.py
+++ b/theme_bookstore/__manifest__.py
@@ -25,6 +25,7 @@
         'views/snippets/s_media_list.xml',
         'views/snippets/s_comparisons.xml',
         'views/snippets/s_features_grid.xml',
+        'views/snippets/s_image_gallery.xml',
         'views/snippets/s_product_catalog.xml',
         'views/snippets/s_quotes_carousel.xml',
         'views/new_page_template.xml',
diff --git a/theme_bookstore/views/snippets/s_image_gallery.xml b/theme_bookstore/views/snippets/s_image_gallery.xml
new file mode 100644
index 000000000..4fe103dae
--- /dev/null
+++ b/theme_bookstore/views/snippets/s_image_gallery.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_images_wall" inherit_id="website.s_images_wall">
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index d1a84fb5e..5dc64812f 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -200,6 +200,25 @@
     <xpath expr="//div[hasclass('col-lg-6')][2]/img" position="after">
         <img class="img img-fluid d-block" src="/web/image/website.library_image_16" data-index="1" data-name="Image"/>
     </xpath>
+    <!-- Remove image roundness -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
 </template>
 
 <!-- ======== BIG BOXES ======== -->
diff --git a/theme_enark/views/snippets/s_image_gallery.xml b/theme_enark/views/snippets/s_image_gallery.xml
index 3a6abab11..30446f11f 100644
--- a/theme_enark/views/snippets/s_image_gallery.xml
+++ b/theme_enark/views/snippets/s_image_gallery.xml
@@ -20,6 +20,24 @@
     <xpath expr="//div[hasclass('container')]" position="attributes">
         <attribute name="class" add="container-fluid" remove="container" separator=" "/>
     </xpath>
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
 </template>
 
 </odoo>
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index 3ac17b5f9..83a4fd363 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -283,4 +283,26 @@
     </xpath>
 </template>
 
+<!-- ======== IMAGE WALL ======== -->
+<template id="s_images_wall" inherit_id="website.s_images_wall">
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index 31f27ba03..1f7399fb1 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -222,25 +222,6 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2 o_spc-medium" remove="o_cc5 o_spc-small" separator=" "/>
     </xpath>
-    <!-- Image -->
-    <xpath expr="//img" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
 </template>
 
 </odoo>
diff --git a/theme_real_estate/views/snippets/s_image_gallery.xml b/theme_real_estate/views/snippets/s_image_gallery.xml
index 756bbed5c..0b7aa5e7b 100644
--- a/theme_real_estate/views/snippets/s_image_gallery.xml
+++ b/theme_real_estate/views/snippets/s_image_gallery.xml
@@ -9,6 +9,25 @@
     <xpath expr="//div[hasclass('o_masonry_col')][2]//img" position="replace">
         <img class="img img-fluid d-block" src="/web/image/website.library_image_21" data-index="4" data-name="Image"/>
     </xpath>
+    <!-- Remove images roundness -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
 </template>
 
 </odoo>
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index 85e9436c0..f3c507dce 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -321,4 +321,26 @@
     </xpath>
 </template>
 
+<!-- ======== IMAGE WALL ======== -->
+<template id="s_images_wall" inherit_id="website.s_images_wall">
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_image_gallery.xml b/theme_yes/views/snippets/s_image_gallery.xml
index 4fcd3dfaa..a43091417 100644
--- a/theme_yes/views/snippets/s_image_gallery.xml
+++ b/theme_yes/views/snippets/s_image_gallery.xml
@@ -15,16 +15,6 @@
     <xpath expr="//*[hasclass('container')]" position="attributes">
         <attribute name="class" add="o_container_small" remove="container" separator=" "/>
     </xpath>
-    <!-- Images -->
-    <xpath expr="//*[hasclass('carousel-item')]//img" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="//*[hasclass('carousel-item')][2]//img" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="//*[hasclass('carousel-item')][3]//img" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
 </template>
 
 </odoo>
diff --git a/theme_yes/views/snippets/s_images_wall.xml b/theme_yes/views/snippets/s_images_wall.xml
index f63451898..6c293d1df 100644
--- a/theme_yes/views/snippets/s_images_wall.xml
+++ b/theme_yes/views/snippets/s_images_wall.xml
@@ -10,25 +10,6 @@
     <xpath expr="//*[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
-    <!-- Images -->
-    <xpath expr="//img" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
-    <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
 </template>
 
 </odoo>
diff --git a/theme_zap/__manifest__.py b/theme_zap/__manifest__.py
index 5fe8766cf..46bb11b00 100644
--- a/theme_zap/__manifest__.py
+++ b/theme_zap/__manifest__.py
@@ -22,6 +22,7 @@
         'views/snippets/s_references.xml',
         'views/snippets/s_image_text.xml',
         'views/snippets/s_three_columns.xml',
+        'views/snippets/s_image_gallery.xml',
         'views/new_page_template.xml',
     ],
     'images': [
diff --git a/theme_zap/views/snippets/s_image_gallery.xml b/theme_zap/views/snippets/s_image_gallery.xml
new file mode 100644
index 000000000..4fe103dae
--- /dev/null
+++ b/theme_zap/views/snippets/s_image_gallery.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_images_wall" inherit_id="website.s_images_wall">
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" remove="rounded" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>