From aab26486d3734cacb16b4257075589c5e762b07b Mon Sep 17 00:00:00 2001
From: pmleconte <pascal.leconte@conseilgouz.com>
Date: Fri, 9 Sep 2022 09:35:33 +0200
Subject: [PATCH] 2.0.5

Autoselect current template
Display thumbnails from media directory
No click on thumbnail
---
 cg_template_switcher_changelog.xml            |  13 +++++++
 packages/mod_cg_template_switcher_j4.zip      | Bin 52146 -> 52276 bytes
 .../en-GB/mod_cg_template_switcher.ini        |   2 +-
 .../en-GB/mod_cg_template_switcher.sys.ini    |   2 +-
 .../fr-FR/mod_cg_template_switcher.ini        |   2 +-
 .../fr-FR/mod_cg_template_switcher.sys.ini    |   2 +-
 .../media/js/init.js                          |   8 ++--
 .../mod_cg_template_switcher.php              |   4 +-
 .../mod_cg_template_switcher.xml              |   6 +--
 .../mod_cg_template_switcher_changelog.xml    |  13 +++++++
 .../src/Helper/CGTemplateSwitcherHelper.php   |  36 ++++++++++--------
 .../tmpl/default.php                          |  30 +++++++--------
 pkg_cgtemplateswitcher.xml                    |   2 +-
 13 files changed, 73 insertions(+), 47 deletions(-)

diff --git a/cg_template_switcher_changelog.xml b/cg_template_switcher_changelog.xml
index 16950e7..c51d585 100644
--- a/cg_template_switcher_changelog.xml
+++ b/cg_template_switcher_changelog.xml
@@ -1,4 +1,17 @@
 <changelogs>
+	<changelog>
+		<element>pkg_cg_template_switcher</element>
+		<type>package</type>
+		<version>2.0.5</version>
+        <note>
+            <item>Update : 09/09/2022</item>
+        </note>
+        <fix>
+            <item>Autoselect current template</item>
+            <item>Display thumbnails from media directory</item>
+            <item>No click on thumbnail</item>
+        </fix>
+	</changelog>
 	<changelog>
 		<element>pkg_cg_template_switcher</element>
 		<type>package</type>
diff --git a/packages/mod_cg_template_switcher_j4.zip b/packages/mod_cg_template_switcher_j4.zip
index 0203ffcb9868e931ae2e673de3c24b7f80fe2b08..babf0e41c0a76e8cc9f060c12df4b91b1f78b64c 100644
GIT binary patch
delta 8060
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
U2zH$>!#ALuF+3EJuD?M41Byl*6aWAK

delta 7900
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
LA-1&tnfQMI(tEs(

diff --git a/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.ini b/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.ini
index dd2c33d..837294a 100644
--- a/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.ini
+++ b/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.ini
@@ -1,4 +1,4 @@
-CG_XML_DESCRIPTION="<p style='text-align:left;padding-left:5px;font-size:inherit'>CG Template Switcher version 2.0.1</p>"
+CG_XML_DESCRIPTION="<p style='text-align:left;padding-left:5px;font-size:inherit'>CG Template Switcher version 2.0.5</p>"
 CG_STYLE_PREVIEW="Preview template ?"
 CG_STYLE_PREVIEWDESC="Show or not template preview window ?"
 CG_STYLE_AUTO="Auto Switch"
diff --git a/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.sys.ini b/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.sys.ini
index c9fdb1f..ef80489 100644
--- a/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.sys.ini
+++ b/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.sys.ini
@@ -1,2 +1,2 @@
-CG_XML_DESCRIPTION="<p style='text-align:left;padding-left:5px;font-size:inherit'>CG Template Switcher version 2.0.1</p>"
+CG_XML_DESCRIPTION="<p style='text-align:left;padding-left:5px;font-size:inherit'>CG Template Switcher version 2.0.5</p>"
 
diff --git a/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.ini b/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.ini
index 96ef839..fe1234b 100644
--- a/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.ini
+++ b/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.ini
@@ -1,4 +1,4 @@
-CG_XML_DESCRIPTION="<p style='text-align:left;padding-left:5px;font-size:inherit'>CG Template Switcher version 2.0.1.</p>"
+CG_XML_DESCRIPTION="<p style='text-align:left;padding-left:5px;font-size:inherit'>CG Template Switcher version 2.0.5.</p>"
 CG_STYLE_PREVIEW="Pr&eacute;visualisation du template ?"
 CG_STYLE_PREVIEWDESC="Activer ou non la Pr&eacute;visualisation du template ?"
 CG_STYLE_AUTO="Auto Switch"
diff --git a/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.sys.ini b/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.sys.ini
index b88e27c..ca7eda7 100644
--- a/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.sys.ini
+++ b/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.sys.ini
@@ -1 +1 @@
-CG_XML_DESCRIPTION="<p style='text-align:left;padding-left:5px;font-size:inherit'>CG Template Switcher version 2.0.1.</p>"
+CG_XML_DESCRIPTION="<p style='text-align:left;padding-left:5px;font-size:inherit'>CG Template Switcher version 2.0.5.</p>"
diff --git a/packages/mod_cg_template_switcher_j4/media/js/init.js b/packages/mod_cg_template_switcher_j4/media/js/init.js
index f285b0b..44d89b5 100644
--- a/packages/mod_cg_template_switcher_j4/media/js/init.js
+++ b/packages/mod_cg_template_switcher_j4/media/js/init.js
@@ -1,8 +1,8 @@
 /**
  * @package CG template switcher Module
- * @version 2.0.1 
+ * @version 2.0.5 
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- * @copyright (c) 2021 ConseilGouz. All Rights Reserved.
+ * @copyright (c) 2025 ConseilGouz. All Rights Reserved.
  * @author ConseilGouz 
  * 
  **/
@@ -63,9 +63,7 @@ function go_switch(options) {
 
 function CG_TS_ImageShow(s) {
 	if (CG_TS_Images[s]) {
-		document.getElementById("CG_TS_Switcher").innerHTML = decodeURIComponent("%3C")+'a href="'+ CG_TS_Images[s].preview +'" class="fancybox"'+decodeURIComponent("%3E")+
-		decodeURIComponent("%3C")+'img src="'+CG_TS_Images[s].preview+'" id="CG_TS_Img"'+decodeURIComponent("%3E")+
-		decodeURIComponent("%3C")+'/a'+decodeURIComponent("%3E");
+		document.getElementById("CG_TS_Switcher").innerHTML = decodeURIComponent("%3C")+'img src="'+CG_TS_Images[s].preview+'" id="CG_TS_Img"'+decodeURIComponent("%3E");
 	} else {
 		document.getElementById("CG_TS_Switcher").innerHTML = options.noimage;
 	}
diff --git a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.php b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.php
index fe5f7de..a32ce7b 100644
--- a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.php
+++ b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package CG template switcher Module
- * @version 2.0.1 
+ * @version 2.0.5 
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- * @copyright (c) 2021 ConseilGouz. All Rights Reserved.
+ * @copyright (c) 2022 ConseilGouz. All Rights Reserved.
  * @author ConseilGouz 
  */
 defined('_JEXEC') or die;
diff --git a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.xml b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.xml
index 088563b..34c2c6f 100644
--- a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.xml
+++ b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.xml
@@ -2,12 +2,12 @@
 <extension version="4.0" type="module" method="upgrade" client="site">
 	<name>CG Template Switcher</name>
 	<author>ConseilGouz</author>
-	<creationDate>October 2021</creationDate>
-	<copyright>Copyright (C) 2021 ConseilGouz. All rights reserved</copyright>
+	<creationDate>September 2022</creationDate>
+	<copyright>Copyright (C) 2022 ConseilGouz. All rights reserved</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2</license>
 	<authorEmail>pascal.leconte@conseilgouz.com</authorEmail>
 	<authorUrl>www.conseilgouz.com</authorUrl>
-	<version>2.0.2</version>
+	<version>2.0.5</version>
 	<description>CG_XML_DESCRIPTION</description>
 	<namespace path="src">ConseilGouz\Module\CGTemplateSwitcher</namespace>
 	<scriptfile>script.php</scriptfile>
diff --git a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher_changelog.xml b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher_changelog.xml
index 07c938f..49a6d24 100644
--- a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher_changelog.xml
+++ b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher_changelog.xml
@@ -1,4 +1,17 @@
 <changelogs>
+	<changelog>
+		<element>mod_cg_template_switcher</element>
+		<type>Module</type>
+		<version>2.0.5</version>
+        <note>
+            <item>Update : 09/09/2022</item>
+        </note>
+        <fix>
+            <item>Autoselect current template</item>
+            <item>Display thumbnails from media directory</item>
+            <item>No click on thumbnail</item>
+        </fix>
+	</changelog>
 	<changelog>
 		<element>mod_cg_template_switcher</element>
 		<type>Module</type>
diff --git a/packages/mod_cg_template_switcher_j4/src/Helper/CGTemplateSwitcherHelper.php b/packages/mod_cg_template_switcher_j4/src/Helper/CGTemplateSwitcherHelper.php
index bbaf52c..334b8c2 100644
--- a/packages/mod_cg_template_switcher_j4/src/Helper/CGTemplateSwitcherHelper.php
+++ b/packages/mod_cg_template_switcher_j4/src/Helper/CGTemplateSwitcherHelper.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package CG template switcher Module
- * @version 2.0.1
+ * @version 2.0.5
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- * @copyright (c) 2021 ConseilGouz. All Rights Reserved.
+ * @copyright (c) 2022 ConseilGouz. All Rights Reserved.
  * @author ConseilGouz 
  */
 namespace ConseilGouz\Module\CGTemplateSwitcher\Site\Helper;
@@ -17,40 +17,48 @@ class CGTemplateSwitcherHelper
 {
 	static function getTemplates($params)
 	{
-		
 		if ($params->get('templatesall','true') == 'true') { // all the templates
 			$styles = self::getListStyles();
 		} else { // selected templates
 			$list = $params->get('templates',array());
 			$styles = self::getListStyles($list);
 		}
-		
 		$results             = new \stdClass();
         $results->imagewidth ='150'; // default image width
 		$results->options    = array();
 		foreach ($styles as $template) {
-		    $template_dir = strtolower(JPATH_ROOT.'/templates/'.$template->template);
+		    $template_dir = strtolower(JPATH_ROOT.'/templates/'.$template->template); // for file_exists
+		    $template_dir_html =  \JURI::root().'/templates/'. $template->template; // for display
+		    $template_media_dir = strtolower(JPATH_ROOT.'/media/templates/site/'.$template->template.'/images');
+			$template_media_dir_html = \JURI::root().'/media/templates/site/'.$template->template.'/images';
 			$results->options[$template->id] = HTMLHelper::_('select.option', $template->id, $template->title);
 			$results->home[$template->id] = $template->home;
 			if ($params->get('showpreview', 'true') == 'true') {
+				$img = "";
+				$img_preview = "";
 			    if (file_exists($template_dir.'/template_thumbnail.png')) {
+			        $img = $template_dir_html.'/template_thumbnail.png';
+				} elseif (file_exists($template_media_dir.'/template_thumbnail.png')){
+				    $img = $template_media_dir_html.'/template_thumbnail.png';
+				}
+				if (file_exists($template_dir.'/template_preview.png')) {
+				    $img_preview = $template_dir_html.'/template_preview.png';
+				}
+				if (file_exists($template_media_dir.'/template_preview.png')){
+				    $img_preview = $template_media_dir_html.'/template_preview.png';
+				}
+				if ($img) {
 				    $results->images[$template->id]         = new \stdClass();
 				    $results->images[$template->id]->name   = $template->title;
-				    $results->images[$template->id]->src    = \JURI::root().'/templates/'.$template->template.'/template_thumbnail.png';
+				    $results->images[$template->id]->src    = $img;
 				    $results->images[$template->id]->width  = '150';
 				    $results->images[$template->id]->height = '100';
-				    $results->images[$template->id]->preview = \JURI::root().'/templates/'.$template->template.'/template_thumbnail.png';;
-				    if (file_exists($template_dir.'/template_preview.png')) {
-				        $results->images[$template->id]->preview    = \JURI::root().'/templates/'.$template->template.'/template_preview.png';
-				    }
+				    $results->images[$template->id]->preview = $img_preview;
 			   }
-				
 			}
-
 		}
 		return $results;
 	}
-	
 	static function getListStyles($list = array() )
 	{
 		$clientId = 0;
@@ -90,7 +98,6 @@ public static function getAjax() {
 		return false;
 	}
 	private static function getParams($params) {
-
 		$templates =  self::getTemplates($params);
 		$templates_js = array();
 		if ($params->get('showpreview', 'true') == 'true') {		
@@ -106,5 +113,4 @@ private static function getParams($params) {
 		return $ret;
 	}
 }
-
 ?>
\ No newline at end of file
diff --git a/packages/mod_cg_template_switcher_j4/tmpl/default.php b/packages/mod_cg_template_switcher_j4/tmpl/default.php
index 8baac0c..e3aecb5 100644
--- a/packages/mod_cg_template_switcher_j4/tmpl/default.php
+++ b/packages/mod_cg_template_switcher_j4/tmpl/default.php
@@ -1,32 +1,28 @@
 <?php
 /**
  * @package CG template switcher Module
- * @version 2.0.1
+ * @version 2.0.5
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
- * @copyright (c) 2021 ConseilGouz. All Rights Reserved.
+ * @copyright (c) 2022 ConseilGouz. All Rights Reserved.
  * @author ConseilGouz 
  * 
  */
-defined('_JEXEC') or die('Restricted access'); ?>
-<?php 
+defined('_JEXEC') or die('Restricted access'); 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 if (empty($templates->options)) { ?>
 	<form style="border:none" action="#">
 		<div style="margin:6px 0;padding:0;border:none;background:none;overflow:hidden">
-			<?php echo JText::_('NOTEMPLATE'); ?>
+			<?php echo Text::_('NOTEMPLATE'); ?>
 		</div>
 	</form>
 <?php return; } 
-$app = JFactory::getApplication();
-$curr_template = $app->getTemplate();  // Current template
-$curr_template_idx = JFactory::getApplication()->input->cookie->get('cg_template');	 // template ix from cookie 
-// look for home template
-$home_template_id = 0;
-foreach ($templates->home as $key => $value) {
-	if ($value == 1) {
-		$home_template_id = $key;
-	}
-}
-if (($curr_template_idx == 0) && ($home_template_id > 0)) $curr_template_idx = $home_template_id;
+$app = Factory::getApplication();
+$curr_template = $app->getTemplate(true);  // Current template
+$curr_template_idx = Factory::getApplication()->input->cookie->get('cg_template');	 // template ix from cookie 
+if (!$curr_template_idx) $curr_template_idx = $curr_template->id;
 ?>
 
 <form id="cg_ts_form" method="post" style="border:none" >
@@ -36,7 +32,7 @@
 	</div>
 	<div id="CG_TS_CHOICE" style="margin:6px 0;padding:0;border:none;background:none;overflow:hidden">
 		<div id="CG_TS_THUMBNAIL" style="padding:0;border:none;background:none;text-align:center">
-			<?php echo JHtmlSelect::genericlist($templates->options, 'template', "class=\"inputbox\" style=\"margin:0\"", 'value', 'text', $curr_template_idx,'CG_TS_Select'); ?>
+			<?php echo HTMLHelper::_('select.genericlist',$templates->options, 'template', "class=\"inputbox\" style=\"margin:0\"", 'value', 'text', $curr_template_idx,'CG_TS_Select'); ?>
 		</div>
 		<?php if ($params->get("autoswitch","false") == 'false') { // 01.0.14 : autoswitch?>
 		<div id="CG_TS_LIST" style="padding:6px 0 0 0;border:none;background:none;text-align:center">
diff --git a/pkg_cgtemplateswitcher.xml b/pkg_cgtemplateswitcher.xml
index dd72011..1b8ffc0 100644
--- a/pkg_cgtemplateswitcher.xml
+++ b/pkg_cgtemplateswitcher.xml
@@ -7,7 +7,7 @@
  <author>ConseilGouz</author>
  <authorEmail>pascal.leconte@conseilgouz.com</authorEmail>
  <authorUrl>www.conseilgouz.com</authorUrl>
- <version>2.0.4</version>
+ <version>2.0.5</version>
  <url>https://www.conseilgouz.com/</url>
  <packager>ConseilGouz</packager>
  <description>Package CG Template Switcher</description>