Merge pull request #13 from hiteshaggarwal/master

hiteshaggarwal · web-flow · commit e54f34afc4c0 · 2018-08-16T13:24:40.000+05:30
v1.2.1
diff --git a/README.md b/README.md
@@ -970,7 +970,7 @@ You can use the Custom CSS to customize the appearance.
 ## Frontend Folder Overrides
 By default in astroid framework, majority of the HTML rendered can be edited via the /frontend/ folder in your template. However, updating astroid to newer version would overwrite your modifications with that or core astroid files.
 
-Starting Astroid 1.2.0, You can override the frontend folder as well.
+Starting Astroid 1.2.1, You can override the frontend folder as well.
 
 If you'd like to override the the header layout file **header.php**
 ```html
@@ -988,7 +988,7 @@ and that should do it, the overrides are applicable to all files under the front
 
 Here is record of all notable changes made to a Astroid Framework.
 
-## v1.2.0
+## v1.2.1
 
 * Social Profile list ordering
 * Missing Social icons added in Social Profile list
diff --git a/astroid/astroid-framework/astroid.xml b/astroid/astroid-framework/astroid.xml
@@ -5,7 +5,7 @@
    <libraryname>astroid</libraryname>
    <author>JoomDev</author>
    <creationDate>July 2018</creationDate>
-   <version>1.2.0</version>
+   <version>1.2.1</version>
    <url>http://astroidframework.com</url>
    <copyright>Copyright (C) 2018 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/astroid/astroid-framework/framework/constants.php b/astroid/astroid-framework/framework/constants.php
@@ -10,7 +10,7 @@
 
 class AstroidFrameworkConstants {
 
-   public static $astroid_version = '1.2.0';
+   public static $astroid_version = '1.2.1';
    public static $fontawesome_version = '5.2.0';
    public static $animatecss_version = '3.6';
    public static $animations = [
diff --git a/astroid/astroid-framework/framework/menu.php b/astroid/astroid-framework/framework/menu.php
@@ -12,7 +12,7 @@
 
 class AstroidMenu {
 
-   public static function getMenu($menutype = '', $nav_class = [], $logo = null, $logoOdd = 'left', $headerType = 'horizontal') {
+   public static function getMenu($menutype = '', $nav_class = [], $logo = null, $logoOdd = 'left', $headerType = 'horizontal', $nav_wrapper_class = []) {
       if (empty($menutype)) {
          return '';
       }
@@ -27,7 +27,7 @@ public static function getMenu($menutype = '', $nav_class = [], $logo = null, $l
       $showAll = 1;
 
       $return = [];
-      echo '<div class="align-self-center px-2 d-none d-lg-block' . ($headerType == 'stacked' ? ' w-100' : '') . '' . ($headerType == 'sticky' ? ' mr-auto' : '') . '"><ul class="' . implode(' ', $nav_class) . '">';
+      echo '<div class="' . (!empty($nav_wrapper_class) ? ' ' . implode(' ', $nav_wrapper_class) : '') . '"><ul class="' . implode(' ', $nav_class) . '">';
       $megamenu = false;
 
       $count_menu = 0;
diff --git a/astroid/astroid-framework/plugins/astroid/astroid.php b/astroid/astroid-framework/plugins/astroid/astroid.php
@@ -41,6 +41,32 @@ public function onBeforeRender() {
       }
    }
 
+   public function onExtensionAfterSave($context, $table, $isNew) {
+      if ($this->app->isAdmin() && $context == "com_templates.style" && $isNew && $this->isAstroidTemplate($table->template)) {
+         $db = JFactory::getDbo();
+         $params = \json_decode($table->params, TRUE);
+         $ast_id = $params['astroid_template_id'];
+         $query = "SELECT * FROM `#__astroid_templates` WHERE `id`='" . $ast_id . "'";
+         $db->setQuery($query);
+         $astroid_template = $db->loadObject();
+
+         $object = new stdClass();
+         $object->id = null;
+         $object->template_id = $table->id;
+         $object->title = $table->title;
+         $object->params = $astroid_template->params;
+         $object->created = time();
+         $object->updated = time();
+         $db->insertObject('#__astroid_templates', $object);
+         $ast_id = $db->insertid();
+
+         $object = new stdClass();
+         $object->id = $table->id;
+         $object->params = \json_encode(["astroid_template_id" => $ast_id]);
+         $db->updateObject('#__template_styles', $object, 'id');
+      }
+   }
+
    public function onAfterRoute() {
       $option = $this->app->input->get('option', '');
       $astroid = $this->app->input->get('astroid', '');
diff --git a/astroid/astroid-framework/plugins/astroid/astroid.xml b/astroid/astroid-framework/plugins/astroid/astroid.xml
@@ -3,7 +3,7 @@
    <name>Astroid Plugin</name>
    <author>JoomDev</author>
    <creationDate>June 2018</creationDate>
-   <version>1.2.0</version>
+   <version>1.2.1</version>
    <url>http://www.joomdev.com</url>
    <copyright>Copyright (C) 2018 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/astroid/astroid-framework/script.php b/astroid/astroid-framework/script.php
@@ -97,6 +97,11 @@ public function checkAndUpgrade($template) {
       $result = $db->loadObject();
       if (empty($result)) {
          $this->moveParamsJSON($template);
+      } else {
+         $object = new stdClass();
+         $object->id = $template->id;
+         $object->params = \json_encode(["astroid_template_id" => $result->id]);
+         $db->updateObject('#__template_styles', $object, 'id');
       }
    }
 
@@ -110,10 +115,10 @@ public function moveParamsJSON($template) {
       $object->created = time();
       $object->updated = time();
       $db->insertObject('#__astroid_templates', $object);
-
+      
       $object = new stdClass();
       $object->id = $template->id;
-      $object->params = "";
+      $object->params = \json_encode(["astroid_template_id" => $db->insertid()]);
       $db->updateObject('#__template_styles', $object, 'id');
    }
 
diff --git a/astroid/astroid-template-zero/frontend/header/horizontal.php b/astroid/astroid-template-zero/frontend/header/horizontal.php
@@ -28,6 +28,7 @@
 $class = ['astroid-header', 'astroid-horizontal-header', 'astroid-horizontal-' . $mode . '-header'];
 
 $navClass = ['nav', 'astroid-nav', 'd-none', 'd-lg-flex'];
+$navWrapperClass = ['align-self-center', 'px-2','d-none', 'd-lg-block'];
 ?>
 <!-- header starts -->
 <header id="astroid-header" class="<?php echo implode(' ', $class); ?>">
@@ -42,7 +43,7 @@
       <?php
       if ($mode == 'left') {
          // header nav starts
-         AstroidMenu::getMenu($header_menu, $navClass);
+         AstroidMenu::getMenu($header_menu, $navClass, null, 'left', 'horizontal', $navWrapperClass);
          // header nav ends
       }
       ?>
@@ -51,7 +52,7 @@
    if ($mode == 'center') {
       echo '<div class="header-center-section d-flex justify-content-center">';
       // header nav starts
-      AstroidMenu::getMenu($header_menu, $navClass);
+      AstroidMenu::getMenu($header_menu, $navClass, null, 'left', 'horizontal', $navWrapperClass);
       // header nav ends
       echo '</div>';
    }
@@ -61,7 +62,7 @@
          <?php
          if ($mode == 'right') {
             // header nav starts
-            AstroidMenu::getMenu($header_menu, $navClass);
+            AstroidMenu::getMenu($header_menu, $navClass, null, 'left', 'horizontal', $navWrapperClass);
             // header nav ends
          }
          ?>
diff --git a/astroid/astroid-template-zero/frontend/header/stacked.php b/astroid/astroid-template-zero/frontend/header/stacked.php
@@ -33,6 +33,7 @@
 $navClass = ['nav', 'astroid-nav', 'justify-content-center', 'd-flex', 'align-items-center'];
 $navClassLeft = ['nav', 'astroid-nav', 'justify-content-left', 'd-flex', 'align-items-left'];
 $navClassDivided = ['nav', 'astroid-nav'];
+$navWrapperClass = ['align-self-center', 'px-2','d-none', 'd-lg-block', 'w-100'];
 ?>
 <header id="astroid-header" class="<?php echo implode(' ', $class); ?>">
    <div class="d-flex">
@@ -66,7 +67,7 @@
             echo '</div>';
             // header nav starts -->
             echo '<div class="w-100 d-none d-lg-flex justify-content-center py-3">';
-            AstroidMenu::getMenu($header_menu, array_merge($navClass), null, 'left', 'stacked');
+            AstroidMenu::getMenu($header_menu, array_merge($navClass), null, 'left', 'stacked', $navWrapperClass);
             echo '</div>';
             // header nav ends
             // header block starts
@@ -108,7 +109,7 @@
             echo '<div class="d-lg-none">';
             $template->loadLayout('logo');
             echo '</div>';
-            AstroidMenu::getMenu($header_menu, $navClass, true, $odd_menu_items, 'stacked');
+            AstroidMenu::getMenu($header_menu, $navClass, true, $odd_menu_items, 'stacked', $navWrapperClass);
             echo '</div>';
             if ($enable_offcanvas) {
                ?>
@@ -185,7 +186,7 @@
             // header nav starts -->
             echo '<div class="w-100 d-none d-lg-flex">';
             echo '<div class="d-flex justify-content-start py-3 flex-grow-1">';
-            AstroidMenu::getMenu($header_menu, $navClassLeft, null, 'left', 'stacked');
+            AstroidMenu::getMenu($header_menu, $navClassLeft, null, 'left', 'stacked', $navWrapperClass);
             echo '</div>';
             // header nav ends
             // header block starts
diff --git a/astroid/astroid-template-zero/frontend/header/sticky.php b/astroid/astroid-template-zero/frontend/header/sticky.php
@@ -34,6 +34,7 @@
 $class[] = 'header-' . $stickyheadertablet . '-tablet';
 
 $navClass = ['nav', 'astroid-nav', 'd-none', 'd-lg-flex'];
+$navWrapperClass = ['align-self-center', 'px-2','d-none', 'd-lg-block', 'mr-auto'];
 ?>
 <!-- header starts -->
 <div id="astroid-sticky-header" class="<?php echo implode(' ', $class); ?> d-none border-bottom shadow-sm">
@@ -47,7 +48,7 @@
          <?php
          $template->loadLayout('logo');
          // header nav starts
-         AstroidMenu::getMenu($header_menu, $navClass, null, 'left', 'sticky');
+         AstroidMenu::getMenu($header_menu, $navClass, null, 'left', 'sticky', $navWrapperClass);
          // header nav ends
          ?>
       </div>
diff --git a/astroid/astroid-template-zero/html/modules.php b/astroid/astroid-template-zero/html/modules.php
@@ -11,59 +11,59 @@
  */
 
 function modChrome_card($module, &$params, &$attribs) {
-  $moduleTag = $params->get('module_tag', 'div');
-  $headerTag = htmlspecialchars($params->get('header_tag', 'h5'), ENT_COMPAT, 'UTF-8');
-  $bootstrapSize = (int) $params->get('bootstrap_size', 0);
-  $moduleClass = $bootstrapSize != 0 ? ' span' . $bootstrapSize : '';
+   $moduleTag = $params->get('module_tag', 'div');
+   $headerTag = htmlspecialchars($params->get('header_tag', 'h5'), ENT_COMPAT, 'UTF-8');
+   $bootstrapSize = (int) $params->get('bootstrap_size', 0);
+   $moduleClass = $bootstrapSize != 0 ? ' span' . $bootstrapSize : '';
 
-  // Temporarily store header class in variable
-  $headerClass = $params->get('header_class');
-  $headerClass = $headerClass ? ' class="module-title pb-2 ' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : ' class="module-title pb-2"';
+   // Temporarily store header class in variable
+   $headerClass = $params->get('header_class');
+   $headerClass = $headerClass ? ' class="module-title pb-2 ' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : ' class="module-title pb-2"';
 
-  $content = trim($module->content);
+   $content = trim($module->content);
 
-  if (!empty($content)) :
-    echo '<div class="card">';
+   if (!empty($content)) :
+      echo '<div class="card">';
       echo '<div class="card-body">';
-     ?>
-     <<?php echo $moduleTag; ?> class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
-     <?php if ($module->showtitle != 0) : ?>
-        <<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
-     <?php endif; ?>
-     
-        <?php echo $content; ?>
-     </<?php echo $moduleTag; ?>>
-  <?php
-  echo '</div>';
-  echo '</div>';
-  endif;
+      ?>
+      <<?php echo $moduleTag; ?> class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+      <?php if ($module->showtitle != 0) : ?>
+         <<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
+      <?php endif; ?>
+
+      <?php echo $content; ?>
+      </<?php echo $moduleTag; ?>>
+      <?php
+      echo '</div>';
+      echo '</div>';
+   endif;
 }
 
 function modChrome_border_layout($module, &$params, &$attribs) {
-  $moduleTag = $params->get('module_tag', 'div');
-  $headerTag = htmlspecialchars($params->get('header_tag', 'h5'), ENT_COMPAT, 'UTF-8');
-  $bootstrapSize = (int) $params->get('bootstrap_size', 0);
-  $moduleClass = $bootstrapSize != 0 ? ' span' . $bootstrapSize : '';
-
-  // Temporarily store header class in variable
-  $headerClass = $params->get('header_class');
-  $headerClass = $headerClass ? ' class="module-title pb-2 ' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : ' class="module-title pb-2"';
-
-  $content = trim($module->content);
-
-  if (!empty($content)) :
-    echo '<div class="border rounded p-3 mb-4">';
-     ?>
-     <<?php echo $moduleTag; ?> class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
-     <?php if ($module->showtitle != 0) : ?>
-        <<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
-     <?php endif; ?>
-     
-        <?php echo $content; ?>
-     </<?php echo $moduleTag; ?>>
-  <?php
-  echo '</div>';
-  endif;
+   $moduleTag = $params->get('module_tag', 'div');
+   $headerTag = htmlspecialchars($params->get('header_tag', 'h5'), ENT_COMPAT, 'UTF-8');
+   $bootstrapSize = (int) $params->get('bootstrap_size', 0);
+   $moduleClass = $bootstrapSize != 0 ? ' span' . $bootstrapSize : '';
+
+   // Temporarily store header class in variable
+   $headerClass = $params->get('header_class');
+   $headerClass = $headerClass ? ' class="module-title pb-2 ' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : ' class="module-title pb-2"';
+
+   $content = trim($module->content);
+
+   if (!empty($content)) :
+      echo '<div class="border rounded p-3 mb-4">';
+      ?>
+      <<?php echo $moduleTag; ?> class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+      <?php if ($module->showtitle != 0) : ?>
+         <<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
+      <?php endif; ?>
+
+      <?php echo $content; ?>
+      </<?php echo $moduleTag; ?>>
+      <?php
+      echo '</div>';
+   endif;
 }
 
 function modChrome_astroidxhtml($module, &$params, &$attribs) {
@@ -86,6 +86,33 @@ function modChrome_astroidxhtml($module, &$params, &$attribs) {
       <?php endif; ?>
       <?php echo $content; ?>
       </<?php echo $moduleTag; ?>>
-   <?php
+      <?php
    endif;
 }
+
+function modChrome_split_title($module, &$params, &$attribs) {
+   $moduleTag = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
+   $bootstrapSize = (int) $params->get('bootstrap_size', 0);
+   $moduleClass = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
+   $headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
+   $headerClass = htmlspecialchars($params->get('header_class', 'page-header'), ENT_COMPAT, 'UTF-8');
+
+   if ($module->content) {
+      echo '<' . $moduleTag . ' class="split-title-module' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass . '">';
+
+      if ($module->showtitle) {
+         $title = explode('|', $module->title);
+         $html = '';
+         $html .= '<' . $headerTag . ' class="split-title' . $headerClass . '">';
+         $index = 1;
+         foreach ($title as $title_text) {
+            $html .= '<span class="split-' . $index . '">' . $title_text . '</span>';
+            $index++;
+         }
+         $html .= '</' . $headerTag . '>';
+      }
+
+      echo $module->content;
+      echo '</' . $moduleTag . '>';
+   }
+}
diff --git a/astroid/astroid-template-zero/script.php b/astroid/astroid-template-zero/script.php
@@ -98,6 +98,11 @@ public function installDefaultJSON($template) {
          $object->created = time();
          $object->updated = time();
          $db->insertObject('#__astroid_templates', $object);
+
+         $object = new stdClass();
+         $object->id = $template->id;
+         $object->params = \json_encode(["astroid_template_id" => $db->insertid()]);
+         $db->updateObject('#__template_styles', $object, 'id');
       }
    }
 
@@ -111,10 +116,11 @@ public function moveParamsJSON($template) {
       $object->created = time();
       $object->updated = time();
       $db->insertObject('#__astroid_templates', $object);
+      $ast_id = $db->insertid();
 
       $object = new stdClass();
       $object->id = $template->id;
-      $object->params = "";
+      $object->params = \json_encode(["astroid_template_id" => $ast_id]);
       $db->updateObject('#__template_styles', $object, 'id');
    }
 
@@ -125,6 +131,11 @@ public function checkAndUpgrade($template) {
       $result = $db->loadObject();
       if (empty($result)) {
          $this->moveParamsJSON($template);
+      } else {
+         $object = new stdClass();
+         $object->id = $template->id;
+         $object->params = \json_encode(["astroid_template_id" => $result->id]);
+         $db->updateObject('#__template_styles', $object, 'id');
       }
    }
 
diff --git a/astroid/astroid-template-zero/scss/template/_layout.scss b/astroid/astroid-template-zero/scss/template/_layout.scss
diff --git a/astroid/astroid-template-zero/scss/template/template.scss b/astroid/astroid-template-zero/scss/template/template.scss
diff --git a/astroid/astroid-template-zero/templateDetails.xml b/astroid/astroid-template-zero/templateDetails.xml
diff --git a/pkg_astroid.php b/pkg_astroid.php
diff --git a/pkg_astroid.xml b/pkg_astroid.xml
