diff --git a/language/en-GB/mod_cg_zoompage.ini b/language/en-GB/mod_cg_zoompage.ini index 349180b..b5df6b9 100644 --- a/language/en-GB/mod_cg_zoompage.ini +++ b/language/en-GB/mod_cg_zoompage.ini @@ -1,7 +1,10 @@ -CG_XML_ZOOM_DESCRIPTION="

CG Zoom Page version 2.1.0 : increase/decrease your page size

" +CG_XML_ZOOM_DESCRIPTION="

CG Zoom Page : increase/decrease your page size

" CG_INC="Zoom Increment" CG_INC_DESC="Select increment to apply at each click." CG_ICON_COLOR="Icons color" CG_ICON_COLOR_DESC="Select your icons' color." CG_ICON_HEIGHT="Icons size" -CG_ICON_HEIGHT_DESC="Select your icons' size (default: 2.5 em)" \ No newline at end of file +CG_ICON_HEIGHT_DESC="Select your icons' size (default: 2.5 em)" +CG_ZOOM_INCREASE="Increase page size" +CG_ZOOM_RESTORE="Back to default style" +CG_ZOOM_DECREASE="Decrease page size" \ No newline at end of file diff --git a/language/en-GB/mod_cg_zoompage.sys.ini b/language/en-GB/mod_cg_zoompage.sys.ini index a6c895c..23c0d32 100644 --- a/language/en-GB/mod_cg_zoompage.sys.ini +++ b/language/en-GB/mod_cg_zoompage.sys.ini @@ -1,2 +1,2 @@ -CG_XML_ZOOM_DESCRIPTION="

CG Zoom Page version 2.1.0 : agrandit/Diminue une page

" +CG_XML_ZOOM_DESCRIPTION="

CG Zoom Page : increase/decrease page size.

" diff --git a/language/fr-FR/mod_cg_zoompage.ini b/language/fr-FR/mod_cg_zoompage.ini index f04c8df..d6263a9 100644 --- a/language/fr-FR/mod_cg_zoompage.ini +++ b/language/fr-FR/mod_cg_zoompage.ini @@ -1,7 +1,10 @@ -CG_XML_ZOOM_DESCRIPTION="

CG Zoom Page version 2.1.0 : agrandit/diminue une page

" +CG_XML_ZOOM_DESCRIPTION="

CG Zoom Page : agrandit/diminue une page

" CG_INC="Incrément du zoom" CG_INC_DESC="Sélectionnez l'incrément à appliquer sur votre page à chaque click." CG_ICON_COLOR="Couleur des icônes" CG_ICON_COLOR_DESC="Sélectionnez la couleur de vos icônes" CG_ICON_HEIGHT="Taille des icônes" -CG_ICON_HEIGHT_DESC="Sélectionnez la taille des icônes (défaut: 2.5 em)" \ No newline at end of file +CG_ICON_HEIGHT_DESC="Sélectionnez la taille des icônes (défaut: 2.5 em)" +CG_ZOOM_INCREASE="Agrandir la page" +CG_ZOOM_RESTORE="Revenir au style par défaut" +CG_ZOOM_DECREASE="Diminuer la page" \ No newline at end of file diff --git a/language/fr-FR/mod_cg_zoompage.sys.ini b/language/fr-FR/mod_cg_zoompage.sys.ini index a8f3a8e..662e4e3 100644 --- a/language/fr-FR/mod_cg_zoompage.sys.ini +++ b/language/fr-FR/mod_cg_zoompage.sys.ini @@ -1 +1 @@ -CG_XML_ZOOM_DESCRIPTION="

CG Zoom Page version 2.1.0 : agrandit/Diminue une page

" +CG_XML_ZOOM_DESCRIPTION="

CG Zoom Page : agrandit/Diminue une page

" diff --git a/mod_cg_zoompage.xml b/mod_cg_zoompage.xml index 8d1c9cc..26def50 100644 --- a/mod_cg_zoompage.xml +++ b/mod_cg_zoompage.xml @@ -2,9 +2,9 @@ CG Zoom Page ConseilGouz - 2.1.0 + 2.1.1 CG_XML_ZOOM_DESCRIPTION - 2023/05/27 + 2023/07/31 mod_cg_zoompage.xml mod_cg_zoompage.php @@ -22,19 +22,20 @@ js index.html - Joomla\Module\CGZoomPage + ConseilGouz\Module\CGZoomPage script.php https://raw.githubusercontent.com/conseilgouz/mod_cg_zoompage_j4/master/mod_cg_zoompage_changelog.xml -
- +
+ + - + diff --git a/mod_cg_zoompage_changelog.xml b/mod_cg_zoompage_changelog.xml index 6930f60..80ae09b 100644 --- a/mod_cg_zoompage_changelog.xml +++ b/mod_cg_zoompage_changelog.xml @@ -1,4 +1,23 @@ + + mod_cg_zoompage + Module + 2.1.1 + + Update : 31/07/2023 + + + Joomla 5.x compatibility + Namespace ConseilGouz instead of Joomla + remove Zoom increment/Icons size list sizes + + + Use Webassets + + + Display dynamic version number + + mod_cg_zoompage Module diff --git a/script.php b/script.php index ceaa3b0..21d358d 100644 --- a/script.php +++ b/script.php @@ -1,7 +1,7 @@ dir = __DIR__; @@ -137,7 +138,7 @@ private function passMinimumPHPVersion() } private function uninstallInstaller() { - if ( ! JFolder::exists(JPATH_PLUGINS . '/system/' . $this->installerName)) { + if ( ! is_dir(JPATH_PLUGINS . '/system/' . $this->installerName)) { return; } $this->delete([ diff --git a/src/Field/VersionField.php b/src/Field/VersionField.php new file mode 100644 index 0000000..e8b454f --- /dev/null +++ b/src/Field/VersionField.php @@ -0,0 +1,75 @@ +def('extension'); + + $version = ''; + + $jinput = Factory::getApplication()->input; + $db = Factory::getDBO(); + $query = $db->getQuery(true); + $query + ->select($db->quoteName('manifest_cache')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . '=' . $db->Quote($extension)); + $db->setQuery($query, 0, 1); + $row = $db->loadAssoc(); + $tmp = json_decode($row['manifest_cache']); + $version = $tmp->version; + /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */ + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + + $css = ''; + $css .= ".version {display:block;text-align:right;color:brown;font-size:10px;}"; + $css .= ".readonly.plg-desc {font-weight:normal;}"; + $css .= "fieldset.radio label {width:auto;}"; + $wa->addInlineStyle($css); + $margintop = $this->def('margintop'); + if (StringHelper::strlen($margintop)) { + $js = "document.addEventListener('DOMContentLoaded', function() { + vers = document.querySelector('.version'); + parent = vers.parentElement.parentElement; + parent.style.marginTop = '".$margintop."'; + })"; + $wa->addInlineScript($js); + } + $return .= '' . Text::_('JVERSION') . ' ' . $version . ""; + + return $return; + } + public function def($val, $default = '') + { + return ( isset( $this->element[$val] ) && (string) $this->element[$val] != '' ) ? (string) $this->element[$val] : $default; + } + +} diff --git a/src/Field/index.html b/src/Field/index.html new file mode 100644 index 0000000..9854954 --- /dev/null +++ b/src/Field/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Helper/CGZoompageHelper.php b/src/Helper/CGZoompageHelper.php index b9fbd51..acf1bb3 100644 --- a/src/Helper/CGZoompageHelper.php +++ b/src/Helper/CGZoompageHelper.php @@ -1,14 +1,14 @@ \ No newline at end of file diff --git a/src/index.html b/src/index.html new file mode 100644 index 0000000..9854954 --- /dev/null +++ b/src/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tmpl/default.php b/tmpl/default.php index 09cfac3..ba6e874 100644 --- a/tmpl/default.php +++ b/tmpl/default.php @@ -9,6 +9,8 @@ */ // No direct access defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; + $zoom_in = $params->get('zoom'); $font_color = $params->get('font-color','#52c0ff'); $icon_size = $params->get('icon-size','2.5'); @@ -16,13 +18,13 @@
- + - + - +