diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 3e332f664..f9b8a70b0 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -52,6 +52,8 @@ var default_url = "{Context::getDefaultUrl()}"; var enforce_ssl = true; xe.current_lang = "{$lang_type}"; xe.cmd_find = "{$lang->cmd_find}"; +xe.cmd_cancel = "{$lang->cmd_cancel}"; +xe.cmd_confirm = "{$lang->cmd_confirm}"; //]]> diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 306224ea6..e731e2195 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -906,7 +906,7 @@ jQuery(function($){ return this; } - $('.module_search').xeModuleSearchHtml(); + //$('.module_search').xeModuleSearchHtml(); }); /* // Menu Selector @@ -922,22 +922,46 @@ jQuery(function($){ } }); */ + jQuery(function($){ + var _hide = $.fn.hide; - $.fn.hide = function(htOpt) { + $.fn.hide = function(speed, easing, callback, htOpt) { $(this).trigger('hide', [htOpt]); + $(this).find('.active').removeClass('active'); + var sId = $(this).attr("id"); + + if($(this).hasClass("col")){ + $(this).next().hide(speed, easing, callback, htOpt); + + if(sId){ + $(this).parent().find('a[href="#'+sId+'"]').parent('li.active').removeClass('active'); + } + } + return _hide.apply(this, arguments); } var _show = $.fn.show; - $.fn.show = function(htOpt) { + $.fn.show = function(speed, easing, callback, htOpt) { $(this).trigger('show', [htOpt]); + if($(this).hasClass("col")){ + $(this).next().hide(speed, easing, callback, htOpt); + + var $container = $(this).parent(); + setTimeout(function(){ + $container.scrollTo($container.width(), 0, {duration: 0 } ); + }, 0); + //scrollToRight(); + } + return _show.apply(this, arguments); } -}); +}); + jQuery(function($){ /*