Default alert is overwritten

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12452 201d5d3c-b55e-5fd7-737f-ddc643e51545

common/lang/lang.xml

@@ -2613,6 +2613,14 @@
 		<value xml:lang="vi"><![CDATA[Để trang trí giao diện bằng các Module. Bạn có thể điều chỉnh chúng bằng Menu trên đầu trang.]]></value>
 		<value xml:lang="mn"><![CDATA[Лэйаут нь модиулын гадаад байдлыг чимж өгнө. Дээрх лэйаут менюнээс удирдаж болно]]></value>
 	</item>
+	<item name="msg_no_root">
+		<value xml:lang="ko"><![CDATA[루트는 선택 할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You cannot select a root.]]></value>
+	</item>
+	<item name="msg_no_shortcut">
+		<value xml:lang="ko"><![CDATA[바로가기는 선택 할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You cannot select a shortcut.]]></value>
+	</item>
 	<item name="msg_call_server">
 		<value xml:lang="ko"><![CDATA[서버에 요청 중입니다. 잠시만 기다려주세요.]]></value>
 		<value xml:lang="en"><![CDATA[Requesting to the server, please wait.]]></value>

common/tpl/common_layout.html

@@ -54,6 +54,9 @@ xe.current_lang = "{$lang_type}";
 xe.cmd_find = "{$lang->cmd_find}";
 xe.cmd_cancel = "{$lang->cmd_cancel}";
 xe.cmd_confirm = "{$lang->cmd_confirm}";
+xe.msg_no_root = "{$lang->msg_no_root}";
+xe.msg_no_shortcut = "{$lang->msg_no_shortcut}";
+
 //]]>
 </script>
 </head>

modules/admin/tpl/js/admin.js

@@ -1002,7 +1002,8 @@ jQuery(function($){
 		</div>');
 	
 	//console.log($msgBox.html());
-	$($.find("body")).append($msgBox);
+	$($("body")).append($msgBox);
+	//console.log($msgBox);
 	//console.log($.find("body"));
 	//$msgBox.show();
 	/*
@@ -1126,6 +1127,16 @@ jQuery(function($){
 		
 		this.showMsgBox(htOptions);
 	}
+	$.xeMsgBox.alert = function(sTitle){
+		htOptions = {
+			bAlert : true,
+			bNobody : true,
+			bSmall: true,
+			sTitle : sTitle
+		};
+		
+		this.showMsgBox(htOptions);
+	}
 	$.xeMsgBox.confirmDialog = function(htOptions){
 		htOptions = htOptions || {};
 		htOptions.bAlert = false;
@@ -2271,5 +2282,10 @@ jQuery(function($){
 	});
 	*/
 });
+//----------------menu selector end
 
-//----------------menu selector end
+jQuery(function($){
+	alert = function(){
+		return $.xeMsgBox.alert.apply($.xeMsgBox, arguments);
+	}
+});

modules/menu/tpl/sitemap.html

@@ -931,12 +931,6 @@ console.log(htNodeInfo);
 			//exec_xml("menu","procMenuAdminMoveItem", params, completeTmp);
 			
 			$.exec_json("menu.procMenuAdminMoveItem", params, function(htData){
-				//console.log(htData);
-				if(htData.error !== 0){
-					alert(htData.message);
-					return;
-				}
-				
 				// select the newly created menu
 				//$._xeAdminVar.sSelectOnload = htData.menu_item_srl;
 				
@@ -1091,11 +1085,6 @@ function renameSitemap(sMenuSrl, sTitle){
 	params.menu_srl = sMenuSrl;
 	
 	$.exec_json("menu.procMenuAdminUpdate", params, function(htData){
-		if(htData.error !== 0){
-			alert(htData.message);
-			return;
-		}
-		
 		$._xeAdminVar.sSelectOnload = sMenuSrl;
 		loadSiteMap();
 		return;
@@ -1355,12 +1344,12 @@ jQuery(function($){
 
 	$(document.body).on("click", '._menuSelector_menuTreeContainer a', function(){
 		if($(this).hasClass('_nodeType_1')){
-			alert('no root plz');
+			$.xeMsgBox.alert(xe.msg_no_root);
 			return;
 		}
 		
 		if($(this).hasClass('_nodeType_3')){
-			alert('no shortcut plz');
+			$.xeMsgBox.alert(xe.msg_no_shortcut);
 			return;
 		}
 		
@@ -1424,12 +1413,6 @@ jQuery(function($){
 		var params = {};
 		params['title'] = sTitle;
 		$.exec_json("menu.procMenuAdminInsert", params, function(htData){
-			//console.log(htData);
-			if(htData.error !== 0){
-				alert(htData.message);
-				return;
-			}
-			
 			//$._xeAdminVar.sRenameOnload = htData.menu_srl;
 			//$._xeAdminVar.sSelectedMenuSrl = htData.menu_srl;
 			$._xeAdminVar.sSelectOnload = htData.menu_srl;
@@ -1485,7 +1468,7 @@ jQuery(function($){
 			var sParentSrl = $._xeAdminVar.sSelectedMenuSrl;
 			 do{
 				if(sParentSrl == $._xeAdminVar.sCopySourceMenuSrl){
-					alert(xe.lang.msg_target_is_sub_of_origin);
+					$.xeMsgBox.alert(xe.lang.msg_target_is_sub_of_origin);
 					return;
 				}
 
@@ -1508,12 +1491,6 @@ jQuery(function($){
 			params['source_srl'] = 0; 
 			
 			$.exec_json("menu.procMenuAdminMoveItem", params, function(htData){
-				//console.log(htData);
-				if(htData.error !== 0){
-					alert(htData.message);
-					return;
-				}
-				
 				// select currently selected menu
 				$._xeAdminVar.sSelectOnload = params['target_srl'];
 				loadSiteMap();
@@ -1528,12 +1505,6 @@ jQuery(function($){
 			params['menu_item_srl'] = $._xeAdminVar.sCopySourceMenuSrl;
 
 			$.exec_json("menu.procMenuAdminCopyItem", params, function(htData){
-				//console.log(htData);
-				if(htData.error !== 0){
-					alert(htData.message);
-					return;
-				}
-				
 				// select currently selected menu
 				$._xeAdminVar.sSelectOnload = params['menu_item_srl'];
 				loadSiteMap();
@@ -1558,12 +1529,6 @@ jQuery(function($){
 				var params = {};
 				params['menu_srl'] = sSelectedMenuSrl;
 				$.exec_json("menu.procMenuAdminDelete", params, function(htData){
-					//console.log(htData);
-					if(htData.error !== 0){
-						alert(htData.message);
-						return;
-					}
-					
 					loadSiteMap();
 				});
 			},
@@ -1639,8 +1604,6 @@ jQuery(function($){
 		});
 	}
 	top.fullSetupSaved = function(htData){
-		console.log(htData);
-		//alert('cool');
 		$('#fullSetup').hide();
 		
 		loadFullSetup();
@@ -1660,12 +1623,6 @@ jQuery(function($){
 			};
 
 			$.exec_json("admin.procInstallAdminUpdateIndexModule", params, function(htData){
-				//console.log(htData);
-				if(htData.error !== 0){
-					alert(htData.message);
-					return;
-				}
-				
 				// select currently selected menu
 				$._xeAdminVar.sSelectOnload =  $._xeAdminVar.sSelectedMenuSrl;
 				loadSiteMap();
@@ -1772,7 +1729,7 @@ jQuery(function($){
 			if(nSelectedTabIdx === 0){
 				sUrl = $('#add_menu .x_active ._linkUrl').val();
 				if(!sUrl || sUrl === "http://"){
-					alert('URL is required');
+					$.xeMsgBox.alert('URL is required');
 					return;
 				}
 				if(!sUrl.match(/^http:\/\//)){
@@ -1813,12 +1770,6 @@ jQuery(function($){
 		)
 		*/
 		$.exec_json("menu.procMenuAdminInsertItem", params, function(htData){
-			//console.log(htData);
-			if(htData.error !== 0){
-				alert(htData.message);
-				return;
-			}
-			
 			// select the newly created menu
 			//$._xeAdminVar.sSelectOnload = htData.menu_item_srl;
 			
@@ -1925,11 +1876,6 @@ jQuery(function($){
 		params['browser_title'] = sBrowserTitle;
 //console.log(params);return;
 		$.exec_json("menu.procMenuAdminUpdateItem", params, function(htData){
-			if(htData.error !== 0){
-				alert(htData.message);
-				return;
-			}
-			
 			// select currently selected menu
 			$._xeAdminVar.sSelectOnload = $._xeAdminVar.sSelectedMenuSrl;
 			loadSiteMap();
@@ -2291,12 +2237,8 @@ jQuery(function($){
 		};
 		
 		jQuery.exec_json("menu.procMenuAdminUpdateAuth", htParam, function(htData){
-			if(htData.error !== 0){
+			//alert(xe.lang.success_saved);//.//
-				alert(htData.message);
+			$.xeMsgBox.alert(xe.lang.success_saved);
-				return;
-			}
-
-			alert(xe.lang.success_saved);
 			$('#auth').hide();
 		});
 	});
@@ -2502,11 +2444,6 @@ jQuery(function($){
 		};
 //-----------------------------------
 		$.exec_json("module.getModuleInfoByMenuItemSrl", params, function(htData){
-		
-			if(htData.error !== 0){
-				alert(htData.message);
-				return;
-			}
 			var htTmp = htData.module_info_by_menu_item_srl;
 			
 			var sLayoutTitle, sLayoutSrl;
@@ -2620,11 +2557,6 @@ jQuery(function($){
 				site_srl : 0,
 				type : sMode
 			}, function(htData){
-				if(htData.error !== 0){
-					alert(htData.message);
-					return;
-				}
-
 				$._xeAdminVar.htSiteDefaultLayout[sMode].layout_srl = htData.layout_srl;
 				$._xeAdminVar.htSiteDefaultLayout[sMode].title = htData.title;
 				
@@ -2703,11 +2635,6 @@ jQuery(function($){
 			menu_item_srl : $._xeAdminVar.sSelectedMenuSrl,
 			use_mobile : sYN_useMobile
 		}, function(htData){
-			if(htData.error !== 0){
-				alert(htData.message);
-				return;
-			}
-			
 			$._xeAdminVar.sOpenDeisgnWith = "M";
 			$('#design').show();
 		});
@@ -2730,12 +2657,7 @@ jQuery(function($){
 		};
 
 		jQuery.exec_json("module.procModuleAdminSetDesignInfo", htParam, function(htData){
-			if(htData.error !== 0){
+			$.xeMsgBox.alert(xe.lang.success_saved);
-				alert(htData.message);
-				return;
-			}
-			
-			alert(xe.lang.success_saved);
 			
 			var sMode = $._xeAdminVar.htPrevSetting.bMobilePreviewTabOpen?"M":"P";
 			$._xeAdminVar.sOpenDeisgnWith = sMode;
@@ -2764,12 +2686,7 @@ jQuery(function($){
 		};
 
 		jQuery.exec_json("module.procModuleAdminSetDesignInfo", htParam, function(htData){
-			if(htData.error !== 0){
+			$.xeMsgBox.alert(xe.lang.success_saved);
-				alert(htData.message);
-				return;
-			}
-			
-			alert(xe.lang.success_saved);
 			
 			var sMode = $._xeAdminVar.htPrevSetting.bMobilePreviewTabOpen?"M":"P";
 			$._xeAdminVar.sOpenDeisgnWith = sMode;
@@ -2822,12 +2739,7 @@ jQuery(function($){
 		//console.log(htParam);
 
 		jQuery.exec_json("admin.procAdminInsertDefaultDesignInfo", htParam, function(htData){
-			if(htData.error !== 0){
+			$.xeMsgBox.alert(xe.lang.success_saved);
-				alert(htData.message);
-				return;
-			}
-			
-			alert(xe.lang.success_saved);
 			$('#design').show();
 		});
 	});
@@ -3143,12 +3055,6 @@ jQuery(function($){
 					layout_srl : sLayoutSrl,
 					title : sTitle.split(',')
 				}, function(htData){
-					//console.log(htData);
-					if(htData.error !== 0){
-						alert(htData.message);
-						return;
-					}
-					
 					fillInInstalledLayoutList();
 				});
 			},
@@ -3184,12 +3090,6 @@ jQuery(function($){
 				$.exec_json("layout.procLayoutAdminDelete", {
 					layout_srl : sLayoutSrl
 				}, function(htData){
-					//console.log(htData);
-					if(htData.error !== 0){
-						alert(htData.message);
-						return;
-					}
-					
 					fillInInstalledLayoutList();
 				});
 			}
@@ -3249,11 +3149,6 @@ jQuery(function($){
 					function( strRes ) {
 						var htData = $.parseJSON(strRes);
 						
-						if(htData.error !== 0){
-							alert(htData.message);
-							return;
-						}
-						
 						$('#layout').show();
 						//console.log(999, strRes, htData);
 					}
@@ -3264,19 +3159,9 @@ jQuery(function($){
 		});
 	})
 	top.refreshLayoutList = function(htData){
-		if(htData.error !== 0){
-			alert(htData.message);
-			return;
-		}
-		
 		$('#layout').show();
 	}
 	top.refreshLayoutMarkupSetup = function(htData){
-		if(htData.error !== 0){
-			alert(htData.message);
-			return;
-		}
-		
 		$('#layoutMarkupSetup').show();
 	}
 	$('#layoutMarkupSetup').on('show', function(ev){
@@ -3320,11 +3205,6 @@ jQuery(function($){
 					function( strRes ) {
 						var htData = $.parseJSON(strRes);
 						
-						if(htData.error !== 0){
-							alert(htData.message);
-							return;
-						}
-						
 						$('#layoutSetup').hide();
 						//console.log(999, strRes, htData);
 					}
@@ -3360,11 +3240,6 @@ jQuery(function($){
 				return;
 			}
 			
-			if(htData.error !== 0){
-				alert(htData.message);
-				return;
-			}
-			
 			// select the parent of the menu being deleted
 			$._xeAdminVar.sSelectOnload = sSelectOnload;
 			loadSiteMap();
@@ -3654,11 +3529,6 @@ jQuery(function($){
 
 		//act=getAutoinstallAdminIsAuthed
 		$.exec_json("admin.getAutoinstallAdminIsAuthed", {}, function(htData){
-			if(htData.error !== 0){
-				alert(htData.message);
-				return;
-			}
-
 			// FTP 비밀번호 뿐만 아니라 정보가 전혀 없을 경우?
 			switch(htData.is_authed){
 				case -1:
@@ -3722,7 +3592,7 @@ jQuery(function($){
 				htFunc[sPackageType]();
 			}
 			
-			alert(xe.lang.installation_completed);
+			$.xeMsgBox.alert(xe.lang.installation_completed);
 		});
 	}
 	top.fullSetupDone = function(htData){
@@ -3755,7 +3625,7 @@ jQuery(function($){
 	});
 		
 	$('a._siteDesignSetupLink').attr('title', xe.lang.go_to_site_design_setup).click(function(){
-		alert(xe.lang.go_to_site_design_setup);
+		$.xeMsgBox.alert(xe.lang.go_to_site_design_setup);
 	});
 // Set #site height fix
 	$(window).resize(function(){