1.1.1

Add FR language file Rectangle: define height
conseilgouz · Apr 23, 2024 · 1aa4f05 · 1aa4f05
1 parent 268ef0f
commit 1aa4f05
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 9 deletions.
diff --git a/language/en-GB/mod_cg_skillset.ini b/language/en-GB/mod_cg_skillset.ini
@@ -40,8 +40,14 @@ MOD_CG_SKILLSET_NUMBER_SIZE_LABEL="Number Size (Eg: 20)"
 MOD_CG_SKILLSET_SYMBOL_SIZE_LABEL="Symbol Size (Eg: 20)"
 MOD_CG_SKILLSET_ICON_SIZE_LABEL="Icon Size (Eg: 20)"
 MOD_CG_SKILLSET_ANIMATION_FORM_LABEL="Colored animation ?"
+MOD_CG_SKILLSET_ANIMATION_FORM_DESC="Select if colored animation is wanted, and, if so, its shape (round or rectangle around you skillset). "
 MOD_CG_SKILLSET_ANIMATION_ROUND_LABEL="Round"
 MOD_CG_SKILLSET_ANIMATION_RECTANGLE_LABEL="Rectangle"
 MOD_CG_SKILLSET_ANIMATION_STARTCOLOR_LABEL="Starting color ?"
+MOD_CG_SKILLSET_ANIMATION_STARTCOLOR_DESC="Select starting color of animated field. It will be displayed before animations's starts. (default=#8ee58e)"
 MOD_CG_SKILLSET_ANIMATION_PROGRESSCOLOR_LABEL="Progress color ?"
-MOD_CG_SKILLSET_ANIMBACK_COLOR_LABEL="Background color ?"
+MOD_CG_SKILLSET_ANIMATION_PROGRESSCOLOR_DESC="Select progress color of animated field. It will remain displayed after animations's end. (default=#007eff)"
+MOD_CG_SKILLSET_ANIMBACK_COLOR_LABEL="Background color ?"
+MOD_CG_SKILLSET_ANIMBACK_COLOR_DESC="Select background color of animated field (default #d3d3d3)"
+MOD_CG_SKILLSET_ANIMHEIGHT_LABEL="Height ?"
+MOD_CG_SKILLSET_ANIMHEIGHT_DESC="Enter rectangle height in px (default=120)"
diff --git a/language/fr-FR/mod_cg_skillset.ini b/language/fr-FR/mod_cg_skillset.ini
@@ -0,0 +1,53 @@
+MOD_CG_SKILLSET_XML_DESCRIPTION="<script src='../media/mod_cg_skillset/js/admin.js'></script>CG SkillSet. Jusqu'à 4 compétences animées."
+MOD_CG_SKILLSET_CREATE_LABEL="Ajout élément"
+JGLOBAL_TITLE="Titre"
+MOD_CG_SKILLSET_TITLE_DESC="Entrez le titre d'une compétence (peut contenir du code HTML tel que &lt;a href..&gt;)."
+MOD_CG_SKILLSET_NUMBER_LABEL="Nombre"
+MOD_CG_SKILLSET_NUMBER_DESC="Entrez le chiffre maxi associé à la compétence"
+MOD_CG_SKILLSET_ENABLE_SYMBOL_LABEL="Activer Symbole ?"
+MOD_CG_SKILLSET_ENABLE_SYMBOL_DESC="Sélectionnez Oui pour ajouter un symbole avec les nombres"
+MOD_CG_SKILLSET_ENTER_SYMBOL_LABEL="Symbole ?"
+MOD_CG_SKILLSET_ENTER_SYMBOL_DESC="Entrez le symbole par ex. +, % etc. Le symbole sera affiché avec les nombres."
+MOD_CG_SKILLSET_ICON_LABEL="Icone"
+MOD_CG_SKILLSET_ICON_DESC="Entrez des icones avec vos compétences. Vous pouvez soit télécharger une image ou entrez une classe de votre librairie d'icones. Sélectionnez soit Télécharger soit Classe Icone"
+MOD_CG_SKILLSET_ICON_OPTIONS_UPLOAD="Télécharger"
+MOD_CG_SKILLSET_ICON_CLASS="Class Icone"
+MOD_CG_SKILLSET_ICON_OPTIONS_UPLAOD_LABEL="Image"
+MOD_CG_SKILLSET_ICON_OPTIONS_UPLAOD_DESC="Télécharger un icone ou une image"
+MOD_CG_SKILLSET_ENTER_WEBFONT_CODE_LABEL="Classe icone"
+MOD_CG_SKILLSET_ENTER_WEBFONT_CODE_DESC="Entrez la classe de l'icone. Vous pouvez trouver vos icones à l'adresse <a href='https://fontawesome.com/icons' target='_blank'>https://fontawesome.com/icons</a>."
+MOD_CG_SKILLSET_ICON_POSITION_LABEL="Position Icone"
+MOD_CG_SKILLSET_ICON_POSITION_DESC="Selectionnez où afficher votre icone"
+MOD_CG_SKILLSET_ICON_POSITION_TOP="Haut"
+MOD_CG_SKILLSET_ICON_POSITION_BOTTOM="Bas"
+MOD_CG_SKILLSET_NUMBER_POSITION_LABEL="Position Nombre"
+MOD_CG_SKILLSET_NUMBER_POSITION_DESC="Selectionnez où afficher les nombres par rapport au titre."
+MOD_CG_SKILLSET_NUMBER_POSITION_ABOVE="Au dessus du titre"
+MOD_CG_SKILLSET_NUMBER_POSITION_BELOW="Sous le titre"
+MOD_CG_SKILLSET_SYMBOL_POSITION_LABEL="Position symbole"
+MOD_CG_SKILLSET_SYMBOL_POSITION_DESC="Sélectionnez comment afficher le symbole : standard ou indice."
+MOD_CG_SKILLSET_SUP_LABEL="Indice"
+MOD_CG_SKILLSET_CUSTOM_STYLE_LABEL="Custom Style"
+MOD_CG_SKILLSET_CUSTOM_STYLE_DESC="Selectionnez Oui pour définir vos couleurs."
+MOD_CG_SKILLSET_CUSTOM_COLORS_HEADING_LABEL="Custom Style"
+MOD_CG_SKILLSET_CUSTOM_COLORS_HEADING_DESC="Vous pouvez définir les couleurs et tailles de vos titres, nombres, symboles et icones."
+MOD_CG_SKILLSET_TITLE_COLOR_LABEL="Couleur titre"
+MOD_CG_SKILLSET_TITLE_SIZE_LABEL="Taille titre (Ex: 20)"
+MOD_CG_SKILLSET_NUMBER_COLOR_LABEL="Couleur nombres"
+MOD_CG_SKILLSET_NUMBER_SIZE_LABEL="Taille nombres (Ex: 20)"
+MOD_CG_SKILLSET_SYMBOL_COLOR_LABEL="Couleur symbole"
+MOD_CG_SKILLSET_SYMBOL_SIZE_LABEL="Taille symbole (Ex: 20)"
+MOD_CG_SKILLSET_ICON_COLOR_LABEL="Couleur icone"
+MOD_CG_SKILLSET_ICON_SIZE_LABEL="Taille icon (Ex: 20)"
+MOD_CG_SKILLSET_ANIMATION_FORM_LABEL="Animation colorée ?"
+MOD_CG_SKILLSET_ANIMATION_FORM_DESC="Selectionnez si vous souhaitez afficher une animation autour de votre compétence, et, si oui, sa forme (ronde ou rectangle). "
+MOD_CG_SKILLSET_ANIMATION_ROUND_LABEL="Rond"
+MOD_CG_SKILLSET_ANIMATION_RECTANGLE_LABEL="Rectangle"
+MOD_CG_SKILLSET_ANIMATION_STARTCOLOR_LABEL="Couleur début ?"
+MOD_CG_SKILLSET_ANIMATION_STARTCOLOR_DESC="Selectionnez la couleur au début de l'animation. Elle sera affichée avant que l'animation débute. (défaut=#8ee58e)"
+MOD_CG_SKILLSET_ANIMATION_PROGRESSCOLOR_LABEL="Couleur animation ?"
+MOD_CG_SKILLSET_ANIMATION_PROGRESSCOLOR_DESC="Selectionnez la couleur d'animation. Elle restera affichée autour de votre champ lorsque l'animation sera terminée. (défaut=#007eff)"
+MOD_CG_SKILLSET_ANIMBACK_COLOR_LABEL="Background color ?"
+MOD_CG_SKILLSET_ANIMBACK_COLOR_DESC="Selectionnez la couleur d'arrière-plan de votre champ (défaut #d3d3d3)"
+MOD_CG_SKILLSET_ANIMHEIGHT_LABEL="Height ?"
+MOD_CG_SKILLSET_ANIMHEIGHT_DESC="Enter rectangle height in px (default=120)"
diff --git a/language/fr-FR/mod_cg_skillset.sys.ini b/language/fr-FR/mod_cg_skillset.sys.ini
@@ -0,0 +1 @@
+MOD_CG_SKILLSET_XML_DESCRIPTION="CG SkillSet. Define up to 4 animated skill sets."
diff --git a/media/js/cg_skillset.js b/media/js/cg_skillset.js
@@ -70,7 +70,7 @@ const sizes = (EL) => {
     }
     if (options.animationShape == "rect") {
         EL.style.width=  (val + 40) + 'px';
-        EL.style.height= (val -10) + 'px';
+        EL.style.height= options.animationHeight + 'px';
         EL.style.borderRadius = "30%";
     }
 }

diff --git a/mod_cg_skillset.xml b/mod_cg_skillset.xml
@@ -3,7 +3,7 @@
 	<name>CG SkillSet</name>
 	<author>ConseilGouz</author>
 	<creationDate>2021-04-23</creationDate>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<authorEmail>pascal.leconte@conseilgouz.com</authorEmail>
 	<authorUrl>https://www.conseilgouz.com</authorUrl>
 	<description>MOD_CG_SKILLSET_XML_DESCRIPTION</description>
@@ -26,6 +26,8 @@
 	<languages folder="language">
 		<language tag="en-GB">en-GB/mod_cg_skillset.ini</language>
 		<language tag="en-GB">en-GB/mod_cg_skillset.sys.ini</language>
+		<language tag="fr-FR">fr-FR/mod_cg_skillset.ini</language>
+		<language tag="fr-FR">fr-FR/mod_cg_skillset.sys.ini</language>
 	</languages>
 	<config>
 		<fields name="params">
@@ -61,14 +63,25 @@
 				<field name="symbolSize" type="number" min="10" label="MOD_CG_SKILLSET_SYMBOL_SIZE_LABEL" hint="28" showon="customsStyle:1" default="28"  class="half gridauto"/>
 				<field name="iconColor" type="color" label="MOD_CG_SKILLSET_ICON_COLOR_LABEL" showon="customsStyle:1" default="#03a9f5"  class="half gridauto"/>
 				<field name="iconSize" type="number" min="10" label="MOD_CG_SKILLSET_ICON_SIZE_LABEL" hint="28" showon="customsStyle:1" default="28"  class="half gridauto"/>
-				<field name="animationShape" type="radio" label="MOD_CG_SKILLSET_ANIMATION_FORM_LABEL" showon="customsStyle:1" default="0" class="btn-group btn-group-yesno" >
+				<field name="animationShape" type="radio" 
+                    label="MOD_CG_SKILLSET_ANIMATION_FORM_LABEL" description="MOD_CG_SKILLSET_ANIMATION_FORM_DESC" 
+                    showon="customsStyle:1" default="0" class="btn-group btn-group-yesno" >
 					<option value="0">JNO</option>
 					<option value="round">MOD_CG_SKILLSET_ANIMATION_ROUND_LABEL</option>
 					<option value="rect">MOD_CG_SKILLSET_ANIMATION_RECTANGLE_LABEL</option>
                 </field>
-				<field name="animationStartColor" type="color" label="MOD_CG_SKILLSET_ANIMATION_STARTCOLOR_LABEL" showon="customsStyle:1[AND]animationShape!:0" default="#8ee58e"  class="half gridauto"/>
-				<field name="animationProgressColor" type="color" label="MOD_CG_SKILLSET_ANIMATION_PROGRESSCOLOR_LABEL" showon="customsStyle:1[AND]animationShape!:0" default="#007eff"  class="half gridauto"/>
-                <field name="animationBackground" type="color" label="MOD_CG_SKILLSET_ANIMBACK_COLOR_LABEL" showon="customsStyle:1[AND]animationShape!:0" default="#d3d3d3" class="half gridauto"/>
+				<field name="animationStartColor" type="color" 
+                    label="MOD_CG_SKILLSET_ANIMATION_STARTCOLOR_LABEL" description="MOD_CG_SKILLSET_ANIMATION_STARTCOLOR_DESC" 
+                    showon="customsStyle:1[AND]animationShape!:0" default="#8ee58e"  class="half gridauto"/>
+				<field name="animationProgressColor" type="color" 
+                    label="MOD_CG_SKILLSET_ANIMATION_PROGRESSCOLOR_LABEL" description="MOD_CG_SKILLSET_ANIMATION_PROGRESSCOLOR_DESC" 
+                    showon="customsStyle:1[AND]animationShape!:0" default="#007eff"  class="half gridauto"/>
+                <field name="animationBackground" type="color" 
+                    label="MOD_CG_SKILLSET_ANIMBACK_COLOR_LABEL" description="MOD_CG_SKILLSET_ANIMBACK_COLOR_DESC" 
+                    showon="customsStyle:1[AND]animationShape!:0" default="#d3d3d3" class="half gridauto"/>
+                <field name="animationHeight" type="number" min="10" default="120" 
+                    label="MOD_CG_SKILLSET_ANIMHEIGHT_LABEL"  description="MOD_CG_SKILLSET_ANIMHEIGHT_DESC"
+                    showon="customsStyle:1[AND]animationShape:rect" class="half gridauto"/>
             </fieldset>
 			<fieldset name="advanced">
 				<field name="layout" type="modulelayout" label="JFIELD_ALT_LAYOUT_LABEL" description="JFIELD_ALT_MODULE_LAYOUT_DESC" default="default" />

diff --git a/mod_cg_skillset_changelog.xml b/mod_cg_skillset_changelog.xml
@@ -1,4 +1,18 @@
 <changelogs>
+	<changelog>
+		<element>mod_cg_skillset</element>
+		<type>Module</type>
+		<version>1.1.1</version>
+        <note>
+            <item>Update : 23/04/2024</item>
+        </note>
+		<addition>
+			<item>Add FR language file</item>
+		</addition>
+        <change>
+            <item>Rectangle: define height</item>
+        </change>
+    </changelog>
 	<changelog>
 		<element>mod_cg_skillset</element>
 		<type>Module</type>

diff --git a/tmpl/default.php b/tmpl/default.php
@@ -39,7 +39,7 @@
 
 $customsStyle = $params->get('customsStyle');
 $animationShape = $params->get('animationShape', 0);
-$animationShape = $params->get('animationShape', 0);
+$animationHeight = $params->get('animationHeight', 120);
 
 $i = sizeof((array) $skillsets);
 $size = 12 / $i;
@@ -49,7 +49,8 @@
     array('id' => $module->id,'skillsets' => $i , 'customstyle' => $customsStyle,
     'titleSize' => $titleSize,'numberSize' => $numberSize,'symbolSize' => $symbolSize,
     'iconSize' => $iconSize,  'titleColor' => $titleColor, 'numberColor' => $numberColor,
-    'symbolColor' => $symbolColor, 'iconColor' => $iconColor, 'animationShape' => $animationShape)
+    'symbolColor' => $symbolColor, 'iconColor' => $iconColor, 
+    'animationShape' => $animationShape,'animationHeight' => $animationHeight)
 );
 
 ?>