issue 70 admin bug fix

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

modules/editor/skins/xeed/js/xeed.js

@@ -839,7 +839,6 @@ Block = xe.createPlugin('BlockCommand', {
 		if (!sel) return false;
 
 		nodes = this.getBlockParents();
-		console.log(nodes);
 		n     = parseInt(params[0], 10);
 
 		for(i=0,c=nodes.length; i<c; i++) {

modules/menu/tpl/js/menu_admin.js

@@ -96,7 +96,6 @@ function completeMoveMenuItem(ret_obj) {
 function doReloadTreeMenu(menu_srl) {
     var params = new Array();
     params["menu_srl"] = menu_srl;
-	console.log(params);
 
     // 서버에 요청하여 해당 노드의 정보를 수정할 수 있도록 한다. 
     var response_tags = new Array('error','message', 'xml_file', 'menu_title');

modules/menu/tpl/js/sitemap.js

@@ -188,4 +188,13 @@ $('form.siteMap')
 		}
 		selectModuleLayer.find('select').html(htmlBuffer);
 	}
+
+	$('a.tgMap').click(function() {
+		var $this = $(this);
+
+		$($this.attr('href')).slideToggle('fast');a
+		$this.closet('.sitemap').toggleClass('fold');
+
+		return false;
+	});
 });

modules/menu/tpl/sitemap.html

@@ -17,8 +17,8 @@
 	<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
 
 		<h2 class="h2"><input name="title" value="{$value->title}" /></h2>
-		<a href="#nav1" class="tgMap">접기</a>
+		<a href="#nav_{$key}" class="tgMap">접기/펼치기</a>
-		<ul class="lined" id="nav1" cond="count($value->menuItems->list > 0)">
+		<ul class="lined" id="nav_{$key}" cond="count($value->menuItems->list > 0)">
 		<block loop="$value->menuItems->list=>$key2,$value2">
 		{@$item = $value2}
 		<include target="sitemap.item.html" />

modules/module/tpl/js/module_admin.js

@@ -6,7 +6,6 @@
 /* 모듈 즐겨찾기 */
 function doToggleFavoriteModule(obj, module_name) {
 	function on_complete(data){
-		console.log(data);
 		if (data.result == 'on')
 			jQuery(obj).removeClass('fvOff').addClass('fvOn').html(xe.lang.favorite_on);
 		else

modules/trash/tpl/js/trash_admin.js

@@ -36,7 +36,7 @@ function getTrashList()
 {
 	var trashListTable = jQuery('#trashListTable');
 	var cartList = [];
-	trashListTable.find(':checkbox[name=cart').each(function(){
+	trashListTable.find(':checkbox[name=cart]').each(function(){
 		if(this.checked) cartList.push(this.value); 
 	});
 

modules/trash/tpl/trash_list.html

@@ -82,13 +82,14 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
 		<input type="hidden" name="act" value="procTrashAdminEmptyTrash" />
 		<input type="hidden" name="page" value="{$page}" />
 		<input type="hidden" name="is_all" value="false" />
+		<input type="hidden" name="origin_module" value="{$origin_module}" />
 			<h2 class="h2">선택한 글 관리</h2>
 			<div class="table even">
 				<table width="100%" border="1" cellspacing="0" id="trashManageListTable">
-					<caption>선택한 글 <strong id="selectedTrashCount">8</strong></caption>
+					<caption>선택한 글 <strong id="selectedTrashCount">0</strong></caption>
 					<thead>
 						<tr>
-							<th scope="col" class="title">{$lang->document} ({$lang->trash_type})</th>
+							<th scope="col" class="title">{$lang->document}</th>
 							<th scope="col">{$lang->trash_nick_name}</th>
 							<th scope="col">{$lang->ipaddress}</th>
 						</tr>

modules/trash/trash.admin.controller.php

@@ -39,6 +39,7 @@ class trashAdminController extends trash
 	{
 		global $lang;
 		$isAll = Context::get('is_all');
+		$originModule = Context::get('origin_module');
 		$tmpTrashSrls = Context::get('cart');
 		if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
 		else $trashSrls = explode('|@|', $tmpTrashSrls);
@@ -51,7 +52,7 @@ class trashAdminController extends trash
 
 		$this->setMessage('success_deleted', 'info');
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
-			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList');
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule);
 			$this->setRedirectUrl($returnUrl);
 			return;
 		}