Jollyany 3.5.24

templaza · Mar 11, 2024 · 6e63153 · 6e63153
1 parent f5065ef
commit 6e63153
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/framework/fields/jollyanyimport.php b/framework/fields/jollyanyimport.php
@@ -45,10 +45,12 @@ protected function getInput() {
 			$comingsoon =   $value['category'] == 'comingsoon' ? '_COMINGSOON' : '';
 			$tpl_code   =   JollyanyFrameworkDataImport::getConvertCode($index);
             $current_version    =   JollyanyFrameworkHelper::getExtVersion($tpl_code);
+            $download   =   isset($value['download']) && $value['download'] ? $value['download'] : 'https://www.templaza.com/download/joomla-templates.html';
+            $type       =   isset($value['type']) && $value['type'] == 'free' ? ' Free' : '';
 			$data   =  '<div class="col-12 col-md-6 col-lg-6">';
 			$data   .=  '<div class="card '.$tpl_code.'">';
 			$data   .=  '<img data-src="'.$value['thumb'].'" data-width="590" data-height="555" class="card-img-top" alt="'.$value['name'].'" data-uk-img />';
-			$data   .=  '<div class="card-body"><h6 class="card-title">'.$value['name'].($current_version ? ' <span class="badge rounded-pill text-bg-primary">'.JText::_('JOLLYANY_INSTALLED_VERSION') . ': '.$current_version.'</span>' : '').'</h6><p class="card-text form-text">'.$value['desc'].'</p><div class="btn-group" role="group" aria-label="Install Action"><a href="#" class="btn btn-sm btn-as btn-primary intall-package'.$clsstatus.'"  data-token="'.JSession::getFormToken().'" data-name="'.$value['name'].'" data-file="'.$index.'" data-status="'.$activated.'"'.$status.'>'.JText::_('JOLLYANY_ACTION_INSTALL_PACKAGE'.$comingsoon).'</a><a href="'.$value['demo_url'].'" class="btn btn-as btn-outline-primary'.$clsstatus.'" target="_blank"'.$status.'>'.JText::_('JOLLYANY_ACTION_DEMO_URL').'</a><a href="https://www.templaza.com/download/joomla-templates.html" class="btn btn-sm btn-as btn-outline-primary'.$clsstatus.'" target="_blank"'.$status.'>'.JText::_('JOLLYANY_ACTION_DOWNLOAD_URL').'</a></div></div>';
+			$data   .=  '<div class="card-body"><h6 class="card-title">'.$value['name'].($current_version ? ' <span class="badge rounded-pill text-bg-primary">'.JText::_('JOLLYANY_INSTALLED_VERSION') . ': '.$current_version.'</span>' : '').'</h6><p class="card-text form-text">'.$value['desc'].'</p><div class="btn-group" role="group" aria-label="Install Action"><a href="#" class="btn btn-sm btn-as btn-primary intall-package'.$clsstatus.'"  data-token="'.JSession::getFormToken().'" data-name="'.$value['name'].'" data-file="'.$index.'" data-status="'.$activated.'"'.$status.'>'.JText::_('JOLLYANY_ACTION_INSTALL_PACKAGE'.$comingsoon).'</a><a href="'.$value['demo_url'].'" class="btn btn-as btn-outline-primary'.$clsstatus.'" target="_blank"'.$status.'>'.JText::_('JOLLYANY_ACTION_DEMO_URL').'</a><a href="'.$download.'" class="btn btn-sm btn-as btn-outline-primary'.$clsstatus.'" target="_blank"'.$status.'>'.JText::_('JOLLYANY_ACTION_DOWNLOAD_URL'). $type.'</a></div></div>';
 			$data   .=  '</div>';
 			$data   .=  '</div>';
 			$html[] =   $data;

diff --git a/framework/importer/data.php b/framework/importer/data.php
@@ -94,6 +94,32 @@ public static function getConvertCode($key) {
 
 	public static function getData() {
 	    self::$data   =   array(
+            'astroid_template_two'      =>  array(
+                // Pack Info
+                'name'        => 'Two',
+                'desc'        => 'Free Astroid Joomla Template',
+
+                // Pack Data
+                'thumb'       => '/images/stories/two/thumbnail.jpg',
+                'category'    => 'joomla',
+                'type'        => 'free',
+                'download'    => 'https://github.com/templaza/astroid-framework/releases/latest',
+
+                'demo_url'    => 'https://demo.astroidframe.work/',
+                'doc_url'     => 'https://docs.astroidframe.work/',
+
+                'joomla_version'     => array(4,5),
+
+                'template'      => array(
+                    'name'      =>  'Astroid Two Template',
+                    'type'      =>  'included',
+                    'code'      =>  'astroid_template_two',
+                    'ext_code'  =>  'astroid-template-two-api',
+                ),
+
+                'extensions'  => array(
+                ),
+            ),
             'tz_probike'      =>  array(
                 // Pack Info
                 'name'        => 'ProBike',

diff --git a/framework/options/dashboard.xml b/framework/options/dashboard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
     <fields name="params" addfieldpath="/libraries/astroid/framework/fields">
-        <fieldset label="JOLLYANY_OPTIONS_DASHBOARD" icon="fas fa-cloud" name="dashboard" addfieldpath="/libraries/jollyany/framework/fields" order="13">
+        <fieldset label="JOLLYANY_OPTIONS_DASHBOARD" icon="fas fa-cloud" name="dashboard" addfieldpath="/libraries/jollyany/framework/fields" order="1">
 
             <field type="astroidgroup" name="dashboard" title="JOLLYANY_WELCOME" description="JOLLYANY_OPTIONS_LICENSE_DESC" />
             <field type="astroidgroup" name="jollyanyexts" title="JOLLYANY_DATA_EXTENSIONS" description="JOLLYANY_OPTIONS_IMPORT_EXTENSIONS_DESC" />

diff --git a/jollyany.xml b/jollyany.xml
@@ -3,8 +3,8 @@
    <name>Jollyany Framework</name>
    <libraryname>jollyany</libraryname>
    <author>TemPlaza</author>
-   <creationDate>February 2024</creationDate>
-   <version>3.5.23</version>
+   <creationDate>March 2024</creationDate>
+   <version>3.5.24</version>
    <url>https://www.templaza.com</url>
    <copyright>Copyright (C) 2024 TemPlaza, Jsc. All rights reserved.</copyright>
    <license>GNU General Public License version 3 or later; see LICENSE.txt</license>

diff --git a/jollyany_framework.xml b/jollyany_framework.xml
@@ -1,13 +1,13 @@
 <updates>
     <update>
         <name>Jollyany Framework</name>
-        <version>3.5.23</version>
+        <version>3.5.24</version>
         <infourl title="Jollyany Releases">https://github.com/templaza/jollyany-framework/releases</infourl>
         <element>jollyany</element>
         <type>library</type>
         <client>0</client>
         <downloads>
-            <downloadurl type="full" format="zip">https://github.com/templaza/jollyany-framework/releases/download/v3.5.23/jollyany-framework-3.5.23.zip</downloadurl>
+            <downloadurl type="full" format="zip">https://github.com/templaza/jollyany-framework/releases/download/v3.5.24/jollyany-framework-3.5.24.zip</downloadurl>
         </downloads>
         <tags>
             <tag>stable</tag>