v23.10.3

xech · Oct 19, 2023 · 7fdcb42 · 7fdcb42
1 parent 15488b1
commit 7fdcb42
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 11 deletions.
diff --git a/app/Common/DbUpdate.php b/app/Common/DbUpdate.php
@@ -858,7 +858,7 @@ public static function lauchUpdate()
 					{self::query("CREATE TABLE `ap_userAuthToken` (`_idUser` mediumint(8) UNSIGNED NOT NULL, `userAuthToken` varchar(255) NOT NULL, `dateCrea` datetime NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");}
 			}
 
-			if(self::updateVersion("23.10.2"))
+			if(self::updateVersion("23.10.3"))
 			{
 				//Suppression d'anciens champs
 				if(self::fieldExist("ap_user","picture"))			{self::query("ALTER TABLE ap_user DROP picture");}

diff --git a/app/Common/VueObjAttachedFile.php b/app/Common/VueObjAttachedFile.php
@@ -56,10 +56,13 @@ function attachedFileDelete(_id)
 
 ////	LISTE DES FICHIERS JOINTS DEJA ATTACHÉS A UN OBJET (affiche si besoin l'option "insérer dans le texte" pour l'éditeur tinyMce)
 if(count($curObj->attachedFileList())>0){
-	echo '<hr>';
 	foreach($curObj->attachedFileList() as $tmpFile){
 		$fileOptions='<label onclick="attachedFileDelete('.$tmpFile["_id"].');" title="'.Txt::trad("delete").'"><img src="app/img/delete.png"></label>';
-		if($curObj::htmlEditorField!=null && File::isType("attachedFileInsert",$tmpFile["name"]))  {$fileOptions='<label onclick="attachedFileInsert('.$tmpFile["_id"].',\''.$tmpFile["url"].'\')"><img src="app/img/attachedFileInsert.png" title="'.Txt::trad("EDIT_attachedFileInsertTooltip").'"></label>'.$fileOptions;}
-		echo '<div id="attachedFileDivList'.$tmpFile["_id"].'" class="attachedFileDiv"><img src="app/img/attachment.png"> '.$tmpFile["name"].$fileOptions.'</div>';
+		if($curObj::htmlEditorField!=null){
+			//Insertion de l'image/video/mp3 dans le texte  &&  Affichage d'une miniature de l'image
+			if(File::isType("attachedFileInsert",$tmpFile["name"]))		{$fileOptions.='<label onclick="attachedFileInsert('.$tmpFile["_id"].',\''.$tmpFile["url"].'\')"><img src="app/img/attachedFileInsert.png" title="'.Txt::trad("EDIT_attachedFileInsertTooltip").'"></label>';}
+			if(File::isType("imageBrowser",$tmpFile["name"]))			{$fileOptions.=' &nbsp; <img src="'.$tmpFile["url"].'" class="attachedFileInsertImg">';}
+		}
+		echo '<hr><div id="attachedFileDivList'.$tmpFile["_id"].'" class="attachedFileDiv"><img src="app/img/attachment.png"> '.$tmpFile["name"].$fileOptions.'</div>';
 	}
 }
diff --git a/app/Common/VueStructure.php b/app/Common/VueStructure.php
@@ -14,7 +14,7 @@
 		<meta name="application-name" content="Agora-Project">
 		<meta name="application-url" content="https://www.agora-project.net">
 		<!-- JQUERY & JQUERY-UI -->
-		<script src="app/js/jquery-3.7.0.min.js"></script>
+		<script src="app/js/jquery-3.7.1.min.js"></script>
 		<script src="app/js/jquery-ui/jquery-ui.min.js"></script>
 		<script src="app/js/jquery-ui/datepicker-<?= Txt::trad("CURLANG") ?>.js"></script><!--traduction-->
 		<link rel="stylesheet" href="app/js/jquery-ui/jquery-ui.css">

diff --git a/app/VERSION.txt b/app/VERSION.txt
@@ -1 +1 @@
-23.10.2
+23.10.3
diff --git a/app/css/common-23.10.2.css → app/css/common-23.10.3.css b/app/css/common-23.10.2.css → app/css/common-23.10.3.css
@@ -103,6 +103,7 @@ audio						{min-width:350px;}
 .attachedFileMenu							{display:flex; margin:5px;}
 .attachedFileMenu img						{margin-right:5px;}
 .attachedFileTag							{max-width:100%; height:auto;}														/*cf. "attachedFileInsert()". Tester l'affichage d'une image en mobileApp*/
+.attachedFileInsertImg						{max-width:50px!important; max-height:50px!important;}								/*Liste des images dans le menu d'edition*/
 /*RESPONSIVE*/
 @media screen and (max-width:1023px){
 	.objMenuBurger			{opacity:1!important;}/*Icones affichées sans opacité*/

diff --git a/app/js/common-23.10.2.js → app/js/common-23.10.3.js b/app/js/common-23.10.2.js → app/js/common-23.10.3.js
diff --git a/app/js/jquery-3.7.0.min.js b/app/js/jquery-3.7.0.min.js
diff --git a/app/js/jquery-3.7.1.min.js b/app/js/jquery-3.7.1.min.js
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -4,24 +4,28 @@ CHANGELOG - JOURNAL DES VERSIONS
 #################################
 
 
-VERSION 23.10.2
+VERSION 23.10.3
 ###############
 Amélioration du menu principal
 Amélioration de la gestion des "Screen orientation" sur mobile
+Fichiers joints dans les menus d'edition des objets : ajout d'une vignette pour les images
 Optimisation des contrôles d'upload des fichiers
 Renommage des cles de traduction des toolips
 Amélioration des notifications d'envoi des emails
 Correction de l'affichage des logs avec PHP 8.1 +
-Mise à jour de l'éditeur TinyMce en version 6.7.0
-Mise à jour de OAuth via "google-api-php-client" en version 2.15.1
+TinyMce mis à jour en v6.7.0
+JQuery mis à jour en  v3.7.1
+OAuth via "google-api-php-client" mis à jour en v2.15.1
 -----
 Improved main menu
 Improved management of "Screen orientation" on mobile
+Attached files in object editing menus : addition of a thumbnail for images
 Optimization of file upload controls
 Renaming toolip translation keys
 Improved email sending notifications
 Fixing the display of logs with PHP 8.1 +
 TinyMce updated to v6.7.0
+JQuery updated to v3.7.1
 OAuth via "google-api-php-client" updated to v2.15.1