Merge branch 'dev'

administrator/language/en-GB/en-GB.plg_system_helixultimate.ini

@@ -60,17 +60,17 @@ HELIX_ULTIMATE_TOPBAR_MSG_RESET_DRAFT="Reset"
 HELIX_ULTIMATE_TOPBAR_MSG_DRAFTED="Drafted"
 
 HELIX_ULTIMATE_ENABLE_OFFCANVAS_SEARCH="Enable Search"
-HELIX_ULTIMATE_ENABLE_OFFCANVAS_SEARCH_DESC="Enable search field to render at offcanvas."
+HELIX_ULTIMATE_ENABLE_OFFCANVAS_SEARCH_DESC="Enable search field to render at off-canvas."
 HELIX_ULTIMATE_ENABLE_OFFCANVAS_LOGIN="Enable Login"
-HELIX_ULTIMATE_ENABLE_OFFCANVAS_LOGIN_DESC="Enable login field to render at offcanvas."
+HELIX_ULTIMATE_ENABLE_OFFCANVAS_LOGIN_DESC="Enable login field to render at off-canvas."
 HELIX_ULTIMATE_ENABLE_OFFCANVAS_SOCIALS="Show Social Links"
-HELIX_ULTIMATE_ENABLE_OFFCANVAS_SOCIALS_DESC="Enable to show the social links to the offcanvas."
+HELIX_ULTIMATE_ENABLE_OFFCANVAS_SOCIALS_DESC="Enable to show the social links to the off-canvas."
 HELIX_ULTIMATE_ENABLE_OFFCANVAS_CONTACTS="Show Contact"
-HELIX_ULTIMATE_ENABLE_OFFCANVAS_CONTACTS_DESC="Enable to show the contact information to the offcanvas."
+HELIX_ULTIMATE_ENABLE_OFFCANVAS_CONTACTS_DESC="Enable to show the contact information to the off-canvas."
 
 ; Basics
 HELIX_ULTIMATE_FAVICON="Favicon"
-HELIX_ULTIMATE_FAVICON_DESC="Upload a 16px x 16px .png or .gif image that will be your favicon."
+HELIX_ULTIMATE_FAVICON_DESC="Upload a <code>16x16</code> <b>.png</b> or <b>.gif</b> image that will be your favicon."
 HELIX_ULTIMATE_PRELOADER="Preloader"
 HELIX_ULTIMATE_PRELOADER_LOADER_TYPE="Loader Type"
 HELIX_ULTIMATE_PRELOADER_LOADER_TYPE_DESC="Select a preloader animation."
@@ -137,8 +137,8 @@ HELIX_ULTIMATE_MENU_BADGE_BACKGROUND="Badge Background"
 HELIX_ULTIMATE_MENU_BADGE_COLOR="Badge Text Color"
 HELIX_ULTIMATE_PAGE_TITLE_HEADING="Heading H1 or H2"
 HELIX_ULTIMATE_PAGE_TITLE_HEADING_DESC="Set the page title to be either an &lt;h1&gt; or &lt;h2&gt; element."
-HELIX_ULTIMATE_SELECT_OFFCANVAS="Select Offcanvas"
-HELIX_ULTIMATE_SELECT_OFFCANVAS_DESC="Select an offcanvas for mobile menu."
+HELIX_ULTIMATE_SELECT_OFFCANVAS="Select Off-canvas"
+HELIX_ULTIMATE_SELECT_OFFCANVAS_DESC="Select an off-canvas for mobile menu."
 
 ;Page Title
 HELIX_ULTIMATE_PAGE_TITLE="Page Title"

gulpfile.js

@@ -2,6 +2,8 @@ const path = require('path');
 const { series, parallel, src, dest } = require('gulp');
 const del = require('del');
 const zip = require('gulp-zip');
+const minifyCss = require('gulp-clean-css');
+const uglify = require('gulp-uglify-es').default;
 
 /**
  * Configuration object.
@@ -11,10 +13,10 @@ const zip = require('gulp-zip');
 const config = {
 	srcPath: path.resolve(__dirname),
 	buildPath: path.resolve(__dirname, './package/'),
-	packageName: 'helix_ultimate_pkg_2.0.2.zip',
-	pluginPackageName: 'helix_ultimate_plugin_pkg_2.0.2.zip',
-	templatePackageName: 'helix_ultimate_template_pkg_2.0.2.zip',
-	templateFileExtensions: 'xml, json, php, png, scss, js, ico, svg, jpg, eot, ttf, woff, woff2, otf, css',
+	packageName: 'helix_ultimate_pkg_2.0.3.zip',
+	pluginPackageName: 'helix_ultimate_plugin_pkg_2.0.3.zip',
+	templatePackageName: 'helix_ultimate_template_pkg_2.0.3.zip',
+	templateFileExtensions: 'xml, json, php, png, scss, js, ico, svg, jpg, eot, ttf, woff, woff2, otf, css, html',
 	pluginFileExtensions: function () {
 		return this.templateFileExtensions + ', ini';
 	},
@@ -83,6 +85,33 @@ function buildPackage() {
 		.pipe(dest(config.buildPath));
 }
 
+function minifyPluginCss() {
+	return src([
+		`${config.buildPath}/plugins/system/assets/css/*.css`,
+		`!${config.buildPath}/plugins/system/assets/css/bootstrap.min.css`,
+	])
+		.pipe(minifyCss())
+		.pipe(dest(`${config.buildPath}/plugins/system/assets/css`));
+}
+
+function minifyPluginAdminCss() {
+	return src([
+		`${config.buildPath}/plugins/system/assets/css/admin/*.css`,
+		`!${config.buildPath}/plugins/system/assets/css/admin/*min.css`,
+	])
+		.pipe(minifyCss())
+		.pipe(dest(`${config.buildPath}/plugins/system/assets/css/admin`));
+}
+
+function minifyPluginAdminJs() {
+	return src([
+		`${config.buildPath}/plugins/system/assets/js/admin/*.js`,
+		`!${config.buildPath}/plugins/system/assets/js/admin/*.min.js`,
+	])
+		.pipe(uglify())
+		.pipe(dest(`${config.buildPath}/plugins/system/assets/js/admin`));
+}
+
 function buildPkgForPlugin() {
 	return src(`${config.buildPath}/plugins/system/**`)
 		.pipe(zip(config.pluginPackageName))
@@ -112,6 +141,7 @@ exports.default = series(
 		series(templateLanguageStreamTask, templateStreamTask),
 		series(pluginStreamTask, templatePluginLanguageStreamTask)
 	),
+	parallel(minifyPluginCss, minifyPluginAdminCss, minifyPluginAdminJs),
 	parallel(buildPackage, buildPkgForPlugin, buildPkgForTemplate),
 	clear
 );

language/en-GB/en-GB.tpl_shaper_helixultimate.ini

@@ -292,9 +292,10 @@ HELIX_ULTIMATE_NAVIGATION="Menu"
 HELIX_ULTIMATE_GROUP_MENUBUILDER="Menu Builder"
 HELIX_ULTIMATE_OFFCANVAS="Off-canvas"
 HELIX_ULTIMATE_MEGAMENU_SELECT="Select Menu Type"
-HELIX_ULTIMATE_OFFCANVAS_MENU="Select Offcanvas Menu"
+HELIX_ULTIMATE_OFFCANVAS_MENU="Select Off-canvas Menu"
+HELIX_ULTIMATE_OFFCANVAS_MENU_DESC="Select the menu type you want to show at the off-canvas. <b>This is applicable if you do not publish any module at the offcanvas position.</b>"
 HELIX_ULTIMATE_OFFCANVAS_MAX_LEVEL="Maximum Level"
-HELIX_ULTIMATE_OFFCANVAS_MAX_LEVEL_DESC="Set the maximum level of menu items."
+HELIX_ULTIMATE_OFFCANVAS_MAX_LEVEL_DESC="Set the maximum level of menu items. <b>This is applicable if you do not publish any module at the offcanvas position.</b>"
 HELIX_ULTIMATE_MENU_TYPE="Menu Type"
 HELIX_ULTIMATE_MENU_TYPE_DESC="Select a suitable menu type from the list. You need to add a module to the off-canvas position from the Module Manager."
 HELIX_ULTIMATE_MENU_BUILDER="Menu Builder"
@@ -323,8 +324,8 @@ HELIX_ULTIMATE_ENABLE_BOXED_LAYOUT_DESC="Enable this option for boxed layout."
 
 
 ;Frontned
-HELIX_ULTIMATE_NO_MODULE_OFFCANVAS="Publish modules to the &quot;offcanvas&quot; position."
-HELIX_ULTIMATE_CLOSE_OFFCANVAS_ARIA_LABEL="Close Offcanvas"
+HELIX_ULTIMATE_NO_MODULE_OFFCANVAS="Publish modules to the &quot;off-canvas&quot; position."
+HELIX_ULTIMATE_CLOSE_OFFCANVAS_ARIA_LABEL="Close Off-canvas"
 HELIX_ULTIMATE_COMMENTS="Comments"
 HELIX_ULTIMATE_ARTICLE_RATINGS="Ratings"
 HELIX_ULTIMATE_RATINGS_COUNT="Ratings"