Skip to content

Commit

Permalink
Updated Version 2.0
Browse files Browse the repository at this point in the history
^ Joomla v3.7 compatibility.
^ Updated Joomla 3.7.
rifatwahid committed May 8, 2017
1 parent 5b8150b commit d4be45c
Showing 181 changed files with 216 additions and 193 deletions.
Empty file modified installer.script.php
100644 → 100755
Empty file.
Empty file modified installer.xml
100644 → 100755
Empty file.
Empty file modified plugins/ajax/classes/image.php
100644 → 100755
Empty file.
Empty file modified plugins/ajax/helix3.php
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion plugins/ajax/helix3.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<license>http://www.gnu.org/licenses/gpl-2.0.html GPLv2 or later</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomshaper.com</authorUrl>
<version>1.9</version>
<version>2.0</version>
<description>Helix3 Framework - Joomla Template Framework by JoomShaper</description>

<updateservers>
35 changes: 26 additions & 9 deletions plugins/system/assets/css/admin.general.css
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ a.btn-ino{color:#fff}
}

/*Basic*/
.com_templates.view-style input[type="text"],
.com_templates.view-style input[type="text"]:not(.minicolors),
.com_templates.view-style input[type="url"],
.com_templates.view-style input[type="password"],
.com_templates.view-style input[type="number"],
@@ -279,7 +279,7 @@ a.btn-ino{color:#fff}

.layout-column .column:hover {
cursor: move;
}
}

.layout-column .column .col-title {
margin: 0;
@@ -323,7 +323,7 @@ a.btn-ino{color:#fff}
}

/*Button*/
.helix-options .btn {
.helix-options .btn, .helix-options .input-append .add-on, .helix-options .input-prepend .add-on {
border-color: #e5e5e5;
border-width: 0;
border-bottom-width: 2px;
@@ -344,6 +344,7 @@ a.btn-ino{color:#fff}

.helix-options .btn.btn-danger {
border-color: #bd362f;
background-color: #bd362f;
}

.helix-options .btn.btn-danger.active,
@@ -353,11 +354,13 @@ a.btn-ino{color:#fff}

.helix-options .btn.btn-success {
border-color: #51a351;
background-color: #409740;
}

.helix-options .btn.btn-success.active,
.helix-options .btn.btn-success:hover {
border-color: #458a45;
background-color: #378137;
}

.helix-options .btn.btn-primary {
@@ -514,7 +517,7 @@ a.btn-ino{color:#fff}
}

/*Media*/
.controls .input-append .media-preview.add-on,
.controls .input-append .media-preview.add-on,
.controls .input-prepend .media-preview.add-on {
border: 0;
background: none;
@@ -524,11 +527,11 @@ a.btn-ino{color:#fff}
margin-bottom: 20px;
}

.controls .modal.btn {
.controls .modal.btn, .controls .button-select.btn{
border-radius: 3px 0 0 3px;
}

.controls .media-preview + input[type="text"] {
.controls .media-preview + input[type="text"]{
display: none;
}

@@ -574,7 +577,7 @@ a.btn-ino{color:#fff}
bottom: 5px;
}

.com_templates.view-style .minicolors input[type="text"] {
.com_templates.view-style .minicolors input[type="text"]:not(.minicolors) {
width: 100%;
padding-left: 30px;
}
@@ -594,7 +597,7 @@ a.btn-ino{color:#fff}
.font-update-success,
.font-update-failed {
margin-top: 10px;
font-weight: bold;
font-weight: bold;
}

.font-update-success {
@@ -651,4 +654,18 @@ a.btn-ino{color:#fff}
margin-right: 7px;
margin-left: 7px;
display: inline-block;
}
}

/* Joomla 3.7 Compatible */
.helix-options .controls .field-media-wrapper[data-preview-container=".field-media-preview"] .input-append > input[type="text"]{
display: none;
}
.helix-options .control-group .field-media-wrapper .field-media-preview{
margin: 0 0 20px 0;
}

.helix-options .control-group .field-media-wrapper .field-media-preview img{
max-height: 200px;
max-width: 200px;
height: inherit !important;
}
19 changes: 16 additions & 3 deletions plugins/system/assets/js/admin.general.js
Original file line number Diff line number Diff line change
@@ -160,14 +160,28 @@ jQuery(function($){
});

//Media Button
$( '.input-prepend' ).find( '.btn' ).each(function(){
if($(this).hasClass( 'modal' )) {
$( '.input-prepend, .input-append' ).find( '.btn' ).each(function(){
if($(this).is( '.modal, .button-select' ) ) {
$(this).addClass( 'btn-success' );
} else {
$(this).addClass( 'btn-danger' );
}
});

$( '.controls' ).find( '.field-media-preview' ).each(function(){
$(this).insertBefore($(this).parent().find('.input-append'));
});

$( '.control-group .field-media-preview' ).not( 'img' ).each(function(){
$(this).append('<div id="preview_empty">No image selected.</div>');
});

// clear image
$( '.helix-options .controls .field-media-wrapper .input-append' ).on( 'click', '.button-clear', function( event ) {
$(this).closest('.field-media-wrapper').find('.field-media-preview').html('<div id="preview_empty">No image selected.</div>');
});


//Add .btn-group class
$( '.radio' ).addClass( 'btn-group' );

@@ -213,5 +227,4 @@ jQuery(function($){
});
return false;
});

});
20 changes: 10 additions & 10 deletions plugins/system/assets/js/admin.layout.js
Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ jQuery(function($) {
});

});//end ready
/* ---------- Load existing template ------------- */

/* ---------- Load existing template ------------- */
$('.form-horizontal').on('click', '.layout-del-action', function(event) {
event.preventDefault();

@@ -165,7 +165,7 @@ jQuery(function($) {
}
}

// callback function, return checkbox value
// callback function, return checkbox value
$.fn.getInputValue = function(){
if (this.attr('type') == 'checkbox') {
if (this.attr("checked")) {
@@ -311,7 +311,7 @@ jQuery(function($) {

if ($attrname == 'name') {
var nameVal = $this.val();

if (nameVal !='' || $this.val() != null) {
$('.row-active .section-title').text($this.val());
}else{
@@ -402,15 +402,15 @@ jQuery(function($) {
// Column Layout Arrange
$(document).on('click', '.column-layout', function(event) {
event.preventDefault();

var $that = $(this),
colType = $that.data('type'), column;

if ($that.hasClass('active') && colType != 'custom' ) {
return;
};



if (colType == 'custom') {
column = prompt('Enter your custom layout like 4,2,2,2,2 as total 12 grid','4,2,2,2,2');
@@ -445,7 +445,7 @@ jQuery(function($) {
newLayout = colArray;
$(this).data('layout', column)
error = false;
}
}
}

if (error) {
@@ -498,7 +498,7 @@ jQuery(function($) {
jqueryUiLayout();
});

// add row
// add row
$(document).on('click','.add-row',function(event){
event.preventDefault();

@@ -507,7 +507,7 @@ jQuery(function($) {

$rowClone.addClass('layoutbuilder-section').removeAttr('id');
$($rowClone).insertAfter($parent);

jqueryUiLayout();
});

@@ -579,7 +579,7 @@ jQuery(function($) {

return item;
}

//On Submit
document.adminForm.onsubmit = function(event){

@@ -601,4 +601,4 @@ jQuery(function($) {
$('#jform_params_layout').val( JSON.stringify(getGeneratedLayout()) );
}

});
});
87 changes: 38 additions & 49 deletions plugins/system/core/classes/menu.php
Original file line number Diff line number Diff line change
@@ -250,37 +250,31 @@ private function dropdown($item) {
$dropdown_style .= 'left: -'. $dropdown_width .'px;';
}

if (count($items)) {
if ((count($this->children[$item->id]) == 1 && $this->children[$item->id][0]->params->get('menu_show') !== 0) || count($this->children[$item->id]) > 1) {
$this->menu .= '<div class="' . $class . ' sp-menu-'. $alignment .'" style="' . $dropdown_style . '">';
$this->menu .= '<div class="sp-dropdown-inner">';
$this->navigation($item, $firstitem, 0, 'sp-dropdown-items');

$this->menu .= '<div class="' . $class . ' sp-menu-'. $alignment .'" style="' . $dropdown_style . '">';
$this->menu .= '<div class="sp-dropdown-inner">';
$this->navigation($item, $firstitem, 0, 'sp-dropdown-items');
// only module exist
if (count($item->params->get('menulayout')) == 1) {
$mega_json = $item->params->get('menulayout');
$mega = json_decode($mega_json);
$layout = $mega->layout;

// only module exist
if (count($item->params->get('menulayout')) == 1) {
$mega_json = $item->params->get('menulayout');
$mega = json_decode($mega_json);
$layout = $mega->layout;
$layout = $layout[0];
$col = $layout->attr[0];
$mod_ids = ($col->moduleId)? explode(',', $col->moduleId):array();

$layout = $layout[0];
$col = $layout->attr[0];
$mod_ids = ($col->moduleId)? explode(',', $col->moduleId):array();

if (count($mod_ids))
{
foreach ($mod_ids as $mod_id)
{
$this->menu .= $this->load_module($mod_id);
}
}
if (count($mod_ids))
{
foreach ($mod_ids as $mod_id)
{
$this->menu .= $this->load_module($mod_id);
}
}
}

$this->menu .= '</div>';
$this->menu .= '</div>';
}
}

$this->menu .= '</div>';
$this->menu .= '</div>';
}

private function mega($item)
@@ -305,7 +299,8 @@ private function mega($item)

$this->menu .='<div class="sp-dropdown sp-dropdown-main sp-dropdown-mega sp-menu-'. $mega->menuAlign .'" style="' . $mega_style . '">';
$this->menu .='<div class="sp-dropdown-inner">';
foreach ($layout as $row) {
foreach ($layout as $row)
{

$this->menu .='<div class="row">';
foreach ($row->attr as $col)
@@ -386,9 +381,7 @@ private function start_el( $args = array() )
$class = 'sp-menu-item';

if( !empty( $this->children[$item->id] ) ) {
if ((count($this->children[$item->id]) == 1 && $this->children[$item->id][0]->params->get('menu_show') !== 0) || count($this->children[$item->id]) > 1) {
$class .= ' sp-has-child';
}
$class .= ' sp-has-child';
} else if( isset( $item->megamenu ) && ( $item->megamenu ) ) {
$class .= ' sp-has-child';
}
@@ -423,8 +416,8 @@ private function item($item, $extra_class=''){
$class = $extra_class;
$title = $item->anchor_title ? 'title="' . $item->anchor_title . '" ' : '';

$item->anchor_css = ($item->anchor_css) ? ' ' . $item->anchor_css : '';
$class = ($class) ? 'class="' . $class . $item->anchor_css . '" ' : '';
$class .= ($item->anchor_css && $class) ? ' ' . $item->anchor_css : $item->anchor_css;
$class = ($class) ? 'class="' . $class . '"' : '';

if ($item->menu_image)
{
@@ -456,25 +449,21 @@ private function item($item, $extra_class=''){
$flink = JFilterOutput::ampReplace(htmlspecialchars($flink));

$output = '';
$options ='';
if ($item->params->get('menu_show', 1) != 0) {
if ($item->type == 'separator' || $item->type == 'heading') {
$output .= '<span ' . $class . '>' . $linktitle . '</span>';
} else{
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,' . $item->params->get('window_open');
$output .= '<a '. $class .' href="'. $flink .'" onclick="window.open(this.href,\'targetWindow\','. $options. ');return false;" '. $title .'>'. $linktitle .'</a>';
break;
}
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,' . $item->params->get('window_open');
$output .= '<a '. $class .' href="'. $flink .'" onclick="window.open(this.href,\'targetWindow\',\''. $options. '\');return false;" '. $title .'>'. $linktitle .'</a>';
break;
}

}

return $output;
1 change: 0 additions & 1 deletion plugins/system/fields/asset.php
Original file line number Diff line number Diff line change
@@ -26,7 +26,6 @@ protected function getInput() {
//Core scripts
JHtml::_('jquery.ui', array('core', 'sortable'));
JHtml::_('formbehavior.chosen', 'select');
JHtml::_('behavior.colorpicker');

$doc->addScript($helix_plg_url.'/assets/js/helper.js');
$doc->addScript($helix_plg_url.'/assets/js/webfont.js');
Loading

0 comments on commit d4be45c

Please sign in to comment.