diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 770d251..097e3a4 --- 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 index ce9d3af..f0ebbb0 100644 --- a/installer.xml +++ b/installer.xml @@ -3,12 +3,11 @@ Helix3 based template installer Shaper Helix3 - Blank template of Helix3 framework installer.script.php - - installer.script.php + installer.script.php - \ No newline at end of file + diff --git a/plugins/ajax/helix3.xml b/plugins/ajax/helix3.xml index 46b2b40..5411020 100644 --- a/plugins/ajax/helix3.xml +++ b/plugins/ajax/helix3.xml @@ -7,10 +7,10 @@ http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later support@joomshaper.com www.joomshaper.com - 1.5 + 1.7 Helix3 Framework - Joomla Template Framework by JoomShaper - + http://www.joomshaper.com/updates/plg-ajax-helix3.xml @@ -18,4 +18,4 @@ helix3.php classes/ - \ No newline at end of file + diff --git a/plugins/system/assets/css/pagebuilder.css b/plugins/system/assets/css/pagebuilder.css new file mode 100644 index 0000000..acf7ee8 --- /dev/null +++ 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 index e606aa2..6efd7d1 100644 --- 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 .='
'; - + 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 = ''.$linktitle.''; - break; - case 1: - $output = ''. $linktitle .''; - break; - case 2: - $options = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,' . $params->get('window_open'); - $output = ''. $linktitle .''; - break; + $output = ''; + if ($item->params->get('menu_show', 1) != 0) { + switch ($item->browserNav) { + default: + case 0: + $output .= ''.$linktitle.''; + break; + case 1: + $output .= ''. $linktitle .''; + break; + case 2: + $options .= 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,' . $params->get('window_open'); + $output .= ''. $linktitle .''; + 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; } -} \ No newline at end of file +} diff --git a/plugins/system/core/helix3.php b/plugins/system/core/helix3.php index 4490b04..26ac53e 100644 --- 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 index 2901d6e..03b20a6 100644 --- a/plugins/system/helix3.xml +++ b/plugins/system/helix3.xml @@ -7,10 +7,10 @@ http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later support@joomshaper.com www.joomshaper.com - 1.5 + 1.7 Helix3 Framework - Joomla Template Framework by JoomShaper - - + + http://www.joomshaper.com/updates/plg-system-helix3.xml @@ -29,4 +29,4 @@ params
- \ No newline at end of file + diff --git a/template/css/template.css b/template/css/template.css index 20eb629..59e6683 100644 --- a/template/css/template.css +++ b/template/css/template.css @@ -2835,7 +2835,7 @@ table.category tbody >tr td { z-index: 99999; } .sp-pre-loader .sp-loader-clock { - border: 3px solid #999999; + border: 3px solid #333333; border-radius: 60px; bottom: 0; height: 80px; @@ -2849,7 +2849,7 @@ table.category tbody >tr td { .sp-pre-loader .sp-loader-clock:after { content: ""; position: absolute; - background-color: #999999; + background-color: #333333; top: 2px; left: 48%; height: 38px; @@ -2863,7 +2863,7 @@ table.category tbody >tr td { .sp-pre-loader .sp-loader-clock:before { content: ""; position: absolute; - background-color: #999999; + background-color: #333333; top: 6px; left: 48%; height: 35px; @@ -2879,7 +2879,7 @@ table.category tbody >tr td { height: 80px; width: 80px; border-radius: 80px; - border: 3px solid rgba(153,153,153,0.7); + border: 3px solid rgba(51,51,51,0.7); left: 0; top: 0; right: 0; @@ -2898,7 +2898,7 @@ table.category tbody >tr td { width: 11px; height: 11px; border-radius: 10px; - background-color: #999999; + background-color: #333333; } .sp-pre-loader .sp-loader-bubble-loop { position: absolute; @@ -2910,7 +2910,7 @@ table.category tbody >tr td { bottom: 0; margin: auto; border-radius: 12px; - background-color: #999999; + background-color: #333333; -webkit-transform-origin: 50% 50%; transform-origin: 50% 50%; -webkit-animation: loader6 1s ease-in-out infinite; @@ -2919,7 +2919,7 @@ table.category tbody >tr td { .sp-pre-loader .sp-loader-bubble-loop:before { content: ""; position: absolute; - background-color: rgba(153,153,153,0.5); + background-color: rgba(51,51,51,0.5); top: 0px; left: -25px; height: 12px; @@ -2929,7 +2929,7 @@ table.category tbody >tr td { .sp-pre-loader .sp-loader-bubble-loop:after { content: ""; position: absolute; - background-color: rgba(153,153,153,0.5); + background-color: rgba(51,51,51,0.5); top: 0px; left: 25px; height: 12px; @@ -2952,7 +2952,7 @@ table.category tbody >tr td { content: ""; display: block; border-radius: 50%; - border: 2px solid #999999; + border: 2px solid #333333; position: absolute; top: 50%; left: 50%; @@ -3004,7 +3004,7 @@ table.category tbody >tr td { position: absolute; width: 2px; height: 0; - background-color: #999999; + background-color: #333333; bottom: 0; } .sp-pre-loader .wave-two li:nth-child(1) { @@ -3040,7 +3040,7 @@ table.category tbody >tr td { .sp-pre-loader .sp-loader-audio-wave { width: 3em; height: 2em; - background: linear-gradient(#999999,#999999) 0 50%, linear-gradient(#999999,#999999) 0.625em 50%, linear-gradient(#999999,#999999) 1.25em 50%, linear-gradient(#999999,#999999) 1.875em 50%, linear-gradient(#999999,#999999) 2.5em 50%; + background: linear-gradient(#333333,#333333) 0 50%, linear-gradient(#333333,#333333) 0.625em 50%, linear-gradient(#333333,#333333) 1.25em 50%, linear-gradient(#333333,#333333) 1.875em 50%, linear-gradient(#333333,#333333) 2.5em 50%; background-repeat: no-repeat; background-size: 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em; animation: audioWave 1.5s linear infinite; @@ -3067,7 +3067,7 @@ table.category tbody >tr td { width: auto; } .sp-pre-loader .sp-loader-with-logo .line { - background: #999999; + background: #333333; bottom: 0; height: 5px; left: 0; @@ -3160,27 +3160,27 @@ table.category tbody >tr td { } @keyframes audioWave { 25% { - background: linear-gradient(#999999,#999999) 0 50%, linear-gradient(#999999,#999999) 0.625em 50%, linear-gradient(#999999,#999999) 1.25em 50%, linear-gradient(#999999,#999999) 1.875em 50%, linear-gradient(#999999,#999999) 2.5em 50%; + background: linear-gradient(#333333,#333333) 0 50%, linear-gradient(#333333,#333333) 0.625em 50%, linear-gradient(#333333,#333333) 1.25em 50%, linear-gradient(#333333,#333333) 1.875em 50%, linear-gradient(#333333,#333333) 2.5em 50%; background-repeat: no-repeat; background-size: 0.5em 2em, 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em; } 37.5% { - background: linear-gradient(#999999,#999999) 0 50%, linear-gradient(#999999,#999999) 0.625em 50%, linear-gradient(#999999,#999999) 1.25em 50%, linear-gradient(#999999,#999999) 1.875em 50%, linear-gradient(#999999,#999999) 2.5em 50%; + background: linear-gradient(#333333,#333333) 0 50%, linear-gradient(#333333,#333333) 0.625em 50%, linear-gradient(#333333,#333333) 1.25em 50%, linear-gradient(#333333,#333333) 1.875em 50%, linear-gradient(#333333,#333333) 2.5em 50%; background-repeat: no-repeat; background-size: 0.5em 0.25em, 0.5em 2em, 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em; } 50% { - background: linear-gradient(#999999,#999999) 0 50%, linear-gradient(#999999,#999999) 0.625em 50%, linear-gradient(#999999,#999999) 1.25em 50%, linear-gradient(#999999,#999999) 1.875em 50%, linear-gradient(#999999,#999999) 2.5em 50%; + background: linear-gradient(#333333,#333333) 0 50%, linear-gradient(#333333,#333333) 0.625em 50%, linear-gradient(#333333,#333333) 1.25em 50%, linear-gradient(#333333,#333333) 1.875em 50%, linear-gradient(#333333,#333333) 2.5em 50%; background-repeat: no-repeat; background-size: 0.5em 0.25em, 0.5em 0.25em, 0.5em 2em, 0.5em 0.25em, 0.5em 0.25em; } 62.5% { - background: linear-gradient(#999999,#999999) 0 50%, linear-gradient(#999999,#999999) 0.625em 50%, linear-gradient(#999999,#999999) 1.25em 50%, linear-gradient(#999999,#999999) 1.875em 50%, linear-gradient(#999999,#999999) 2.5em 50%; + background: linear-gradient(#333333,#333333) 0 50%, linear-gradient(#333333,#333333) 0.625em 50%, linear-gradient(#333333,#333333) 1.25em 50%, linear-gradient(#333333,#333333) 1.875em 50%, linear-gradient(#333333,#333333) 2.5em 50%; background-repeat: no-repeat; background-size: 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em, 0.5em 2em, 0.5em 0.25em; } 75% { - background: linear-gradient(#999999,#999999) 0 50%, linear-gradient(#999999,#999999) 0.625em 50%, linear-gradient(#999999,#999999) 1.25em 50%, linear-gradient(#999999,#999999) 1.875em 50%, linear-gradient(#999999,#999999) 2.5em 50%; + background: linear-gradient(#333333,#333333) 0 50%, linear-gradient(#333333,#333333) 0.625em 50%, linear-gradient(#333333,#333333) 1.25em 50%, linear-gradient(#333333,#333333) 1.875em 50%, linear-gradient(#333333,#333333) 2.5em 50%; background-repeat: no-repeat; background-size: 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em, 0.5em 0.25em, 0.5em 2em; } @@ -3325,6 +3325,34 @@ table.category tbody >tr td { -webkit-animation-name: fadeInDown; animation-name: fadeInDown; } +@-webkit-keyframes fadeInUp { + from { + opacity: 0; + -webkit-transform: translate3d(0,100%,0); + transform: translate3d(0,100%,0); + } + to { + opacity: 1; + -webkit-transform: none; + transform: none; + } +} +@keyframes fadeInUp { + from { + opacity: 0; + -webkit-transform: translate3d(0,100%,0); + transform: translate3d(0,100%,0); + } + to { + opacity: 1; + -webkit-transform: none; + transform: none; + } +} +.fadeInUp { + -webkit-animation-name: fadeInUp; + animation-name: fadeInUp; +} @media screen and (min-width: 768px) and (max-width: 1199px) { .scrollup { bottom: 25px; diff --git a/template/html/mod_menu/default_component.php b/template/html/mod_menu/default_component.php index b6e8413..50632b2 100644 --- a/template/html/mod_menu/default_component.php +++ b/template/html/mod_menu/default_component.php @@ -28,7 +28,7 @@ } $icon = ''; -if ($item_decode->icon) { +if (isset($item_decode->icon) && $item_decode->icon) { $icon = ' '; } diff --git a/template/html/mod_menu/default_heading.php b/template/html/mod_menu/default_heading.php new file mode 100644 index 0000000..88b2b75 --- /dev/null +++ b/template/html/mod_menu/default_heading.php @@ -0,0 +1,33 @@ +anchor_title ? ' title="' . $item->anchor_title . '"' : ''; +$anchor_css = $item->anchor_css ? $item->anchor_css : ''; + +$linktype = $item->title; + +if ($item->menu_image) +{ + $linktype = JHtml::_('image', $item->menu_image, $item->title); + + if ($item->params->get('menu_text', 1)) + { + $linktype .= '' . $item->title . ''; + } +} + +?> + > +position == 'offcanvas') && ($item->deeper)) { + echo ''; +} diff --git a/template/html/mod_menu/default_separator.php b/template/html/mod_menu/default_separator.php new file mode 100644 index 0000000..d5a84b2 --- /dev/null +++ b/template/html/mod_menu/default_separator.php @@ -0,0 +1,31 @@ +anchor_title ? ' title="' . $item->anchor_title . '"' : ''; +$anchor_css = $item->anchor_css ? $item->anchor_css : ''; + +$linktype = $item->title; + +if ($item->menu_image) +{ + $linktype = JHtml::_('image', $item->menu_image, $item->title); + + if ($item->params->get('menu_text', 1)) + { + $linktype .= '' . $item->title . ''; + } +} +?> +> +position == 'offcanvas') && ($item->deeper)) { + echo ''; +} diff --git a/template/js/main.js b/template/js/main.js index 298383a..c0374be 100644 --- a/template/js/main.js +++ b/template/js/main.js @@ -11,7 +11,7 @@ jQuery(function ($) { // **************************************************** // //Default - if (typeof sp_offanimation === 'undefined') { + if (typeof sp_offanimation === 'undefined' || sp_offanimation === '') { sp_offanimation = 'default'; } @@ -90,23 +90,29 @@ jQuery(function ($) { // if sticky header if ($("body.sticky-header").length > 0) { - // sticky nav - var stickyNavTop = $('#sp-header').offset().top; - var headerFixId = $('#sp-header'); + var fixedSection = $('#sp-header'); + // sticky nav + var headerHeight = fixedSection.outerHeight(); + var stickyNavTop = fixedSection.offset().top; + fixedSection.addClass('animated'); + fixedSection.before('
'); + $('.nav-placeholder').height('inherit'); //add class - headerFixId.addClass('menu-fixed-out'); - var stickyNav = function(){ + fixedSection.addClass('menu-fixed-out'); + var stickyNav = function () { var scrollTop = $(window).scrollTop(); if (scrollTop > stickyNavTop) { - headerFixId.removeClass('menu-fixed-out').addClass('menu-fixed'); + fixedSection.removeClass('menu-fixed-out').addClass('menu-fixed'); + $('.nav-placeholder').height(headerHeight); } else { - if(headerFixId.hasClass('menu-fixed')) { - headerFixId.removeClass('menu-fixed').addClass('menu-fixed-out'); + if (fixedSection.hasClass('menu-fixed')) { + fixedSection.removeClass('menu-fixed').addClass('menu-fixed-out'); + $('.nav-placeholder').height('inherit'); } } }; stickyNav(); - $(window).scroll(function() { + $(window).scroll(function () { stickyNav(); }); } @@ -243,4 +249,4 @@ jQuery(function ($) { // ************** END:: Others SCRIPT *************** // // **************************************************** // -}); \ No newline at end of file +}); diff --git a/template/less/theme.less b/template/less/theme.less index 0f35b83..eb89132 100644 --- a/template/less/theme.less +++ b/template/less/theme.less @@ -1666,6 +1666,40 @@ table.category { animation-name:fadeInDown; } +//fadeinUp +@-webkit-keyframes fadeInUp { + from { + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } + + to { + opacity: 1; + -webkit-transform: none; + transform: none; + } +} + +@keyframes fadeInUp { + from { + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + } + + to { + opacity: 1; + -webkit-transform: none; + transform: none; + } +} + +.fadeInUp { + -webkit-animation-name: fadeInUp; + animation-name: fadeInUp; +} + /* ************ END:: Animations Header *************** */ /* **************************************************** */ diff --git a/template/templateDetails.xml b/template/templateDetails.xml index b29fd7f..7b391dc 100644 --- a/template/templateDetails.xml +++ b/template/templateDetails.xml @@ -1,5 +1,5 @@ - + shaper_helix3 Jan 2016 JoomShaper.com @@ -7,7 +7,7 @@ http://www.joomshaper.com Copyright (C) 2010 - 2016 JoomShaper.com. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later - 1.5 + 1.7 Shaper Helix3 - Starter Template of Helix3 framework