From 3aff2f43693074af2b59eede8285af8782b35c9a Mon Sep 17 00:00:00 2001
From: nagoon97 <nagoon97@gmail.com>
Date: Tue, 23 Oct 2012 05:29:42 +0000
Subject: [PATCH] code merged

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11827 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/menu/tpl/css/sitemap.css |   1 +
 modules/menu/tpl/sitemap.html    | 232 ++-----------------------------
 2 files changed, 10 insertions(+), 223 deletions(-)

diff --git a/modules/menu/tpl/css/sitemap.css b/modules/menu/tpl/css/sitemap.css
index 865986858..15f0cc271 100644
--- a/modules/menu/tpl/css/sitemap.css
+++ b/modules/menu/tpl/css/sitemap.css
@@ -169,6 +169,7 @@ body>.x{max-width:none}
 #imgbtn figcaption{font-weight:bold}
 #imgbtn p{margin:0}
 #imgbtn .btnBoth{border-top:0;border-bottom:1px solid #ddd;margin:0;padding:10px 0}
+#imgbtn figure>img{max-width:200px;max-height:200px}
 #imgbtn figure>img,
 #imgbtn .delete,
 #imgbtn .modify{display:none}
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index d5e21d6a8..bf1b542f1 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -261,10 +261,10 @@ callback : javascript callback 함수명
 
 form._imgUploaded input {width:...}: 이미지 등록 된 상태
 -->
-				<form action="?module=menu&act=procMenuAdminButtonUpload" class="_btn_normal _imgUploaded" target="_submitTarget" method="post" enctype="multipart/form-data">
+				<form action="?module=menu&act=procMenuAdminButtonUpload" class="_btn_normal" target="_submitTarget" method="post" enctype="multipart/form-data">
 					<input name="menu_item_srl" type="hidden" value=""/>
 					<input name="xe_js_callback" type="hidden" value="top.onBtnImgUploaded"/>
-					<input name="isNormalDelete" type="hidden" value="Y"/>
+					<input name="isNormalDelete" type="hidden" value="N"/>
 					<figure>
 						<figcaption>일반</figcaption>
 						<p class="noImg">이미지 없음</p>
@@ -574,205 +574,7 @@ form._imgUploaded input {width:...}: 이미지 등록 된 상태
 	</div>
 </fieldset>
 <iframe name="_submitTarget" src="about:_blank" style="position:absolute; top:-10000px; left:-10000px; width:1025px;height:769px"></iframe>
-<<<<<<< .mine
-=======
-<style>
-/* Site */
-body>.x{max-width:none}
-.x>.body>.content{margin-bottom:0}
-#site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px;padding:3px}
-#site .btnBoth,
-#site .x_btn-group{text-align:right;margin:10px 0}
-#site .btnBoth:after{content:"";display:block;clear:both}
-.col{display:inline-block;*display:inline;*zoom:1;vertical-align:top;position:relative;background:#ddd;white-space:normal;height:100%;min-width:220px;padding:10px;margin:0 4px 0 0;border:4px solid #ddd;border-radius:5px;box-shadow:1px 1px 1px #999}
-.col>h1,
-.col>*>h1{line-height:32px;font-size:14px;margin:-10px -10px 0 -10px;color:#000;padding:0 8px;text-shadow:0 1px 0 #fff}
-.col>*>h1>a{color:#000}
-.col>.x_close{position:absolute;top:0;right:0;width:30px;height:30px;color:#666;font-size:17px;opacity:.75;filter:alpha(opacity=75)}
-.col>.x_close:hover,
-.col>.x_close:focus{opacity:1;filter:alpha(opacity=100)}
-.col input[type="checkbox"],
-.col input[type="radio"]{margin:0}
-.col .cnt{overflow-x:hidden;overflow-y:auto;padding:10px;margin:0 -10px;border-radius:5px;background:#fff;box-shadow:1px 1px 1px #999 inset}
-.col .cnt>ul{margin:0;padding:0;list-style:none}
-.col .cnt label{cursor:pointer;font-weight:normal}
-	/* .mapi */
-.col.map .x_btn-group{border-top:1px solid #ddd;padding:10px 0}
-.col.map li._isCut a{color:#aaa}
-.mapi{margin:0 0 5px 0;min-width:200px;background-color:transparent !important}
-.mapi ul{margin:0;padding:0;list-style:none}
-.mapi li{padding:0 80px 0 0;white-space:nowrap;position:relative;line-height:30px;border-radius:3px;vertical-align:top}
-.mapi li>ul{margin:0}
-.mapi a{text-decoration:none}
-.mapi>ul{padding:1px}
-	/* Root */
-.mapi>ul>li{margin-top:30px;position:relative}
-.mapi>ul>li:before{content:"";display:block;border-top:1px dotted #ccc;position:relative;top:-15px}
-.mapi>ul>li:first-child{margin-top:0}
-.mapi>ul>li:first-child:before{content:normal}
-.mapi>ul>li>a{font-weight:bold;text-shadow:0 1px 0 #fff}
-.mapi>ul>li>a:hover,
-.mapi>ul>li>a:focus,
-.mapi>ul>li>a.jstree-clicked,
-.mapi>ul>li>a.jstree-hovered{text-shadow:none}
-.mapi>ul>li>ul{margin-top:3px;padding:7px 0}
-	/* li>a */
-.mapi li>a{border:0 !important;padding:0 8px !important;margin:0 60px 1px 0;border-radius:3px;position:relative;z-index:2;height:23px;line-height:23px;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
-.mapi .x_icon-home{opacity:.5;filter:alpha(opacity=50)}
-.mapi .jstree-hovered>.x_icon-home,
-.mapi .jstree-clicked>.x_icon-home{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);opacity:1;filter:alpha(opacity=100)}
-	/* li>.side */
-.mapi .side{position:absolute;z-index:2;top:0;right:0;line-height:0}
-.mapi .side>button{border:0;border-radius:3px;width:23px;height:23px;overflow:hidden;font-size:0;line-height:0;text-indent:24px;background:url({getUrl('')}common/img/glyphicons-halflings.png) no-repeat;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
-.mapi .side>button.addItem{background-position:4px -91px}
-.mapi .side>button.showProp{background-position:-428px 5px}
-.mapi .side>button:hover,
-.mapi .side>button:focus{background-color:#333;background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png)}
-	/* Plugin style override */
-.mapi a>.jstree-icon{display:none}
-/* Nav */
-.col .nav li{border-bottom:1px solid #ddd;position:relative;white-space:nowrap}
-.col .nav li:first-child{border-top:0}
-.col .nav li>a,
-.col .nav li>button{text-align:left;color:#000;line-height:20px;background-color:transparent;border:0;display:block;padding:5px 15px 5px 8px;color:#333;text-decoration:none;background:#fff;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
-.col .nav li>button{width:100%}
-.col .nav li>a:hover,
-.col .nav li>a:focus,
-.col .nav li.active>a,
-.col .nav li>button:hover,
-.col .nav li>button:focus{background:#666;color:#fff}
-.col .nav li>a>i{position:absolute;top:50%;right:5px;margin:-7px 0 0 0;opacity:.5;filter:alpha(opacity=50)}
-.col .nav li>a:hover>i,
-.col .nav li>a:focus>i,
-.col .nav li.active>a>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);background-repeat:no-repeat;opacity:1;filter:alpha(opacity=100)}
-/* Menu Type */
-.col .typePage{display:none;border-top:1px solid #ddd;padding-top:8px;margin-top:8px}
-.col .typeUrl{display:none;margin-top:8px}
-.col.page .typePage,
-.col.url .typeUrl{display:block}
-/* Menu Clone */
-.col .clone{margin:0 0 15px 0}
-.col .clone ul{margin:0 !important}
-.col .clone li{list-style:none}
-.col .clone li.x_disabled>a{color:#999;text-decoration:none;cursor:not-allowed}
-.col .clone li.x_selected>a{color:#000;font-weight:bold;text-decoration:underline}
-.col .clone ul ul{padding-left:15px}
-.col .clone .root{margin-top:15px}
-/* Download */
-.download.col{max-width:600px}
-.download .list{padding:1px 0;border-bottom:1px solid #ddd}
-.download .item{border-top:1px solid #ddd;padding:1px 0 1px 95px;position:relative}
-.download .item:first-child{border:0}
-.download .item>img{position:absolute;top:15px;left:0;width:80px;height:80px}
-.download h2{font-size:14px}
-.download a.x_icon-download-alt{width:24px;height:24px;background-color:#94A55C;position:absolute;top:7px;right:0;border-radius:3px;background-position:-90px -19px}
-.download a.x_icon-download-alt:hover,
-.download a.x_icon-download-alt:focus{background-color:#333}
-.download p>i{font-style:normal;color:#ccc}
-/* Theme(layout|skin) */
-.theme img{width:110px;border:1px solid #ddd}
-.theme label{margin:0;padding:8px 0;position:relative;border-bottom:1px solid #ddd}
-.theme label>a{position:absolute;top:4px;right:0;width:24px;height:24px;border-radius:3px;background-position:-427px 5px;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
-.theme label>a:hover,
-.theme label>a:focus{background-color:#000;background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png)}
-.theme h2{font-size:14px;border-bottom:1px solid #ddd;margin:0;padding:15px 0 8px 0}
-.theme ul button{background-color:transparent;border:0;padding:0;margin:0;overflow:visible}
-.theme ul{margin:0;padding:0;list-style:none}
-.theme li{zoom:1}
-.theme li:after{content:"";display:block;clear:both}
-.theme .list>ul>li{padding:8px 0 8px 120px;border-top:1px dashed #ddd;position:relative}
-.theme .list>ul>li:first-child{border:0}
-.theme .list>ul>li>label{position:relative;color:#333;font-size:13px;white-space:nowrap;line-height:15px;margin:0 0 0 -120px;padding:0;border-bottom:0}
-.theme .item{position:relative;float:left;margin:5px -110px 0 -120px;display:inline}
-.theme .selected{background:#FFC}
-.theme .selected>label{font-weight:bold}
-.theme ul ul{white-space:nowrap;float:left;width:100%;margin:5px 0 0 0}
-.theme ul ul a>i{position:absolute;top:2px;right:2px}
-.theme ul ul>li>*{display:block;text-align:left;position:relative;text-decoration:none;padding:0 34px 0 5px;border-radius:3px;color:#000;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s;white-space:nowrap}
-.theme ul ul>li>*:hover,
-.theme ul ul>li>*:focus{background:#666;color:#fff}
-.theme ul ul>li>a:hover>i,
-.theme ul ul>li>a:focus>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png)}
-.theme ul ul>li>button{width:100%}
-/* Properties */
-#properties ul{margin:8px 0 0 0;padding:0 0 8px 0;border-bottom:1px solid #ddd}
-#properties li{position:relative;white-space:nowrap}
-#properties li>strong{margin:0 0 0 8px}
-#properties li>a,
-#properties li>button{color:#000;position:relative;display:block;padding:0 8px;height:28px;line-height:28px;background-color:transparent;border:0;text-align:left;text-decoration:none;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
-#properties li>a{padding:0 24px 0 8px}
-#properties li.add{border:1px solid #ddd;border-left:0;border-right:0;margin-top:8px;margin-bottom:8px}
-#properties li.default{margin:8px 0 0 0;padding-top:8px;border-top:1px solid #ddd}
-#properties li.add>a{height:30px;line-height:30px}
-#properties li.homepage{border-top:1px solid #ddd;padding-top:8px}
-#properties li>button{width:100%}
-#properties li>a:hover,
-#properties li>button:hover,
-#properties li>a:active,
-#properties li>button:active,
-#properties li>a:focus,
-#properties li>button:focus,
-#properties li.active>a{background-color:#666;color:#fff}
-#properties li>*>i{position:absolute;top:50%;right:5px;margin:-7px 0 0 0;opacity:.5;filter:alpha(opacity=50)}
-#properties li>*:hover>i,
-#properties li>*:active>i,
-#properties li>*:focus>i,
-#properties li.active>*>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);opacity:1;filter:alpha(opacity=100)}
-#properties.prop-shortcut li.homepage,
-#properties.prop-shortcut li.design,
-#properties.prop-shortcut li.details{display:none}
-/* Add */
-#add>*>.x_btn-group{border:0;padding:0}
-/* Add Menu */
-#add_menu label{font-weight:bold}
-#add_menu .x_tabbable{padding-top:8px}
-/* Default */
-#default [for="lang_menuName"],
-#default [for="mid2"]{font-weight:bold}
-#default .btnBoth{border-top:1px solid #ddd;padding:10px 0}
-/* Auth */
-#auth li{border-top:1px solid #ddd;padding:8px 0 0 0}
-#auth li:first-child{border:0}
-#auth label:first-child{font-weight:bold}
-#auth select{padding:0;width:100%}
-#auth .x_btn-group{border-top:1px solid #ddd;padding:10px 0}
-/* Default */
-#default ul{margin:15px 0}
-/* Image Button */
-#imgbtn form{padding:8px 0 0 0;margin:0}
-#imgbtn figure{margin:0}
-#imgbtn figcaption{font-weight:bold}
-#imgbtn p{margin:0}
-#imgbtn .btnBoth{border-top:0;border-bottom:1px solid #ddd;margin:0;padding:10px 0}
-#imgbtn img{max-width:220px; max-height:220px}
-/* Design */
-#design ._preview_form{margin:0}
-#design ul{margin-top:8px}
-#design .btnBoth{border:0}
-#design img{width:220px}
-#design .x_tab-pane{position:relative;box-shadow:0 0 4px #999 inset;padding:4px;width:212px;height:160px;overflow:hidden}
-#design .x_tab-pane>iframe{border:0;width:1024px;height:768px;filter:progid:DXImageTransform.Microsoft.Matrix(M11=0.20,M22=0.20,SizingMethod='auto expand');-webkit-transform-origin:0 0; -webkit-transform: scale(.20);-moz-transform-origin:0 0; -moz-transform: scale(.20);-0-transform-origin:0 0; -0-transform: scale(.20);position:absolute}
-#design .x_icon-zoom-in{position:absolute;right:4px;bottom:4px;width:24px;height:24px;background-color:#fff;opacity:.75;filter:alpha(opacity:75);background-position:-331px 5px}
-#design .x_icon-zoom-in:after{content:normal}
-/* Layout */
-#layout li ul._edit_menu {display:none}
-#layout li.selected ul._edit_menu {display:block}
-#layout .x_btn-group{border-top:1px solid #ddd;padding:10px 0}
 
-#msgBox {width:600px;margin-left:-300px}
-#msgBox._small {width:400px;margin-left:-200px}
-#msgBox._type_alert ._cancel{display:none}
-
-.download.col .item.installed ._install{display:none}
-.download.col .item ._already_installed{display:none}
-.download.col .item.installed ._already_installed{display:block}
-
-#imgbtn ._yesImg {display:none}
-#imgbtn form._imgUploaded ._yesImg {display:block}
-#imgbtn form._imgUploaded ._noImg {display:none}
-
-</style>
->>>>>>> .r11825
 <!--[if IE 7]>
 <script>
 jQuery(function($){
@@ -2562,7 +2364,7 @@ jQuery(function($){
 	<input name="callback" type="hidden" value="top.onBtnImgUploaded"/>
 	*/
 	top.onBtnImgUploaded = function(htData){
-		console.log(htData);
+		console.log(234, htData);
 	}
 	var $imgBtnForms = $("#imgbtn form");
 	$imgBtnForms.find("input[type=file]").change(function(){
@@ -2584,6 +2386,11 @@ jQuery(function($){
 		console.log(htData);
 		$('#imgbtn input[name=menu_item_srl]').val(htNodeInfo[$._xeAdminVar.sSelectedMenuSrl].sNodeSrl);
 		
+		// reset the file inputs
+		$('#imgbtn input[type=file]').each(function(){
+			$(this).outerHTML($(this).outerHTML);
+		});
+		
 		if(htData.menu_item.normal_btn){
 			$('#imgbtn form._btn_normal img').attr('src', htData.menu_item.normal_btn);
 			$('#imgbtn form._btn_normal').addClass('_imgUploaded');
@@ -3106,28 +2913,7 @@ setTimeout(function(){
 		});
 	});
 */
-<<<<<<< .mine
-=======
-/*
-// File upload
-	$('input[type="file"]').change(function(){
-		$(this).closest('form').submit();
-	});
-	$('.fileRemover').click(function(){
-		$(this).remove();
-	});
-	setTimeout(function(){
-		$('.fileRemover').each(function(){
-			var $this = $(this);
-			if($this.closest('form').find('>figure>img').length){
-				$this.show(); // Show remover
-			} else {
-				$this.hide(); // Hide remover
-			}
-		});
-	}, 1000);
->>>>>>> .r11825
-	*/
+
 // Theme(layout | skin) list toggle
 	var $theme = $('.theme');
 	// layout, skin list toggle