// REVERT MERGE

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 13:35:06 +00:00
parent e159c925d8
commit be4811aa6e
182 changed files with 1335 additions and 6181 deletions
@@ -73,9 +73,6 @@ function showStep(aStep, way)
 		.removeClass("selected")
 		.removeClass("finished");
 		if (step < 6) {
-			if (step == 5)
-				$('#tabs li:nth-child(' + step + ')').addClass("finished");
-			else
 			$('#tabs li:nth-child(' + step + ')').addClass("selected");
 			$('#tabs li:lt(' + (step - 1) + ')').addClass("finished");
 		}
@@ -109,7 +106,7 @@ function showStep(aStep, way)
 				$('#tabs li:nth-child(1)').removeClass("selected").addClass("finished");
 				$('#tabs li:nth-child(2)').removeClass("selected").addClass("finished");
 				$('#tabs li:nth-child(3)').removeClass("selected").addClass("finished");
-				$('#tabs li:nth-child(4)').addClass("finished");
+				$('#tabs li:nth-child(4)').addClass("selected").removeClass("finished");
 				break;
 				
 			}
@@ -279,26 +276,26 @@ function verifyAndSetRequire(firsttime)
 			for (i = 0; i < testListRequired.length; i++){
 				result = testListRequired[i].getAttribute("result");
 				$($("div#sheet_require"+isUpdate+" > ul#required"+isUpdate+" .required")[i])
-				.removeClass( (result == "fail") ? "okBlock" : "errorBlock" )
+				.removeClass( (result == "fail") ? "ok" : "fail" )
 				.addClass(result);
 				if (result == "fail") configIsOk = false;
 			}
 			
+			
 			testListOptional = testLists[1].getElementsByTagName('test');
 			
 			for (i = 0; i < testListOptional.length; i++){
 				result = testListOptional[i].getAttribute("result");
 				$($("div#sheet_require"+isUpdate+" > ul#optional"+isUpdate+" li.optional")[i])
-					.removeClass( (result == "fail") ? "okBlock" : "errorBlock" )
+					.removeClass( (result == "fail") ? "ok" : "fail" )
 					.addClass(result);
 			}
 			
 			if (!configIsOk) {
 				$('#btNext').attr({'disabled':'disabled','class':'button little disabled'});
-				$('h3#resultConfig'+isUpdate).html(txtConfigIsNotOk).removeClass('okBlock').addClass('errorBlock').slideDown('slow');
+				$('h3#resultConfig'+isUpdate).html(txtConfigIsNotOk).slideDown('slow');
 				$('h3#resultConfigHelper').show();
 				$("div#sheet_require"+isUpdate+" > ul").slideDown("1500");
-				$('#stepList_2 li:contains("Etape 2")').addClass('ko');
 			} else {
 				$("#btNext").removeAttr('disabled');
 				$('#btNext').removeClass('disabled');
@@ -308,10 +305,9 @@ function verifyAndSetRequire(firsttime)
 					$("input#btNext").click();
 				else
 				{
-					$('h3#resultConfig'+isUpdate).html(txtConfigIsOk).removeClass('errorBlock').addClass('okBlock').slideDown('slow');
+					$('h3#resultConfig'+isUpdate).html(txtConfigIsOk).slideDown('slow');
 					$('h3#resultConfigHelper').hide();
 					$("div#sheet_require"+isUpdate+" > ul").slideDown("1500");
-					$('#stepList_2 li:contains("Etape 2")').removeClass('ko');
 				}
 			}
 		}
@@ -324,38 +320,32 @@ function verifyDbAccess ()
 	//local verifications
 	if($("#dbServer[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbServerEmpty).slideDown('slow');
-		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
+		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbServerEmpty).show('slow');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
-		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
+		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
 	}
 	
 	if($("#dbLogin[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbLoginEmpty).slideDown('slow');
-		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
+		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbLoginEmpty).show('slow');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
-		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
+		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
 	}
 	
 	if($("#dbName[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbNameEmpty).slideDown('slow');
-		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
+		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbNameEmpty).show('slow');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
-		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
+		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
 	}
 	
 	//external verifications and sets
@@ -377,23 +367,21 @@ function verifyDbAccess ()
 			if (ret.getAttribute("result") == "ok")
 			{
 				$("#dbResultCheck")
-					.addClass("okBlock")
-					.removeClass("errorBlock")
+					.addClass("ok")
+					.removeClass("fail")
 					.html(txtError[23])
-					.slideDown('slow');
+					.show('slow');
 				$("#dbCreateResultCheck")
-					.slideUp('slow');
-				$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
+					.hide('slow');
 			} else
 			{
 				$("#dbResultCheck")
-					.addClass("errorBlock")
-					.removeClass("okBlock")
+					.addClass("fail")
+					.removeClass("ok")
 					.html(txtError[parseInt(ret.getAttribute("error"))])
-					.slideDown('slow');
+					.show('slow');
 				$("#dbCreateResultCheck")
-					.slideUp('slow');
-				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
+					.hide('slow');
 			}
 		}
 	 }
@@ -428,12 +416,11 @@ function createDB()
 				action_ret = ret.getElementsByTagName('action')[0];
 			} catch (e) {
 				$("#dbCreateResultCheck")
-					.addClass("errorBlock")
-					.removeClass("okBlock")
-					.removeClass('infosBlock')
+					.addClass("fail")
+					.removeClass("ok")
+					.removeClass('userInfos')
 					.html(ret)
 					.show();
-				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 				return;
 			}
 			if (action_ret.getAttribute("result") == "ok")
@@ -465,9 +452,9 @@ function createDB()
 				if (action_ret.getAttribute("error") == "11")
 				{
 					$("#dbCreateResultCheck")
-						.addClass("errorBlock")
-						.removeClass("okBlock")
-						.removeClass('infosBlock')
+						.addClass("fail")
+						.removeClass("ok")
+						.removeClass('userInfos')
 						.html(
 							txtError[11]+ "<br />\'"+
 							action_ret.getAttribute("sqlQuery") + "\'<br/>"+
@@ -478,13 +465,12 @@ function createDB()
 				else
 				{
 					$("#dbCreateResultCheck")
-						.addClass("errorBlock")
-						.removeClass("okBlock")
-						.removeClass('infosBlock')
+						.addClass("fail")
+						.removeClass("ok")
+						.removeClass('userInfos')
 						.html(txtError[parseInt(action_ret.getAttribute("error"))])
 						.show();
 				}
-				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 			}
 	   }
 	});
@@ -496,27 +482,29 @@ function verifyMail()
 	//local verifications
 	if ($("#testEmail[value=]").length > 0)
 	{
-		$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[0]);
+		$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[0]);
 		return false;
 	}
 	else if (!verifMailREGEX.test( $("#testEmail").val() ))
 	{ 
-		$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[3]);
+		$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[3]);
 		return false;
 	}
 	else
 	{
+		
 		if (smtpChecked)
 		{
 			//local verifications
 			if($("#smtpSrv[value=]").length > 0)
 			{
-				$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtSmtpSrvEmpty);
+				$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtSmtpSrvEmpty);
 				smtpIsOk = false;
 				return false;
 			}
 		}
 		
+		
 		//external verifications and sets
 		$.ajax(
 		{
@@ -540,13 +528,13 @@ function verifyMail()
 				
 				if (ret.getAttribute("result") == "ok")
 				{
-					$("#mailResultCheck").addClass("okBlock").removeClass("errorBlock").removeClass('infosBlock').html(mailSended);
+					$("#mailResultCheck").addClass("ok").removeClass("fail").removeClass('userInfos').html(mailSended);
 					mailIsOk = true;
 				}
 				else
 				{
 					mailIsOk = false;
-					$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[26]);
+					$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[26]);
 				}
 		   }
 		 }
@@ -571,13 +559,13 @@ function uploadLogo ()
 						{
 							if(data.error != '')
 							{
-								$("#resultInfosLogo").html( txtError[parseInt(data.error)] ).addClass("errorBlock").show();
+								$("#resultInfosLogo").html( txtError[parseInt(data.error)] ).addClass("fail").show();
 							}
 							else
 							{
 								$(this).attr('src', ps_base_uri + 'img/logo.jpg?' + (new Date()))
 								$(this).show('slow');
-								$("#resultInfosLogo").html("").removeClass("errorBlock").hide();
+								$("#resultInfosLogo").html("").removeClass("fail").hide();
 							}
 						});
 					}
@@ -585,7 +573,7 @@ function uploadLogo ()
 				error: function (data, status, e)
 				{
 					$("#uploadedImage").attr('src', ps_base_uri + 'img/logo.jpg?' + (new Date()));
-					$("#resultInfosLogo").html("").addClass("errorBlock");
+					$("#resultInfosLogo").html("").addClass("fail");
 				}
 			}
 		)
@@ -633,7 +621,7 @@ function ajaxRefreshField(nthField, idResultField, fieldsList, inputId)
 	{
 		$("#"+idResultField)
 			.html( txtError[parseInt(fieldsList[nthField].getAttribute("error"))] )
-			.addClass("errorBlock")
+			.addClass("fail")
 			.show("slow");
 		if (validShopInfos)
 			$("#"+inputId).focus();
@@ -643,7 +631,7 @@ function ajaxRefreshField(nthField, idResultField, fieldsList, inputId)
 	{
 		$("#"+idResultField)
 			.html("")
-			.removeClass("errorBlock")
+			.removeClass("fail")
 			.show("slow");
 		return true;
 	}
@@ -663,7 +651,7 @@ function verifyShopInfos()
 	$.ajax(
 	{
 	   url: "model.php",
-	   async: true,
+	   async: false,
 	   cache: false,
 	   data:
 		"method=checkShopInfos"+
@@ -688,7 +676,9 @@ function verifyShopInfos()
 		"&smtpPort="+ encodeURIComponent($("input#smtpPort").val())+
 		"&smtpEnc="+ encodeURIComponent($("select#smtpEnc option:selected").val())+
 		"&mailSubject="+ encodeURIComponent(mailSubject)+
-		"&isoCodeLocalLanguage="+isoCodeLocalLanguage,
+		"&isoCodeLocalLanguage="+isoCodeLocalLanguage
+	   ,
+	   
 	   success: function(ret)
 	   {
 			fieldsList = ret.getElementsByTagName('shopConfig')[0].getElementsByTagName('field');
@@ -712,7 +702,6 @@ function verifyShopInfos()
 				$('#endFirstName').html($('input#infosFirstname').val());
 				$('#endName').html($('input#infosName').val());
 				$('#endEmail').html($('input#infosEmail').val());
-				showStep(5);
 			}
 	   }
 	 }
@@ -730,14 +719,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 				{
 					$(idResultSpan)
 						.show("slow")
-						.addClass("errorBlock")
+						.addClass("fail")
 						.html(txtError[0]);
 				}
 				else
 				{
 					$(idResultSpan)
 						.hide("slow")
-						.removeClass("errorBlock")
+						.removeClass("fail")
 						.html("");
 				}
 			}
@@ -752,14 +741,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("errorBlock")
+							.addClass("fail")
 							.html(txtError[3]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("errorBlock")
+							.removeClass("fail")
 							.html("");
 					}
 				}
@@ -774,14 +763,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("errorBlock")
+							.addClass("fail")
 							.html(txtError[47]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("errorBlock")
+							.removeClass("fail")
 							.html("");
 					}
 				}
@@ -796,14 +785,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("errorBlock")
+							.addClass("fail")
 							.html(txtError[48]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("errorBlock")
+							.removeClass("fail")
 							.html("");
 					}
 				}
@@ -852,7 +841,8 @@ function doUpgrade()
 	   url: "model.php",
 	   cache: false,
 	   data:
-	   	"method=doUpgrade&customModule=" + customModule+ "",
+	   	"method=doUpgrade&customModule=" + customModule+ ""
+	   ,
 	   success: function(ret)
 	   {
 	   		var ret;
@@ -869,19 +859,18 @@ function doUpgrade()
 			{
 				requests = ret.getElementsByTagName('request');
 				$("#updateLog").empty();
-				$("#updateLog").hide();
+				
 				$(requests).each(function()
 				{
-					var html = "<div class='request'>" + $(this).children("sqlQuery").text();
+					$("#updateLog").append("<div class='request'>" + $(this).children("sqlQuery").text() + "</div><br/>");
 					if($(this).attr("result") == "fail")
 					{
 						countSqlError++;
-						html += "<br /><span class='fail'>(" + $(this).children("sqlNumberError").text() + ") " + $(this).children("sqlMsgError").text() + "</span><br style='clear:both;'/>";
+						$("#updateLog").append("<span class='fail'>(" + $(this).children("sqlNumberError").text() + ") " + $(this).children("sqlMsgError").text() + "</span><br/>");
 					}
-					$("#updateLog").append(html+"</div><br/>");
 				});
 				if (ret.getAttribute("error") == "34")
-					$("#txtErrorUpdateSQL").html(txtError[35]+" "+countSqlError+" "+txtError[36]).show();
+					$("#txtErrorUpdateSQL").html(txtError[35]+" "+countSqlError+" "+txtError[36]);
 				showStep(9);
 			}
 			else
@@ -916,18 +905,29 @@ $(document).ready(
 		$("#container").show();
 		
 		//ajax animation
-		$("#loaderSpace").ajaxStart(
+		$("#loader").ajaxStart(
 			function()
 			{
-				$(this).fadeIn('slow');
-				$(this).children('div').fadeIn('slow');
+				$(this).fadeIn();
+				$("#btNext[disabled!=1], #btBack[disabled!=1]").attr("disabled", "disabled").addClass("disabled").addClass("lockedForAjax");
 			}
 		);
-		$("#loaderSpace").ajaxComplete(
+		$("#loader").ajaxComplete(
 			function(e, xhr, settings)
 			{
-				$(this).fadeOut('slow');
-				$(this).children('div').fadeOut('slow');
+				$(this).fadeOut();
+				if (!errorOccured)
+				{
+				$(".lockedForAjax").removeAttr("disabled").removeClass("disabled").removeClass("lockedForAjax");
+					if (step == 1)
+					$("#btNext[disabled!=1], #btBack[disabled!=1]").attr("disabled", "disabled").addClass("disabled").addClass("lockedForAjax");
+					if (step == 6)
+					{
+						$('#btNext, #btBack').removeAttr('disabled').removeClass('disabled');
+						if (!$('#btDisclaimerOk').is(':checked'))
+							$("#btNext[disabled!=1]").attr("disabled", "disabled").addClass("disabled").addClass("lockedForAjax");
+			}
+				}
 				errorOccured = false;
 			}
 		);
@@ -950,7 +950,6 @@ $(document).ready(
 		);

 		//set SMTP pannels states
-		$("div#mailSMTPParam").hide();
 		$("#set_stmp").bind("click",
 			function()
 			{
@@ -959,10 +958,13 @@ $(document).ready(
 					case 0 :
 					$("div#mailSMTPParam").slideUp('slow');
 					smtpChecked = false;
+					$("#mailResultCheck").addClass("userInfos").removeClass("ok").removeClass('fail').html("");
 					break;
+					
 					case 1 :
 					$("div#mailSMTPParam").slideDown('slow');
 					smtpChecked = true;
+					$("#mailResultCheck").addClass("userInfos").removeClass("ok").removeClass('fail').html("");
 					break;
 				}
 			}