Updated version to 1.7

Fix - SP Pagebuilder 2.0 Compatibility. Fix - Mega Menu 'Display in Menu' issue fixed (show/hide) Fix - Link type menu 'textseparator, Menu Item Alias, Fix - Menu Heading' css & submenu issue fixed in offcanvas. Fix - Header sticky animation issue fixed. Fix - Offcanvas icon error fixed. New - Updated Joomla version 3.6.4
JoomShaper · Nov 1, 2016 · 2c76ee2 · 2c76ee2
1 parent 5f5531e
commit 2c76ee2
Show file tree

Hide file tree

Showing 14 changed files with 242 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 **Helix3** is a user-friendly, modern, highly customizable and easy to integrate solution to build your custom Joomla 3+ website. For users installing Helix3 for the first time on a site, we have nice surprise all advanced template settings are already here. Helix3 isn’t just a template or a plugin, it’s a complete **Joomla 3+ template framework.**
 
-####Most Powerful Features:
+#### Most Powerful Features:
 - Modern Design  (2015 web trends inlcuded)
 - Flexibility & Fully Responsive Template
 - Font Awesome 4.6.3 ( over 510+ Icons) also for menu items
@@ -21,4 +21,4 @@ and much more.
 
 > As one of our customer Puskás Attila Barna said "Helix3 and Menu Builder with SP Page Builder is one powerfull tools pack for the Joomla CMS Developers!
 
-See more at: https://www.joomshaper.com/helix
+See more at: http://www.joomshaper.com/joomla-templates/helix3
diff --git a/installer.xml b/installer.xml
@@ -3,12 +3,11 @@
     <name>Helix3 based template installer</name>
     <description>Shaper Helix3 - Blank template of Helix3 framework</description>
     <scriptfile>installer.script.php</scriptfile>
-
     <files>
-		<filename plugin="tmp_helix3">installer.script.php</filename>
+		    <filename plugin="tmp_helix3">installer.script.php</filename>
     </files>
     <plugins>
         <plugin plugin="helix3" group="ajax" />
         <plugin plugin="helix3" group="system" />
     </plugins>
-</extension>
+</extension>
diff --git a/plugins/ajax/helix3.xml b/plugins/ajax/helix3.xml
@@ -7,15 +7,15 @@
     <license>http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later</license>
     <authorEmail>support@joomshaper.com</authorEmail>
     <authorUrl>www.joomshaper.com</authorUrl>
-    <version>1.5</version>
+    <version>1.7</version>
     <description>Helix3 Framework - Joomla Template Framework by JoomShaper</description>
 
-    <updateservers> 
+    <updateservers>
         <server type="extension" priority="1" name="Helix3 - Ajax">http://www.joomshaper.com/updates/plg-ajax-helix3.xml</server>
     </updateservers>
 
 	<files>
         <filename plugin="helix3">helix3.php</filename>
 		<folder>classes/</folder>
 	</files>
-</extension>
+</extension>
diff --git a/plugins/system/assets/css/pagebuilder.css b/plugins/system/assets/css/pagebuilder.css
@@ -0,0 +1,28 @@
+/**
+* @package Helix3 Framework
+* @author JoomShaper http://www.joomshaper.com
+* @copyright Copyright (c) 2010 - 2016 JoomShaper
+* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
+*/
+
+.sppb-row-container {
+  margin-right: auto;
+  margin-left: auto;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+@media (min-width: 768px) {
+  .sppb-row-container {
+    width: 750px;
+  }
+}
+@media (min-width: 992px) {
+  .sppb-row-container {
+    width: 970px;
+  }
+}
+@media (min-width: 1200px) {
+  .sppb-row-container {
+    width: 1170px;
+  }
+}
diff --git a/plugins/system/core/classes/menu.php b/plugins/system/core/classes/menu.php
@@ -4,7 +4,7 @@
 * @author JoomShaper http://www.joomshaper.com
 * @copyright Copyright (c) 2010 - 2015 JoomShaper
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
-*/  
+*/
 
 //no direct accees
 defined ('_JEXEC') or die ('resticted aceess');
@@ -17,7 +17,7 @@ class Helix3Menu {
 	protected $menu = '';
 	public $_params 	= null;
 	public $menuname	= 'mainmenu';
-	
+
 	function __construct($class = '', $name = ''){
 		$this->app = JFactory::getApplication();
 		$this->template = $this->app->getTemplate(true);
@@ -62,7 +62,7 @@ public function initMenu(){
 			if ($item->id == $this->active) {
 				$class .= ' current-item';
 			}
-			
+
 			if (in_array($item->id, $this->active_tree)) {
 				$class .= ' active';
 			}elseif ($item->type == 'alias') {
@@ -87,17 +87,17 @@ public function initMenu(){
 				case 'heading':
 					// No further action needed.
 					continue;
-				
+
 				case 'url':
 					if ((strpos($item->link, 'index.php?') === 0) && (strpos($item->link, 'Itemid=') === false)) {
 						$item->flink = $item->link . '&Itemid=' . $item->id;
 					}
 					break;
-				
+
 				case 'alias':
 					$item->flink = 'index.php?Itemid=' . $item->params->get('aliasoptions');
 					break;
-				
+
 				default:
 					$router = JSite::getRouter();
 					if ($router->getMode() == JROUTER_MODE_SEF) {
@@ -107,7 +107,7 @@ public function initMenu(){
 					}
 					break;
 			}
-			
+
 			if (strcasecmp(substr($item->flink, 0, 4), 'http') && (strpos($item->flink, 'index.php?') !== false)) {
 				$item->flink = JRoute::_($item->flink, true, $item->params->get('secure'));
 			} else {
@@ -119,7 +119,7 @@ public function initMenu(){
 			$item->title = htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8', false);
 			$item->anchor_css   = htmlspecialchars($item->params->get('menu-anchor_css', ''), ENT_COMPAT, 'UTF-8', false);
 			$item->anchor_title = htmlspecialchars($item->params->get('menu-anchor_title', ''), ENT_COMPAT, 'UTF-8', false);
-			$item->menu_image   = $item->params->get('menu_image', '') ? htmlspecialchars($item->params->get('menu_image', ''), ENT_COMPAT, 'UTF-8', false) : '';			
+			$item->menu_image   = $item->params->get('menu_image', '') ? htmlspecialchars($item->params->get('menu_image', ''), ENT_COMPAT, 'UTF-8', false) : '';
 		}
 	}
 
@@ -131,7 +131,7 @@ public function render()
 		if (count($keys)) {
 			$this->navigation(null,$keys[0]);
 		}
-		echo $this->menu;		
+		echo $this->menu;
 	}
 
 	public function navigation($pitem, $start = 0, $end = 0, $class = '')
@@ -172,7 +172,7 @@ public function navigation($pitem, $start = 0, $end = 0, $class = '')
 			if($this->_params->get('menu_animation') != 'none') {
 				$animation = ' ' . $this->_params->get('menu_animation');
 			} else {
-				$animation = '';	
+				$animation = '';
 			}
 
 			$class = 'sp-megamenu-parent' . $animation;
@@ -214,7 +214,7 @@ private function getItem($item) {
 					$this->mega($item);
 				}
 			}
-			
+
 		}
 
 		$this->menu .= $this->end_el();
@@ -316,15 +316,15 @@ private function mega($item)
 			foreach ($row->attr as $col)
 			{
 				$this->menu .='<div class="col-sm-'.$col->colGrid.'">';
-				
+
 				if (count($items))
 				{
 					$item_ids = ($col->menuParentId)? explode(',', $col->menuParentId):array();
-					
+
 					if (count($item_ids))
 					{
 						$this->menu .= $this->start_lvl('sp-mega-group');
-						
+
 						foreach ($item_ids as $item_id)
 						{
 							if (!empty($this->_items[$item_id]))
@@ -455,22 +455,24 @@ private function item($item, $extra_class=''){
 			}
 		}
 
-
 		$flink = $item->flink;
 		$flink = JFilterOutput::ampReplace(htmlspecialchars($flink));
 
-		switch ($item->browserNav) {
-			default:
-			case 0:
-				$output = '<a '.$class.' href="'. $flink .'" '.$title.'>'.$linktitle.'</a>';
-			break;
-			case 1:
-				$output = '<a '. $class .' href="'. $flink .'" target="_blank" '. $title .'>'. $linktitle .'</a>';
-			break;
-			case 2:
-				$options = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,' . $params->get('window_open');
-				$output = '<a '. $class .' href="'. $flink .'" onclick="window.open(this.href,\'targetWindow\','. $options. ');return false;" '. $title .'>'. $linktitle .'</a>';
-			break;
+		$output = '';
+		if ($item->params->get('menu_show', 1) != 0) {
+			switch ($item->browserNav) {
+				default:
+				case 0:
+					$output .= '<a '.$class.' href="'. $flink .'" '.$title.'>'.$linktitle.'</a>';
+				break;
+				case 1:
+					$output .= '<a '. $class .' href="'. $flink .'" target="_blank" '. $title .'>'. $linktitle .'</a>';
+				break;
+				case 2:
+					$options .= 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,' . $params->get('window_open');
+					$output .= '<a '. $class .' href="'. $flink .'" onclick="window.open(this.href,\'targetWindow\','. $options. ');return false;" '. $title .'>'. $linktitle .'</a>';
+				break;
+			}
 		}
 
 		return $output;
@@ -485,13 +487,13 @@ private function load_module($mod)
 		$groups		= implode(',', $user->getAuthorisedViewLevels());
 		$lang 		= JFactory::getLanguage()->getTag();
 		$clientId 	= (int) $app->getClientId();
-		
+
 		$db	= JFactory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('id, title, module, position, content, showtitle, params');
 		$query->from('#__modules AS m');
 		$query->where('m.published = 1');
-		
+
 		if (is_numeric($mod)) {
 			$query->where('m.id = ' . $mod);
 		} else {
@@ -506,7 +508,7 @@ private function load_module($mod)
 
 		$query->where('m.access IN ('.$groups.')');
 		$query->where('m.client_id = '. $clientId);
-		
+
 		// Filter by language
 		if ($app->isSite() && $app->getLanguageFilter()) {
 			$query->where('m.language IN (' . $db->Quote($lang) . ',' . $db->Quote('*') . ')');
@@ -518,9 +520,9 @@ private function load_module($mod)
 		$db->setQuery($query);
 
 		$modules = $db->loadObjectList();
-		
+
 		if (!$modules) return null;
-		
+
 		$options = array('style' => 'sp_xhtml');
 		$output = '';
 		ob_start();
@@ -531,10 +533,10 @@ private function load_module($mod)
 			$module->name		= $custom ? $module->title : substr($file, 4);
 			$module->style		= null;
 			$module->position	= strtolower($module->position);
-			$clean[$module->id]	= $module;		
+			$clean[$module->id]	= $module;
 			echo JModuleHelper::renderModule($module, $options);
 		}
 		$output = ob_get_clean();
-		return $output;		
+		return $output;
 	}
-}
+}
diff --git a/plugins/system/core/helix3.php b/plugins/system/core/helix3.php
@@ -231,8 +231,9 @@ public static function generatelayout()
 		$view        = $app->input->getCmd('view', '');
 		$pagebuilder = false;
 
-		if (($option == 'com_sppagebuilder') && ($view == 'page'))
+		if ($option == 'com_sppagebuilder')
 		{
+			$doc->addStylesheet( JURI::base(true) . '/plugins/system/helix3/assets/css/pagebuilder.css' );
 			$pagebuilder = true;
 		}
 
@@ -843,7 +844,7 @@ public static function object_to_array($obj) {
 			}
 		}
 		else $new = $obj;
-		return $new;       
+		return $new;
 	}
 
 	/**

diff --git a/plugins/system/helix3.xml b/plugins/system/helix3.xml
@@ -7,10 +7,10 @@
     <license>http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later</license>
     <authorEmail>support@joomshaper.com</authorEmail>
     <authorUrl>www.joomshaper.com</authorUrl>
-    <version>1.5</version>
+    <version>1.7</version>
     <description>Helix3 Framework - Joomla Template Framework by JoomShaper</description>
-	
-    <updateservers> 
+
+    <updateservers>
         <server type="extension" priority="1" name="System - Helix3 Framework">http://www.joomshaper.com/updates/plg-system-helix3.xml</server>
     </updateservers>
 
@@ -29,4 +29,4 @@
 		<folder plugin="helix3">params</folder>
     </files>
     <fieldset addfieldpath="/plugins/system/helix3/fields"></fieldset>
-</extension>
+</extension>