dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// add loading tab product

Browse Source
This commit is contained in:
lLefevre
2012-01-01 15:20:27 +00:00
parent bfcf3ddedc
commit e0e8229a0e
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin.css
+2
View File
@@ -135,6 +135,8 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
.table tr.last td{border-bottom:none} .table tr.last td{border-bottom:none}
td.col-left {vertical-align:top; padding-right:10px;} td.col-left {vertical-align:top; padding-right:10px;}
#tabPane1 td.col-left { width:200px;} #tabPane1 td.col-left { width:200px;}
#product-tab-content-wait{display:block;background:url('../img/bg_loaderSpace.png');z-index:100;margin-left:140px;min-height:404px;padding:5px 10px 10px;}
div#loading{height:128px;width:128px;background:url('../img/ajax-loader.gif');display:block;text-indent:-9999px;margin:100px auto;}
td.col-left label { display:block; width:100%; text-align:right;} td.col-left label { display:block; width:100%; text-align:right;}
.alt_row{background-color:#f8f8f8} .alt_row{background-color:#f8f8f8}
.path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px} .path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px}
admin-dev/themes/default/template/products/form.tpl
+3 -4
View File
@@ -177,7 +177,6 @@
$("#product-tab-content-"+currentId).hide(); $("#product-tab-content-"+currentId).hide();
} }
$("#product-tab-content-wait").show();
if ($("#product-tab-content-"+id).hasClass('not-loaded') && !$("#product-tab-content-"+id).hasClass('loading')) if ($("#product-tab-content-"+id).hasClass('not-loaded') && !$("#product-tab-content-"+id).hasClass('loading'))
displayTabProductById(this, id, true); displayTabProductById(this, id, true);
else else
@@ -185,7 +184,6 @@
$("#product-tab-content-"+id).show(); $("#product-tab-content-"+id).show();
$("#link-"+id).addClass('selected'); $("#link-"+id).addClass('selected');
} }
$("#product-tab-content-wait").hide();
var languages = new Array(); var languages = new Array();
if (btn_name == "Combinations") if (btn_name == "Combinations")
@@ -234,7 +232,9 @@
tb_pathToImage = "../img/loadingAnimation.gif"; tb_pathToImage = "../img/loadingAnimation.gif";
//]]> //]]>
</script> </script>
<div id="product-tab-content-wait" style="display:none"><div id="loading">{l s='Loading...'}</div></div>
<form id="product_form" action="{$form_action}" method="post" enctype="multipart/form-data" name="product"> <form id="product_form" action="{$form_action}" method="post" enctype="multipart/form-data" name="product">
<input type="hidden" name="id_product" value="{$id_product}" /> <input type="hidden" name="id_product" value="{$id_product}" />
<div class="tab-pane" id="tabPane1"> <div class="tab-pane" id="tabPane1">
@@ -250,7 +250,6 @@
</div> </div>
{/if} {/if}
{* all input are here *} {* all input are here *}
<div id="product-tab-content-wait" style="display:none" >{l s='loading ...'}</div>
{foreach $product_tabs key=numStep item=tab} {foreach $product_tabs key=numStep item=tab}
<div id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}> <div id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}>
{if $tab.selected} {if $tab.selected}
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -3889,7 +3889,7 @@ class AdminProductsControllerCore extends AdminController
$this->addJqueryUI(array( $this->addJqueryUI(array(
'ui.core', 'ui.core',
'ui.widget', 'ui.widget',
'ui.accordion' 'ui.accordion'
)); ));
$this->addJS(array( $this->addJS(array(
js/admin-products.js
+5
View File
@@ -220,6 +220,10 @@ function displayTabProductById(el, id, selected)
myurl = $(el).attr("href")+"&ajax=1"; myurl = $(el).attr("href")+"&ajax=1";
// Used to check if the tab is already in the process of being loaded // Used to check if the tab is already in the process of being loaded
$("#product-tab-content-"+id).addClass('loading'); $("#product-tab-content-"+id).addClass('loading');
if (selected)
$('#product-tab-content-wait').show();
$.ajax({ $.ajax({
url : myurl, url : myurl,
async : true, async : true,
@@ -237,6 +241,7 @@ function displayTabProductById(el, id, selected)
complete : function(data) complete : function(data)
{ {
$("#product-tab-content-"+id).removeClass('loading'); $("#product-tab-content-"+id).removeClass('loading');
$('#product-tab-content-wait').hide();
} }
}); });
} }