Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	admin-dev/themes/default/js/admin-theme.js
This commit is contained in:
Kevin Granger
2013-10-11 11:28:44 +02:00
12 changed files with 140 additions and 125 deletions
+31 -2
View File
@@ -129,5 +129,34 @@ $( document ).ready(function() {
$(window).scroll(function() {
animateGoTop();
});
animateGoTop();
});
});
function openModulesList() {
if (!modules_list_loaded)
{
$.ajax({
type: "POST",
url : admin_modules_link,
async: true,
data : {
ajax : "1",
controller : "AdminModules",
action : "getTabModulesList",
tab_modules_list : tab_modules_list,
back_tab_modules_list : window.location.href
},
success : function(data)
{
$('#modules_list_container_tab').html(data).slideDown();
$('#modules_list_loader').hide();
modules_list_loaded = true;
}
});
}
else
{
$('#modules_list_container_tab').slideDown();
$('#modules_list_loader').hide();
}
return false;
}