1 files changed, 10 insertions, 21 deletions

diff --git a/admin/survey/script/zoom.js b/admin/survey/script/zoom.js
index d43700d..debc254 100644
--- a/admin/survey/script/zoom.js
+++ b/admin/survey/script/zoom.js
@@ -85,7 +85,7 @@ function zoomProfileAction(action) {
 			//$("#zoom_cover_div").show();

 			$("#zoom_div div#newProfileDiv").show();

 		} else {

-			alert('Najprej izberite variable');

+			genericAlertPopup('alert_choose_variables');

 		}

 

 	} else if (action == 'newCancel'){

@@ -110,10 +110,10 @@ function zoomProfileAction(action) {
 						// dropdownu dodamo nov prodil in ga izberemo

 							//$("#current_condition_profile").append( $("<option></option>").attr("value", newId).attr( "selected", true).text(name));

 					} else {

-						alert(data.msg);

+						genericAlertPopup('alert_parameter_datamsg',data.msg);

 					}

 				} else {

-					alert(data.msg);

+					genericAlertPopup('alert_parameter_datamsg',data.msg);

 				}

 		});

 		//$("#zoom_cover_div").hide();

@@ -130,7 +130,7 @@ function zoomProfileAction(action) {
 		$("#zoom_div div#deleteProfileDiv").hide();

 		//$("#zoom_cover_div").fadeOut();

 	} else {

-		alert(action);	

+		genericAlertPopup('alert_parameter_action',action);	

 	}

 }

 

@@ -156,25 +156,14 @@ function toggleAllZoom(what) {
 	$.post('ajax.php?t=zoom&a=togleExtended', { anketa : srv_meta_anketa_id, what:what}, function() {

 		

 		if (what == 0) {

-			$("#div_zoom_condition ul").parent().show();	

-			$("#div_zoom_condition #zoomSpritesMinus").show();	

-			$("#div_zoom_condition #zoomSpritesPlus").hide();	

+			$("#div_zoom_condition ul").parent().removeClass('displayNone');	

+			$("#div_zoom_condition #zoomSpritesMinus").removeClass('displayNone');	

+			$("#div_zoom_condition #zoomSpritesPlus").addClass('displayNone');	

 		} else {

-			$("#div_zoom_condition ul").parent().hide();	

-			$("#div_zoom_condition #zoomSpritesMinus").hide();	

-			$("#div_zoom_condition #zoomSpritesPlus").show();	

+			$("#div_zoom_condition ul").parent().addClass('displayNone');		

+			$("#div_zoom_condition #zoomSpritesMinus").addClass('displayNone');

+			$("#div_zoom_condition #zoomSpritesPlus").removeClass('displayNone');

 		}

-		/*

-		if (what == 0) {

-			$("#div_zoom_condition ul li div:nth-child(2)").show();	

-			$("#div_zoom_condition #zoomSpritesMinus").show();	

-			$("#div_zoom_condition #zoomSpritesPlus").hide();	

-		} else {

-			$("#div_zoom_condition ul li div:nth-child(2)").hide();

-			$("#div_zoom_condition #zoomSpritesMinus").hide();	

-			$("#div_zoom_condition #zoomSpritesPlus").show();	

-		}

-		*/

 	});

 }