Release 1.11.0

com_jdbuilder/administrator/helpers/jdbuilder.php

@@ -6,6 +6,9 @@
  * @copyright  2020 www.joomdev.com
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
+
+use JDPageBuilder\Helper;
+
 // No direct access
 defined('_JEXEC') or die;
 
@@ -101,7 +104,7 @@ public static function versionMessage()
       $buiderConfig = JComponentHelper::getParams('com_jdbuilder');
       $key = $buiderConfig->get('key',  '');
       $isPro = file_exists(JPATH_PLUGINS . '/system/jdbuilder/options/default-pro.xml');
-    
+
       if ($isPro && !empty($key)) {
          return;
       }
@@ -114,4 +117,18 @@ public static function versionMessage()
          <h4>' . JText::_('COM_JDBUILDER_VER_MSG_' . $prefix . '_TITLE') . '</h4>
          <p>' . JText::_('COM_JDBUILDER_VER_MSG_' . $prefix . '_DESC') . '</p></div></div>';
    }
+
+   public static function updateMessage()
+   {
+      $latest = Helper::getJDBuilderLatestVersion();
+      if ($latest == 'v' . JDB_VERSION) return '';
+      $isPro = file_exists(JPATH_PLUGINS . '/system/jdbuilder/options/default-pro.xml');
+
+      $document = JFactory::getDocument();
+      $document->addStyleDeclaration('.jdb-update-message{background-image:linear-gradient(110.7deg, #233879 6.3%, #385cc7 90.6%);box-shadow:8px 8px 8px rgba(221, 221, 221, 0.81);overflow:hidden;border-radius:4px;display:flex;color:#fff;margin-bottom:25px;line-height: 1.5rem;font-size:14px;}.jdb-update-message h4{font-size:16px;margin:0 0 10px;}body.admin.com_jdbuilder #content .jdb-update-message a{color:#fff;}.jdb-update-logo{color: white;width: 100px;display: grid;align-items: center;padding: 15px;box-sizing: border-box;background-image:linear-gradient(110.7deg, #233879 6.3%, #385cc7 90.6%);margin-right:10px;}.jdb-content{padding:20px 10px;align-self:center;}.jdb-content p{color:#f1f1f1;margin:0;}.jdb-content strong{color:#fff;}');
+
+      $link = $isPro ? 'https://www.joomdev.com/my-downloads/jd-builder-pro' : 'https://github.com/joomdev/JD-Builder/releases/tag/' . $latest;
+      return '<div style="padding-right: 10px;" class="alert alert-danger">
+         <div style="display:flex;justify-content:space-between;align-items:center">' . JText::sprintf('COM_JDBUILDER_UPDATE_MSG', ('v' . JDB_VERSION), $latest, $link) . '</div></div>';
+   }
 }

com_jdbuilder/administrator/languages/en-GB/en-GB.com_jdbuilder.ini

@@ -36,6 +36,8 @@ COM_JDBUILDER_TITLE_INTEGRATIONS="Integrations"
 COM_JDBUILDER_TITLE_SETTINGS="Settings"
 COM_JDBUILDER_ARTICLE_INTEGRATION_ENABLED="Joomla article's JD Builder integration has been successfully enabled."
 COM_JDBUILDER_ARTICLE_INTEGRATION_DISABLED="Joomla article's JD Builder integration has been successfully disabled."
+COM_JDBUILDER_FA_INTEGRATION_ENABLED="FontAwesome Pro has been successfully enabled."
+COM_JDBUILDER_FA_INTEGRATION_DISABLED="FontAwesome Pro has been successfully disabled."
 COM_JDBUILDER_PAGES_ID="ID"
 COM_JDBUILDER_PAGES_CHECKED_OUT="N/A"
 COM_JDBUILDER_PAGES_CHECKED_OUT_TIME="N/A"
@@ -94,13 +96,20 @@ COM_JDBUILDER_VER_MSG_FREE_DESC="30+ premium elements, Priority email support, L
 COM_JDBUILDER_VER_MSG_PRO_TITLE="Unlock JD Builder by adding license key."
 COM_JDBUILDER_VER_MSG_PRO_DESC="Hello, In order to use the premium features and receive auto-updates, you need to add your license key. <a href='index.php?option=com_config&view=component&component=com_jdbuilder'><strong>Activate JD Builder Pro</strong></a>"
 
+COM_JDBUILDER_UPDATE_MSG="<span>You are using outdated version of JD Builder %s. Please update to the latest version <strong>%s</strong></span><a style='color:#fff' class='btn btn-sm btn-danger' href='%s' target='_blank'>Download Updates</a>"
+
 JDB_ACTIVATION_KEY="Builder Pro Activation Key"
 JDB_GOOGLE_MAP_KEY="Google Map API Key"
 JDB_FB_APP_ID="Facebook App ID"
 JDB_JOOMLA_ARTICLES_INTEGRATION="Joomla Articles Integration"
+JDB_JOOMLA_FA_INTEGRATION="FontAwesome Pro"
 JDB_DEBUG_BUILDER="Debug Builder"
 
 JDB_FIELD_SPACER="<hr>"
 
 JDB_RECAPTCHA_SITE_KEY="reCAPTCHA Site Key"
-JDB_RECAPTCHA_SECRET_KEY="reCAPTCHA Secret Key"
+JDB_RECAPTCHA_SECRET_KEY="reCAPTCHA Secret Key"
+
+COM_JDBUILDER_PRO_FEATURE_WARNING="<div style='display:flex;justify-content: space-between;'><span>You are using free version of JD Builder. In order to use this feature please update to the pro version.</span><a style='color:#fff;display:inline-block;text-decoration:underline' href='https://www.joomdev.com/jd-builder/pricing?utm_source=Builder_Admin&utm_medium=Intergrations&utm_campaign=Builder_Pro' target='_blank'>Go Pro</a></div>"
+
+COM_JDBUILDER_FA_PRO_DESC="<span>Font Awesome Pro <a href='#'>license</a> is required and you need to <a href='#'>whitelist</a> your domain</span>"

com_jdbuilder/administrator/views/pages/tmpl/default.php

@@ -42,10 +42,12 @@
       <div id="j-main-container" class="span10">
       <?php
       echo JdbuilderHelper::versionMessage();
+      echo JdbuilderHelper::updateMessage();
    else : ?>
          <div id="j-main-container">
          <?php
          echo JdbuilderHelper::versionMessage();
+         echo JdbuilderHelper::updateMessage();
       endif; ?>
 
          <?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>

com_jdbuilder/jdbuilder.xml

@@ -8,7 +8,7 @@
    <author>Team Joomdev</author>
    <authorEmail>[email protected]</authorEmail>
    <authorUrl>https://www.joomdev.com</authorUrl>
-   <version>1.10.1</version>
+   <version>1.11.0</version>
    <description>{jdbcomdesc}</description>
    <install> <!-- Runs on install -->
       <sql>

com_jdbuilder_j4/admin/languages/en-GB/en-GB.com_jdbuilder.ini

@@ -37,6 +37,8 @@ COM_JDBUILDER_TITLE_INTEGRATIONS="Integrations"
 COM_JDBUILDER_TITLE_SETTINGS="Settings"
 COM_JDBUILDER_ARTICLE_INTEGRATION_ENABLED="Joomla article's JD Builder integration has been successfully enabled."
 COM_JDBUILDER_ARTICLE_INTEGRATION_DISABLED="Joomla article's JD Builder integration has been successfully disabled."
+COM_JDBUILDER_FA_INTEGRATION_ENABLED="FontAwesome Pro has been successfully enabled."
+COM_JDBUILDER_FA_INTEGRATION_DISABLED="FontAwesome Pro has been successfully disabled."
 COM_JDBUILDER_PAGES_ID="ID"
 COM_JDBUILDER_PAGES_CHECKED_OUT="N/A"
 COM_JDBUILDER_PAGES_CHECKED_OUT_TIME="N/A"
@@ -95,13 +97,20 @@ COM_JDBUILDER_VER_MSG_FREE_DESC="30+ premium elements, Priority email support, L
 COM_JDBUILDER_VER_MSG_PRO_TITLE="Unlock JD Builder by adding license key."
 COM_JDBUILDER_VER_MSG_PRO_DESC="Hello, In order to use the premium features and receive auto-updates, you need to add your license key. <a href='index.php?option=com_config&view=component&component=com_jdbuilder'><strong>Activate JD Builder Pro</strong></a>"
 
+COM_JDBUILDER_UPDATE_MSG="<span>You are using outdated version of JD Builder %s. Please update to the latest version <strong>%s</strong></span><a style='color:#fff' class='btn btn-sm btn-danger' href='%s' target='_blank'>Download Updates</a>"
+
 JDB_ACTIVATION_KEY="Builder Pro Activation Key"
 JDB_GOOGLE_MAP_KEY="Google Map API Key"
 JDB_FB_APP_ID="Facebook App ID"
 JDB_JOOMLA_ARTICLES_INTEGRATION="Joomla Articles Integration"
+JDB_JOOMLA_FA_INTEGRATION="FontAwesome Pro"
 JDB_DEBUG_BUILDER="Debug Builder"
 
 JDB_FIELD_SPACER="<hr>"
 
 JDB_RECAPTCHA_SITE_KEY="reCAPTCHA Site Key"
-JDB_RECAPTCHA_SECRET_KEY="reCAPTCHA Secret Key"
+JDB_RECAPTCHA_SECRET_KEY="reCAPTCHA Secret Key"
+
+COM_JDBUILDER_PRO_FEATURE_WARNING="<div style='display:flex;justify-content: space-between;'><span>You are using free version of JD Builder. In order to use this feature please update to the pro version.</span><a style='color:#fff;display:inline-block;text-decoration:underline' href='https://www.joomdev.com/jd-builder/pricing?utm_source=Builder_Admin&utm_medium=Intergrations&utm_campaign=Builder_Pro' target='_blank'>Go Pro</a></div>"
+
+COM_JDBUILDER_FA_PRO_DESC="<span>Font Awesome Pro <a href='#'>license</a> is required and you need to <a href='#'>whitelist</a> your domain</span>"

com_jdbuilder_j4/jdbuilder.xml

@@ -8,7 +8,7 @@
 	<author>Team Joomdev</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomdev.com</authorUrl>
-	<version>1.10.0</version>
+	<version>1.11.0</version>
 	<description>{jdbcomdesc}</description>
 	<namespace>Joomdev\Component\JDBuilder</namespace>
 

com_jdbuilder_j4/media/scss/bootstrap.scss

@@ -681,11 +681,15 @@ body {
    border: 1px solid #eee;
    box-shadow: 0px 0px 10px #eee;
    border-radius: 5px;
-   margin: 20px 0px;
+   margin: 20px;
+   display: inline-flex;
+   flex-direction: column;
+   justify-content: center;
+   align-items: center;
+   text-align: center;
 
    >.item-icon {
       width: 80px;
-      margin: auto;
       margin-bottom: 10px;
    }
 

mod_jdbuilder/mod_jdbuilder.xml

@@ -7,7 +7,7 @@
     <authorUrl>https://www.joomdev.com</authorUrl>
     <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-    <version>1.10.1</version>
+    <version>1.11.0</version>
     <description>This Module allows you to create your own Module using the JD Builder.</description>
     <files>
         <filename>mod_jdbuilder.xml</filename>

mod_jdbuilder/tmpl/default.php

@@ -16,4 +16,5 @@
     $rendered = $layout->render();
     \JDPageBuilder\Builder::renderHead();
     echo $rendered;
+    JDPageBuilder\Builder::onBeforeBodyClose();
 }

pkg_jdbuilder.xml

@@ -7,7 +7,7 @@
    <packagerurl>https://www.joomdev.com</packagerurl>
    <author>Team JoomDev</author>
    <creationDate>Oct 2020</creationDate>
-   <version>1.10.1</version>
+   <version>1.11.0</version>
    <url>https://www.joomdev.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>

plg_jdbuilder/elements/icon-list/tmpl/default.js

@@ -40,8 +40,8 @@
         if (alignment != null) {
             JDBRenderer.DEVICES.forEach(function (_deviceObj) {
                 if (_deviceObj.key in alignment) {
-                    ListContainer.addCss('text-align', alignment[_deviceObj.key], _deviceObj.type);
                     ListItem.addCss('justify-content', alignment[_deviceObj.key] == 'left' ? 'flex-start' : (alignment[_deviceObj.key] == 'right' ? 'flex-end' : 'center'), _deviceObj.type);
+                    ListItems.addCss('justify-content', alignment[_deviceObj.key] == 'left' ? 'flex-start' : (alignment[_deviceObj.key] == 'right' ? 'flex-end' : 'center'), _deviceObj.type);
                 }
             });
         }

plg_jdbuilder/elements/icon-list/tmpl/default.php

@@ -44,8 +44,8 @@
 if ($alignment != null) {
     foreach (\JDPageBuilder\Helper::$devices as $deviceKey => $device) {
         if (isset($alignment->{$deviceKey})) {
-            $ListContainer->addCss('text-align', $alignment->{$deviceKey}, $device);
             $ListItem->addCss('justify-content', $alignment->{$deviceKey} == 'left' ? 'flex-start' : ($alignment->{$deviceKey} == 'right' ? 'flex-end' : 'center'), $device);
+            $ListItems->addCss('justify-content', $alignment->{$deviceKey} == 'left' ? 'flex-start' : ($alignment->{$deviceKey} == 'right' ? 'flex-end' : 'center'), $device);
         }
     }
 }

plg_jdbuilder/elements/image/image.xml

@@ -46,7 +46,7 @@
                <option value="right" icon="fa fa-align-right">JDB_RIGHT</option>
             </field>
 
-            <field name="linkType" type="radio" radiotype="buttons" label="JDB_LINK_LABEL" default="" group="basic">
+            <field name="linkType" type="radio" radiotype="buttons" label="JDB_LINK_LABEL" default="none" group="basic">
                <option value="none">JDB_NONE</option>
                <option value="media">JDB_MEDIA_FILE</option>
                <option value="">JDB_CUSTOM_URL</option>