From 7dc959c223ddc4034be151a0d390a3dba349a7be Mon Sep 17 00:00:00 2001
From: ralf <rb@egroupware.org>
Date: Thu, 5 May 2022 19:07:44 +0200
Subject: [PATCH] automatic convert <(image|description) expose_view="true" to
 <et2-*-expose

---
 api/etemplate.php                     |  4 ++
 api/js/etemplate/Et2Image/Et2Image.ts |  1 -
 resources/templates/default/show.xet  | 59 +++++++++++++--------------
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/api/etemplate.php b/api/etemplate.php
index 03c687f76b..f6fc45e94a 100644
--- a/api/etemplate.php
+++ b/api/etemplate.php
@@ -87,6 +87,10 @@ function send_template()
 				) . '>' . $matches[2] . "</$tag>";
 		}, $str);
 
+		// modify <(image|description) expose_view="true" --> <et2-*-expose
+		$str = preg_replace('/<(image|description)\s([^><]*)expose_view="true"\s([^><]*)\\/>/',
+			'<et2-$1-expose $2 $3></et2-$1-expose>', $str);
+
 		// ^^^^^^^^^^^^^^^^ above widgets get transformed independent of legacy="true" set in overlay ^^^^^^^^^^^^^^^^^^
 
 		// eTemplate marked as legacy --> replace only some widgets (eg. requiring jQueryUI) with web-components
diff --git a/api/js/etemplate/Et2Image/Et2Image.ts b/api/js/etemplate/Et2Image/Et2Image.ts
index 01eac032ca..0d45262a6c 100644
--- a/api/js/etemplate/Et2Image/Et2Image.ts
+++ b/api/js/etemplate/Et2Image/Et2Image.ts
@@ -96,7 +96,6 @@ export class Et2Image extends Et2Widget(SlotMixin(LitElement)) implements et2_ID
 		this.label = "";
 		this.extra_link_target = "_self";
 		this.extra_link_popup = "";
-		this.expose_view = false;
 
 		this._handleClick = this._handleClick.bind(this);
 	}
diff --git a/resources/templates/default/show.xet b/resources/templates/default/show.xet
index 7b2584d7ae..253c3c8346 100644
--- a/resources/templates/default/show.xet
+++ b/resources/templates/default/show.xet
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
 <overlay>
 	<template id="resources.show.rows" template="" lang="" group="0" version="1.9.003">
 		<grid width="100%">
@@ -39,19 +38,17 @@
 					<nextmatch-customfields id="customfields"/>
 				</row>
 				<row class="$row_cont[class]">
-                    <et2-image-expose id="${row}[picture_thumb]" label="$row_cont[name]"
-                                      href="$row_cont[picture_original]"
-                                      src="$row_cont[picture_thumb]"/>
-                    <vbox>
-                        <description id="${row}[name]" no_lang="1"/>
-                        <description id="${row}[short_description]" no_lang="1"/>
-                    </vbox>
-                    <vbox align="left">
-                        <description align="left" id="${row}[useable]" no_lang="1"/>
-                        <description align="left" id="${row}[quantity]" no_lang="1"/>
-                        <description align="left" id="${row}[bookable]" no_lang="1"/>
-                    </vbox>
-                    <vbox>
+					<image id="${row}[picture_thumb]" expose_view="true" href="$row_cont[picture_original]" src="$row_cont[picture_thumb]" class="thumbnailImage"/>
+					<vbox>
+						<description id="${row}[name]" no_lang="1"/>
+						<description id="${row}[short_description]" no_lang="1"/>
+					</vbox>
+					<vbox align="left">
+						<description align="left" id="${row}[useable]" no_lang="1"/>
+						<description align="left" id="${row}[quantity]" no_lang="1"/>
+						<description align="left" id="${row}[bookable]" no_lang="1"/>
+					</vbox>
+					<vbox>
 						<menulist>
 							<menupopup type="select-cat" id="{$row}[cat_id]" no_lang="1" readonly="true"/>
 						</menulist>
@@ -110,20 +107,22 @@
 			</vbox>
 		</box>
 		<styles>
-            .image16 img {
-            max-width: 16px;
-            max-height: 16px;
-            }
-            .action_popup[id] {
-            position: fixed;
-            top: 200px;
-            left: 450px;
-            width: 76ex;
-            z-index: 20000;
-            display: none;
-            border-collapse:collapse;
-            border-spacing:0px
-            }
-        </styles>
+			.thumbnailImage img {
+				width: 100%;
+				max-width: 65px;
+				height: auto !important;
+				max-height: 50px;
+			}
+			.action_popup[id] {
+				position: fixed;
+				top: 200px;
+				left: 450px;
+				width: 76ex;
+				z-index: 20000;
+				display: none;
+				border-collapse:collapse;
+				border-spacing:0px
+			}
+		</styles>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file