Merge branch 'hotfix' into v2.0.0-rc

JoomShaper · Jun 24, 2020 · 9063b4b · 9063b4b
2 parents b4c206f + 12786ca
commit 9063b4b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/language/en-GB/en-GB.tpl_shaper_helixultimate.ini b/language/en-GB/en-GB.tpl_shaper_helixultimate.ini
@@ -1,6 +1,6 @@
 ;Template Name
 SHAPER_HELIXULTIMATE="Helix Ultimate <small style='font-size: 10px; color: #000;    position: absolute;
-    left: 170px;'>2.0.0</small>"
+    left: 170px;'>2.0.0-alpha.1</small>"
 
 ;Common
 HELIX_ULTIMATE_YES="Yes"

diff --git a/plugins/system/helixultimate/helixultimate.xml b/plugins/system/helixultimate/helixultimate.xml
@@ -10,7 +10,7 @@
   <license>http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later</license>
   <authorEmail>[email protected]</authorEmail>
   <authorUrl>www.joomshaper.com</authorUrl>
-  <version>2.0.0</version>
+  <version>2.0.0-alpha.1</version>
   <description>Helix Ultimate Framework - Joomla Template Framework by JoomShaper</description>
 
   <updateservers>

diff --git a/plugins/system/helixultimate/layouts/cpanel/editor/topbar.php b/plugins/system/helixultimate/layouts/cpanel/editor/topbar.php
@@ -9,6 +9,7 @@
 defined('_JEXEC') or die();
 
 use HelixUltimate\Framework\Platform\Settings;
+use HelixUltimate\Framework\Platform\Helper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
@@ -33,7 +34,7 @@
 			<div>
 				<svg xmlns="http://www.w3.org/2000/svg" class="hu-logo" width="82" height="24" fill="none"><path fill="#0345BF" fill-rule="evenodd" d="M6.976 15.448c-.039-.814.233-3.568 4.732-5.779 4.5-2.21 4.965-3.995 4.965-3.995-.465 2.444-1.241 3.143-5.508 5.43-4.066 2.182-4.189 4.344-4.189 4.344zM6.976 20.144s.123-2.162 4.19-4.344c4.266-2.288 5.042-2.987 5.507-5.43 0 0-.465 1.785-4.965 3.995-4.499 2.21-4.77 4.964-4.732 5.78z" clip-rule="evenodd"/><mask id="a" width="25" height="24" x="0" y="0" maskUnits="userSpaceOnUse"><path fill="#fff" d="M0 0h24.002v24H0V0z"/></mask><g mask="url(#a)"><path fill="#0345BF" fill-rule="evenodd" d="M12 23.999C5.385 23.999 0 18.616 0 12 0 5.382 5.384 0 12 0c6.618 0 12.002 5.383 12.002 12.001C24.002 18.616 18.617 24 12 24zm0-22.782C6.057 1.217 1.219 6.053 1.219 12c0 5.944 4.838 10.782 10.783 10.782 5.945 0 10.782-4.838 10.782-10.782 0-5.947-4.837-10.783-10.782-10.783z" clip-rule="evenodd"/></g><path fill="#000" fill-rule="evenodd" d="M40.96 13.988V9.403h-4.89v4.585h-3.004V2.182h3.005V7.04h4.89V2.182h2.997v11.806h-2.997zM48.475 4.544v2.347h5.631v2.362h-5.631v2.372h6.422v2.363H45.47V2.182h9.246v2.362h-6.241zM64 11.476v2.511h-8.01V2.183h3.005v9.294H64zM65.075 13.988h3.004V2.182h-3.004v11.806zM81.168 13.988h-3.59l-2.552-3.763-2.544 3.763h-3.49l4.215-6.035-3.944-5.771h3.491l2.272 3.44 2.28-3.44h3.524l-3.893 5.63 4.231 6.176z" clip-rule="evenodd"/><path fill="#525252" d="M37.02 18.318v3.717a1.883 1.883 0 01-.242.957c-.16.272-.386.481-.677.628-.29.145-.622.217-.999.217-.573 0-1.033-.155-1.38-.467-.343-.314-.522-.748-.534-1.301v-3.75h.456V22c0 .46.131.816.393 1.07.261.252.617.377 1.065.377.45 0 .803-.127 1.062-.38.262-.255.393-.61.393-1.063v-3.687h.464zM40.911 23.374h2.688v.389h-3.152v-5.445h.464v5.056zM49.292 18.711h-1.866v5.052h-.46V18.71h-1.862v-.393h4.188v.393zM52.88 23.763h-.46v-5.445h.46v5.445zM57.114 18.318l2.008 4.805 2.015-4.805h.614v5.445h-.46v-2.371l.037-2.43-2.027 4.8h-.355l-2.019-4.782.038 2.397v2.386h-.46v-5.445h.609zM68.28 22.237h-2.47l-.562 1.526h-.482l2.06-5.445h.438l2.06 5.445h-.478l-.565-1.526zm-2.329-.393h2.184l-1.092-2.965-1.092 2.965zM75.48 18.711h-1.865v5.052h-.46V18.71h-1.862v-.393h4.187v.393zM81.513 21.153h-2.546v2.22h2.928v.39h-3.388v-5.445h3.369v.393h-2.91v2.053h2.547v.389z"/></svg>
 			</div>
-			<span class="hu-version">2.0.0</span>
+			<span class="hu-version"><?php echo Helper::getVersion(); ?></span>
 		</div>
 	</div>
 	<div class="topbar-middle">

diff --git a/templates/shaper_helixultimate/templateDetails.xml b/templates/shaper_helixultimate/templateDetails.xml
@@ -10,7 +10,7 @@
     <authorUrl>http://www.joomshaper.com</authorUrl>
     <copyright>Copyright (C) 2010 - 2020 JoomShaper.com. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later</license>
-    <version>2.0.0</version>
+    <version>2.0.0-alpha.1</version>
     <description>Helix Ultimate - Starter Template of Helix Ultimate Framework</description>
 
     <updateservers>
@@ -65,25 +65,26 @@
     </positions>
 
     <files>
+        <file>comingsoon.php</file>
+        <file>component.php</file>
+        <file>error.php</file>
+        <file>helper.php</file>
         <file>index.php</file>
+        <file>offline.php</file>
+        <file>options.json</file>
+        <file>options.xml</file>
         <file>template_preview.png</file>
         <file>template_thumbnail.png</file>
-        <file>options.xml</file>
-        <file>options.json</file>
         <file>templateDetails.xml</file>
-        <file>offline.php</file>
-        <file>helper.php</file>
-        <file>component.php</file>
-        <file>comingsoon.php</file>
-        <file>error.php</file>
         <folder>css/</folder>
         <folder>features/</folder>
-        <folder>headers/</folder>
         <folder>fonts/</folder>
+        <folder>headers/</folder>
         <folder>html/</folder>
         <folder>images/</folder>
         <folder>js/</folder>
         <folder>scss/</folder>
+        <folder>webfonts/</folder>
     </files>
     <config>
         <fieldset name="basic"